diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 9f11633ef..34c3c9beb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -123,3 +123,4 @@ spring: hibernate: format_sql: true dialect: org.hibernate.dialect.H2Dialect + diff --git a/src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java b/src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java index efdfba6dc..7703d5d83 100644 --- a/src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java +++ b/src/test/java/de/bonndan/nivio/appuser/AppUserRepositoryTest.java @@ -23,7 +23,6 @@ void findByExternalId() { appUser.setExternalId("100"); appUser.setAlias("login"); appUser.setAppUserRole(AppUserRole.USER); - appUser.setId(1L); appUser.setIdp("github"); appUserRepository.save(appUser); @@ -37,7 +36,7 @@ void findByExternalId() { .hasValueSatisfying(fetched -> { assertThat(fetched.getExternalId()).isNotNull().isEqualTo(appUser.getExternalId()); assertThat(fetched.getAlias()).isNotNull().isEqualTo(appUser.getAlias()); - assertThat(fetched.getId()).isNotNull().isEqualTo(appUser.getId()); + assertThat(fetched.getId()).isNotNull(); assertThat(fetched.getIdp()).isNotNull().isEqualTo(appUser.getIdp()); assertThat(fetched.getAppUserRole()).isNotNull().isEqualTo(appUser.getAppUserRole()); diff --git a/src/test/java/de/bonndan/nivio/security/Oauth2LoginEventAndListenerTest.java b/src/test/java/de/bonndan/nivio/security/Oauth2LoginEventAndListenerTest.java index b768e86f4..50c9e0990 100644 --- a/src/test/java/de/bonndan/nivio/security/Oauth2LoginEventAndListenerTest.java +++ b/src/test/java/de/bonndan/nivio/security/Oauth2LoginEventAndListenerTest.java @@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.context.ApplicationEventPublisher; import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.security.oauth2.core.user.OAuth2UserAuthority; @@ -14,7 +13,6 @@ import java.util.Map; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; @DataJpaTest @@ -26,10 +24,8 @@ class Oauth2LoginEventAndListenerTest { private final String login = "foo"; private final String avatarUrl = "https://www.avatar.com"; private final String externalId = "123"; - private final String idp = "github"; private Collection authorities; private CustomOAuth2User customOAuth2User; - private ApplicationEventPublisher applicationEventPublisher; OAuth2LoginEvent oAuth2LoginEvent; Oauth2LoginEventListener oauth2LoginEventListener;