Fix authorization tests using http configuration bean (eclipse-basyx#338

) * Restrict http test configs to profile 'httptests' * Add 'httptests' profile to affected tests * Add 'authorization' profile for auth related tests not using 'httptests' config file
geso02 · Jul 29, 2024 · 700059e · 700059e
1 parent 45afd4f
commit 700059e
Show file tree

Hide file tree

Showing 21 changed files with 71 additions and 33 deletions.
diff --git a/...t/java/org/eclipse/digitaltwin/basyx/aasrepository/client/TestConnectedAasRepository.java b/...t/java/org/eclipse/digitaltwin/basyx/aasrepository/client/TestConnectedAasRepository.java
@@ -38,7 +38,7 @@
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -55,7 +55,7 @@ public class TestConnectedAasRepository extends AasRepositorySuite {
 
 	@BeforeClass
 	public static void startAASRepo() throws Exception {
-		appContext = new SpringApplication(DummyAasRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummyAasRepositoryComponent.class).profiles("httptests").run(new String[] {});
 	}
 
 	@After

diff --git a/.../basyx/aasrepository/feature/authorization/DummyAuthorizedAasRepositoryConfiguration.java b/.../basyx/aasrepository/feature/authorization/DummyAuthorizedAasRepositoryConfiguration.java
@@ -34,6 +34,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 
 /**
@@ -43,6 +44,7 @@
  *
  */
 @Configuration
+@Profile("authorization")
 public class DummyAuthorizedAasRepositoryConfiguration {
 
 	@Bean

diff --git a/...se/digitaltwin/basyx/aasrepository/feature/authorization/TestAuthorizedAasRepository.java b/...se/digitaltwin/basyx/aasrepository/feature/authorization/TestAuthorizedAasRepository.java
@@ -58,7 +58,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -92,7 +92,7 @@ public class TestAuthorizedAasRepository {
 	public static void setUp() throws FileNotFoundException, IOException {
 		tokenProvider = new AccessTokenProvider(authenticaltionServerTokenEndpoint, clientId);
 
-		appContext = new SpringApplication(DummyAuthorizedAasRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummyAuthorizedAasRepositoryComponent.class).profiles("authorization").run(new String[] {});
 
 		aasRepo = appContext.getBean(AasRepository.class);
 

diff --git a/...src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/http/TestAasRepositoryHTTP.java b/...src/test/java/org/eclipse/digitaltwin/basyx/aasrepository/http/TestAasRepositoryHTTP.java
@@ -30,7 +30,7 @@
 import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -46,7 +46,7 @@ public class TestAasRepositoryHTTP extends AasRepositoryHTTPSuite {
 
 	@BeforeClass
 	public static void startAasRepo() throws Exception {
-		appContext = new SpringApplication(DummyAasRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummyAasRepositoryComponent.class).profiles("httptests").run(new String[] {});
 	}
 
 	@Override

diff --git a/...org/eclipse/digitaltwin/basyx/aasrepository/http/testconfig/DummyAasRepositoryConfig.java b/...org/eclipse/digitaltwin/basyx/aasrepository/http/testconfig/DummyAasRepositoryConfig.java
@@ -33,6 +33,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 
 /**
@@ -42,6 +43,7 @@
  *
  */
 @Configuration
+@Profile("httptests")
 public class DummyAasRepositoryConfig {
 
 	@Bean

diff --git a/...va/org/eclipse/digitaltwin/basyx/aasservice/client/TestAuthorizedConnectedAasService.java b/...va/org/eclipse/digitaltwin/basyx/aasservice/client/TestAuthorizedConnectedAasService.java
@@ -56,7 +56,7 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.mockito.Mockito;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -72,16 +72,12 @@ public class TestAuthorizedConnectedAasService extends AasServiceSuite {
 
 	private static final String AAS_REPO_URL = "http://localhost:8081/shells/";
 	private static ConfigurableApplicationContext appContext;
-	private static final String PROFILE = "authorization";
 	public static String authenticaltionServerTokenEndpoint = "http://localhost:9096/realms/BaSyx/protocol/openid-connect/token";
 	public static String clientId = "basyx-client-api";
 
 	@BeforeClass
 	public static void startAASRepo() throws Exception {
-		SpringApplication application = new SpringApplication(DummyAuthorizedAasRepositoryComponent.class);
-		application.setAdditionalProfiles(PROFILE);
-
-		appContext = application.run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummyAuthorizedAasRepositoryComponent.class).profiles("authorization").run(new String[] {});
 	}
 
 	@After

diff --git a/...rc/test/java/org/eclipse/digitaltwin/basyx/aasservice/client/TestConnectedAasService.java b/...rc/test/java/org/eclipse/digitaltwin/basyx/aasservice/client/TestConnectedAasService.java
@@ -38,7 +38,7 @@
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -50,7 +50,7 @@ public class TestConnectedAasService extends AasServiceSuite {
 
 	@BeforeClass
 	public static void startAASRepo() throws Exception {
-		appContext = new SpringApplication(DummyAasRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummyAasRepositoryComponent.class).profiles("httptests").run(new String[] {});
 	}
 
 	@After

diff --git a/...descriptionrepository/feature/authorization/DummyAuthorizedCDRepositoryConfiguration.java b/...descriptionrepository/feature/authorization/DummyAuthorizedCDRepositoryConfiguration.java
@@ -34,6 +34,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 /**
  * Configuration for tests
@@ -42,6 +43,7 @@
  *
  */
 @Configuration
+@Profile("authorization")
 public class DummyAuthorizedCDRepositoryConfiguration {
 
 	@Bean

diff --git a/.../basyx/conceptdescriptionrepository/feature/authorization/TestAuthorizedCDRepository.java b/.../basyx/conceptdescriptionrepository/feature/authorization/TestAuthorizedCDRepository.java
@@ -48,7 +48,7 @@
 import org.eclipse.digitaltwin.basyx.http.serialization.BaSyxHttpTestUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -79,7 +79,7 @@ public class TestAuthorizedCDRepository {
 	public static void setUp() throws FileNotFoundException, IOException, DeserializationException {
 		tokenProvider = new AccessTokenProvider(authenticaltionServerTokenEndpoint, clientId);
 
-		appContext = new SpringApplication(DummyAuthorizedCDRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummyAuthorizedCDRepositoryComponent.class).profiles("authorization").run(new String[] {});
 
 		cdRepo = appContext.getBean(ConceptDescriptionRepository.class);
 

diff --git a/...taltwin/basyx/conceptdescriptionrepository/http/TestConceptDescriptionRepositoryHTTP.java b/...taltwin/basyx/conceptdescriptionrepository/http/TestConceptDescriptionRepositoryHTTP.java
@@ -34,7 +34,7 @@
 import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -50,7 +50,7 @@ public class TestConceptDescriptionRepositoryHTTP extends ConceptDescriptionRepo
 
 	@BeforeClass
 	public static void startConceptDescriptionRepo() throws Exception {
-		appContext = new SpringApplication(DummyConceptDescriptionRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummyConceptDescriptionRepositoryComponent.class).profiles("httptests").run(new String[] {});
 	}
 
 	@Override

diff --git a/...conceptdescriptionrepository/http/testconfig/DummyConceptDescriptionRepositoryConfig.java b/...conceptdescriptionrepository/http/testconfig/DummyConceptDescriptionRepositoryConfig.java
@@ -31,6 +31,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 /**
  * Configuration for tests
@@ -39,6 +40,7 @@
  *
  */
 @Configuration
+@Profile("httptests")
 public class DummyConceptDescriptionRepositoryConfig {
 
 		@Bean

diff --git a/...igitaltwin/basyx/submodelrepository/client/TestAuthorizedConnectedSubmodelRepository.java b/...igitaltwin/basyx/submodelrepository/client/TestAuthorizedConnectedSubmodelRepository.java
@@ -27,6 +27,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThrows;
+
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.util.Collection;
@@ -37,6 +38,7 @@
 import org.eclipse.digitaltwin.basyx.client.internal.authorization.credential.ClientCredential;
 import org.eclipse.digitaltwin.basyx.client.internal.authorization.grant.ClientCredentialAccessTokenProvider;
 import org.eclipse.digitaltwin.basyx.core.exceptions.MissingIdentifierException;
+import org.eclipse.digitaltwin.basyx.core.exceptions.NotInvokableException;
 import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
 import org.eclipse.digitaltwin.basyx.submodelrepository.SubmodelRepository;
 import org.eclipse.digitaltwin.basyx.submodelrepository.core.SubmodelRepositorySuite;
@@ -77,7 +79,10 @@ public void removeSubmodelFromRepo() throws FileNotFoundException, IOException {
 		TestAuthorizedConnectedSubmodelService.configureSecurityContext(TestAuthorizedConnectedSubmodelService.getTokenProvider());
 
 		SubmodelRepository repo = appContext.getBean(SubmodelRepository.class);
-		repo.getAllSubmodels(PaginationInfo.NO_LIMIT).getResult().stream().map(s -> s.getId()).forEach(repo::deleteSubmodel);
+		try {
+			repo.getAllSubmodels(PaginationInfo.NO_LIMIT).getResult().stream().map(s -> s.getId()).forEach(repo::deleteSubmodel);
+		} catch (Exception e) {
+		}
 
 		SecurityContextHolder.clearContext();
 	}
@@ -139,4 +144,15 @@ protected boolean fileExistsInStorage(String fileValue) {
 
 		return file.exists();
 	}
+
+	@Override
+	public void invokeOperation() {
+		// TODO
+	}
+
+	@Override
+	public void invokeNonOperation() {
+		// TODO
+		throw new NotInvokableException();
+	}
 }
diff --git a/.../eclipse/digitaltwin/basyx/submodelrepository/client/TestConnectedSubmodelRepository.java b/.../eclipse/digitaltwin/basyx/submodelrepository/client/TestConnectedSubmodelRepository.java
@@ -38,7 +38,7 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -55,7 +55,7 @@ public class TestConnectedSubmodelRepository extends SubmodelRepositorySuite {
 
 	@BeforeClass
 	public static void startAASRepo() throws Exception {
-		appContext = new SpringApplication(DummySubmodelRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummySubmodelRepositoryComponent.class).profiles("httptests").run(new String[] {});
 	}
 
 	@After

diff --git a/...modelrepository/feature/authorization/DummyAuthorizedSubmodelRepositoryConfiguration.java b/...modelrepository/feature/authorization/DummyAuthorizedSubmodelRepositoryConfiguration.java
@@ -34,6 +34,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 
 /**
@@ -43,6 +44,7 @@
  *
  */
 @Configuration
+@Profile("authorization")
 public class DummyAuthorizedSubmodelRepositoryConfiguration {
 
 	@Bean

diff --git a/...twin/basyx/submodelrepository/feature/authorization/TestAuthorizedSubmodelRepository.java b/...twin/basyx/submodelrepository/feature/authorization/TestAuthorizedSubmodelRepository.java
@@ -52,7 +52,7 @@
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -97,7 +97,7 @@ public class TestAuthorizedSubmodelRepository {
 	public static void setUp() throws FileNotFoundException, IOException, DeserializationException {
 		tokenProvider = new AccessTokenProvider(authenticaltionServerTokenEndpoint, clientId);
 
-		appContext = new SpringApplication(DummyAuthorizedSubmodelRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummyAuthorizedSubmodelRepositoryComponent.class).profiles("authorization").run(new String[] {});
 
 		submodelRepo = appContext.getBean(SubmodelRepository.class);
 

diff --git a/...digitaltwin/basyx/submodelrepository/http/TestSubmodelRepositorySubmodelElementsHTTP.java b/...digitaltwin/basyx/submodelrepository/http/TestSubmodelRepositorySubmodelElementsHTTP.java
@@ -26,14 +26,13 @@
 package org.eclipse.digitaltwin.basyx.submodelrepository.http;
 
 import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
-
 import org.eclipse.digitaltwin.basyx.submodelrepository.SubmodelRepository;
 import org.eclipse.digitaltwin.basyx.submodelservice.http.SubmodelServiceSubmodelElementsTestSuiteHTTP;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -49,7 +48,7 @@ public class TestSubmodelRepositorySubmodelElementsHTTP extends SubmodelServiceS
 
 	@BeforeClass
 	public static void startAASRepo() throws Exception {
-		appContext = new SpringApplication(DummySubmodelRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummySubmodelRepositoryComponent.class).profiles("httptests").run(new String[] {});
 	}
 
 	@Before

diff --git a/...eclipse/digitaltwin/basyx/submodelrepository/http/TestSubmodelRepositorySubmodelHTTP.java b/...eclipse/digitaltwin/basyx/submodelrepository/http/TestSubmodelRepositorySubmodelHTTP.java
@@ -32,7 +32,7 @@
 import org.eclipse.digitaltwin.basyx.submodelrepository.SubmodelRepository;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.springframework.boot.SpringApplication;
+import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.context.ConfigurableApplicationContext;
 
 /**
@@ -47,7 +47,7 @@ public class TestSubmodelRepositorySubmodelHTTP extends SubmodelRepositorySubmod
 
 	@BeforeClass
 	public static void startAASRepo() throws Exception {
-		appContext = new SpringApplication(DummySubmodelRepositoryComponent.class).run(new String[] {});
+		appContext = new SpringApplicationBuilder(DummySubmodelRepositoryComponent.class).profiles("httptests").run(new String[] {});
 	}
 
 	@Override

diff --git a/...e/digitaltwin/basyx/submodelrepository/http/testconfig/DummySubmodelRepositoryConfig.java b/...e/digitaltwin/basyx/submodelrepository/http/testconfig/DummySubmodelRepositoryConfig.java
@@ -33,6 +33,7 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
 
 /**
  * Configuration for tests  
@@ -41,6 +42,7 @@
  *
  */
 @Configuration
+@Profile("httptests")
 public class DummySubmodelRepositoryConfig {
 
 	@Bean

diff --git a/...ipse/digitaltwin/basyx/submodelservice/client/TestAuthorizedConnectedSubmodelService.java b/...ipse/digitaltwin/basyx/submodelservice/client/TestAuthorizedConnectedSubmodelService.java
@@ -42,6 +42,7 @@
 import org.eclipse.digitaltwin.basyx.client.internal.authorization.TokenManager;
 import org.eclipse.digitaltwin.basyx.client.internal.authorization.credential.ClientCredential;
 import org.eclipse.digitaltwin.basyx.client.internal.authorization.grant.ClientCredentialAccessTokenProvider;
+import org.eclipse.digitaltwin.basyx.core.exceptions.NotInvokableException;
 import org.eclipse.digitaltwin.basyx.core.pagination.PaginationInfo;
 import org.eclipse.digitaltwin.basyx.http.Base64UrlEncodedIdentifier;
 import org.eclipse.digitaltwin.basyx.http.serialization.BaSyxHttpTestUtils;
@@ -86,7 +87,10 @@ public static void startAASRepo() throws Exception {
 	@After
 	public void removeAasFromRepo() {
 		SubmodelRepository repo = appContext.getBean(SubmodelRepository.class);
-		repo.getAllSubmodels(PaginationInfo.NO_LIMIT).getResult().stream().map(s -> s.getId()).forEach(repo::deleteSubmodel);
+		try {
+			repo.getAllSubmodels(PaginationInfo.NO_LIMIT).getResult().stream().map(s -> s.getId()).forEach(repo::deleteSubmodel);
+		} catch (Exception e) {
+		}
 	}
 
 	@AfterClass
@@ -161,4 +165,15 @@ public static AccessTokenProvider getTokenProvider() {
 		return new AccessTokenProvider(authenticaltionServerTokenEndpoint, clientId);
 	}
 
+	@Override
+	public void invokeOperation() {
+		// TODO
+	}
+
+	@Override
+	public void invokeNonOperation() {
+		// TODO
+		throw new NotInvokableException();
+	}
+
 }