feat(NF-777): Fix other tests.

levigo · Nov 6, 2023 · d87bc2f · d87bc2f
1 parent 18add66
commit d87bc2f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 52 deletions.
diff --git a/...com/neverpile/authorization/autoconfig/NeverpileEurekaAuthorizationAutoConfiguration.java b/...com/neverpile/authorization/autoconfig/NeverpileEurekaAuthorizationAutoConfiguration.java
@@ -52,25 +52,4 @@ AuthorizationService allowAllAuthorizationService() {
   public PolicyRepositoryResource policyRepositoryResource() {
     return new PolicyRepositoryResource();
   }
-
-  @Primary
-  @Bean
-  public PlatformTransactionManager transactionManager() {
-    return new PlatformTransactionManager() {
-      @Override
-      public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
-        return null;
-      }
-
-      @Override
-      public void commit(TransactionStatus status) throws TransactionException {
-
-      }
-
-      @Override
-      public void rollback(TransactionStatus status) throws TransactionException {
-
-      }
-    };
-  }
 }
diff --git a/neverpile-eureka-core/src/test/java/com/neverpile/eureka/api/BaseTestConfiguration.java b/neverpile-eureka-core/src/test/java/com/neverpile/eureka/api/BaseTestConfiguration.java
@@ -80,27 +80,4 @@ MockObjectStoreService objectStoreService() {
   ClusterLockFactory noOpLock() {
     return new LocalLockFactory();
   }
-
-
-//  TODO: replace this with a real transaction manager
-  @Primary
-  @Bean
-  public PlatformTransactionManager transactionManager() {
-    return new PlatformTransactionManager() {
-      @Override
-      public TransactionStatus getTransaction(TransactionDefinition definition) throws TransactionException {
-        return null;
-      }
-
-      @Override
-      public void commit(TransactionStatus status) throws TransactionException {
-
-      }
-
-      @Override
-      public void rollback(TransactionStatus status) throws TransactionException {
-
-      }
-    };
-  }
 }
diff --git a/...ta/src/test/java/com/neverpile/eureka/plugin/metadata/rest/MetadataAuthorizationTest.java b/...ta/src/test/java/com/neverpile/eureka/plugin/metadata/rest/MetadataAuthorizationTest.java
@@ -22,6 +22,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatchers;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -126,10 +127,10 @@ public void testThat_documentCreationWithMetadataVerifiesAuthorization() throws
 
   @Test
   public void testThat_documentUpdateWithMetadataVerifiesAuthorization() throws JsonProcessingException {
-    given(mockAuthService.authorizeSubResourceUpdate(any(), any())).willReturn(true);
-    given(mockAuthService.authorizeSubResourceCreate(any(), any())).willReturn(true);
-    given(mockAuthService.authorizeSubResourceDelete(any(), any())).willReturn(true);
-    given(mockAuthService.authorizeSubResourceGet(any(), any())).willReturn(true);
+    given(mockAuthService.authorizeSubResourceUpdate(any(), any(String[].class))).willReturn(true);
+    given(mockAuthService.authorizeSubResourceCreate(any(), any(String[].class))).willReturn(true);
+    given(mockAuthService.authorizeSubResourceDelete(any(), any(String[].class))).willReturn(true);
+    given(mockAuthService.authorizeSubResourceGet(any(), any(String[].class))).willReturn(true);
 
     givenVanillaExistingMetadata();
 
@@ -182,10 +183,10 @@ public void testThat_metadataRetrieveVerifiesAuthorization() throws JsonProcessi
 
   @Test
   public void testThat_metadataUpdateVerifiesAuthorization() throws JsonProcessingException {
-    given(mockAuthService.authorizeSubResourceUpdate(any(), any())).willReturn(true);
-    given(mockAuthService.authorizeSubResourceCreate(any(), any())).willReturn(true);
-    given(mockAuthService.authorizeSubResourceDelete(any(), any())).willReturn(true);
-    given(mockAuthService.authorizeSubResourceGet(any(), any())).willReturn(true);
+    given(mockAuthService.authorizeSubResourceUpdate(any(), any(String[].class))).willReturn(true);
+    given(mockAuthService.authorizeSubResourceCreate(any(), any(String[].class))).willReturn(true);
+    given(mockAuthService.authorizeSubResourceDelete(any(), any(String[].class))).willReturn(true);
+    given(mockAuthService.authorizeSubResourceGet(any(), any(String[].class))).willReturn(true);
 
     givenVanillaExistingMetadata();