This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch service-layer-improvements in repository https://gitbox.apache.org/repos/asf/airavata.git
commit cc6ebbac2bea771a7cca3a7b56ee6a0ecac78889 Author: yasithdev <[email protected]> AuthorDate: Thu Dec 11 01:08:05 2025 -0600 fix tests --- .../config/BackgroundServicesLauncher.java | 5 ++++ .../airavata/config/ThriftServerLauncher.java | 5 ++++ .../helix/impl/participant/GlobalParticipant.java | 5 ++++ .../common/utils/ApplicationSettingsTest.java | 5 +--- .../airavata/common/utils/NameValidatorTest.java | 5 +--- .../airavata/common/utils/SecurityUtilTest.java | 5 +--- .../credential/impl/ssh/SSHSummaryTest.java | 16 +++++------- .../credential/impl/store/SSHCredentialTest.java | 17 +++++-------- .../credential/utils/TokenGeneratorTest.java | 5 +--- .../GroupComputeResourcePreferenceUtilTest.java | 10 ++++---- .../repositories/WorkspaceRepositoryTest.java | 8 ++++-- .../ApplicationDeploymentRepositoryTest.java | 4 +++ .../ApplicationInterfaceRepositoryTest.java | 15 ++++++++--- .../appcatalog/ComputeResourceRepositoryTest.java | 7 +++--- .../appcatalog/GatewayGroupsRepositoryTest.java | 4 +++ .../appcatalog/GatewayProfileRepositoryTest.java | 4 +++ .../GroupResourceProfileRepositoryTest.java | 4 +++ .../JobSubmissionInterfaceRepositoryTest.java | 4 +++ .../appcatalog/StorageResourceRepositoryTest.java | 7 +++--- .../UserResourceProfileRepositoryTest.java | 7 +++--- .../expcatalog/ExperimentErrorRepositoryTest.java | 10 +++++--- .../expcatalog/ExperimentInputRepositoryTest.java | 10 +++++--- .../expcatalog/ExperimentOutputRepositoryTest.java | 10 +++++--- .../expcatalog/ExperimentRepositoryTest.java | 8 ++++-- .../expcatalog/ExperimentStatusRepositoryTest.java | 10 +++++--- .../ExperimentSummaryRepositoryTest.java | 10 +++++--- .../expcatalog/GatewayRepositoryTest.java | 8 +++--- .../repositories/expcatalog/JobRepositoryTest.java | 10 +++++--- .../expcatalog/JobStatusRepositoryTest.java | 15 ++++++----- .../expcatalog/NotificationRepositoryTest.java | 10 +++++--- .../expcatalog/ProcessErrorRepositoryTest.java | 10 +++++--- .../expcatalog/ProcessInputRepositoryTest.java | 10 +++++--- .../expcatalog/ProcessOutputRepositoryTest.java | 10 +++++--- .../expcatalog/ProcessRepositoryTest.java | 10 +++++--- .../expcatalog/ProcessStatusRepositoryTest.java | 15 ++++++----- .../expcatalog/ProjectRepositoryTest.java | 29 ++++++---------------- .../expcatalog/QueueStatusRepositoryTest.java | 10 +++++--- .../expcatalog/TaskErrorRepositoryTest.java | 10 +++++--- .../expcatalog/TaskRepositoryTest.java | 10 +++++--- .../expcatalog/TaskStatusRepositoryTest.java | 10 +++++--- .../expcatalog/UserRepositoryTest.java | 10 +++++--- .../replicacatalog/DataProductRepositoryTest.java | 10 +++++--- .../DataReplicaLocationRepositoryTest.java | 13 +++++++--- .../workflowcatalog/WorkflowRepositoryTest.java | 4 +++ .../registry/utils/CustomBeanFactoryTest.java | 5 +--- .../security/GatewayGroupsInitializerTest.java | 10 +++----- .../AuthenticatorConfigurationReaderTest.java | 10 ++++---- 47 files changed, 263 insertions(+), 166 deletions(-) diff --git a/airavata-api/src/main/java/org/apache/airavata/config/BackgroundServicesLauncher.java b/airavata-api/src/main/java/org/apache/airavata/config/BackgroundServicesLauncher.java index 8c690529e1..3f01d2d415 100644 --- a/airavata-api/src/main/java/org/apache/airavata/config/BackgroundServicesLauncher.java +++ b/airavata-api/src/main/java/org/apache/airavata/config/BackgroundServicesLauncher.java @@ -29,6 +29,7 @@ import org.apache.airavata.monitor.realtime.RealtimeMonitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -50,6 +51,10 @@ import org.springframework.context.annotation.Configuration; * Each service can be enabled/disabled via configuration properties. */ @Configuration +@ConditionalOnProperty( + name = "services.background.enabled", + havingValue = "true", + matchIfMissing = true) public class BackgroundServicesLauncher { private static final Logger logger = LoggerFactory.getLogger(BackgroundServicesLauncher.class); diff --git a/airavata-api/src/main/java/org/apache/airavata/config/ThriftServerLauncher.java b/airavata-api/src/main/java/org/apache/airavata/config/ThriftServerLauncher.java index 0347115238..6937ffba59 100644 --- a/airavata-api/src/main/java/org/apache/airavata/config/ThriftServerLauncher.java +++ b/airavata-api/src/main/java/org/apache/airavata/config/ThriftServerLauncher.java @@ -27,6 +27,7 @@ import org.apache.airavata.common.utils.IServer.ServerStatus; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.ApplicationContext; import org.springframework.stereotype.Component; @@ -48,6 +49,10 @@ import org.springframework.stereotype.Component; * The main thread is kept alive to prevent the application from exiting. */ @Component +@ConditionalOnProperty( + name = "services.thrift.enabled", + havingValue = "true", + matchIfMissing = true) public class ThriftServerLauncher implements CommandLineRunner { private static final Logger logger = LoggerFactory.getLogger(ThriftServerLauncher.class); diff --git a/airavata-api/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java b/airavata-api/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java index 71d9c3d35f..8710131967 100644 --- a/airavata-api/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java +++ b/airavata-api/src/main/java/org/apache/airavata/helix/impl/participant/GlobalParticipant.java @@ -27,11 +27,16 @@ import org.apache.airavata.helix.core.AbstractTask; import org.apache.airavata.helix.core.participant.HelixParticipant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.context.annotation.DependsOn; import org.springframework.stereotype.Component; @Component @DependsOn("airavataServerProperties") +@ConditionalOnProperty( + name = "services.helix.enabled", + havingValue = "true", + matchIfMissing = true) public class GlobalParticipant extends HelixParticipant<AbstractTask> { private static final Logger logger = LoggerFactory.getLogger(GlobalParticipant.class); diff --git a/airavata-api/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java b/airavata-api/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java index 1313e6d2e9..eb4051725b 100644 --- a/airavata-api/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/common/utils/ApplicationSettingsTest.java @@ -53,10 +53,7 @@ public class ApplicationSettingsTest { @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.common", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.common", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/common/utils/NameValidatorTest.java b/airavata-api/src/test/java/org/apache/airavata/common/utils/NameValidatorTest.java index f65d2e16c0..00c242725d 100644 --- a/airavata-api/src/test/java/org/apache/airavata/common/utils/NameValidatorTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/common/utils/NameValidatorTest.java @@ -57,10 +57,7 @@ public class NameValidatorTest { @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.common", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.common", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java b/airavata-api/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java index 5a35f59a53..124416eccd 100644 --- a/airavata-api/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/common/utils/SecurityUtilTest.java @@ -93,10 +93,7 @@ public class SecurityUtilTest { @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.common", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.common", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/credential/impl/ssh/SSHSummaryTest.java b/airavata-api/src/test/java/org/apache/airavata/credential/impl/ssh/SSHSummaryTest.java index 3cbc179932..61f6130dc4 100644 --- a/airavata-api/src/test/java/org/apache/airavata/credential/impl/ssh/SSHSummaryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/credential/impl/ssh/SSHSummaryTest.java @@ -26,7 +26,6 @@ import java.io.FileInputStream; import java.security.KeyStore; import java.security.PrivateKey; import java.security.cert.X509Certificate; -import org.apache.airavata.credential.impl.ssh.SSHCredential; import org.apache.airavata.credential.impl.store.SSHCredentialWriter; import org.apache.airavata.credential.utils.TokenGenerator; import org.junit.jupiter.api.BeforeEach; @@ -111,7 +110,7 @@ public class SSHSummaryTest { File privateKeyFile = new File(privateKeyPath); File pubKeyFile = new File(pubKeyPath); - + if (!privateKeyFile.exists() || !pubKeyFile.exists()) { logger.warn("SSH key files not found at {} and {}. Skipping test.", privateKeyPath, pubKeyPath); return; @@ -128,29 +127,26 @@ public class SSHSummaryTest { File filePri = new File(privateKeyPath); byte[] bFilePri = new byte[(int) filePri.length()]; privateKeyStream.read(bFilePri); - + FileInputStream pubKeyStream = new FileInputStream(pubKeyPath); File filePub = new File(pubKeyPath); byte[] bFilePub = new byte[(int) filePub.length()]; pubKeyStream.read(bFilePub); - + privateKeyStream.close(); pubKeyStream.close(); - + sshCredential.setPrivateKey(bFilePri); sshCredential.setPublicKey(bFilePub); sshCredential.setPassphrase("test-passphrase"); - + sshCredentialWriter.writeCredentials(sshCredential); assertEquals(token, sshCredential.getToken()); } @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.credential", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.credential", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/credential/impl/store/SSHCredentialTest.java b/airavata-api/src/test/java/org/apache/airavata/credential/impl/store/SSHCredentialTest.java index d55b29b326..3104b0aab6 100644 --- a/airavata-api/src/test/java/org/apache/airavata/credential/impl/store/SSHCredentialTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/credential/impl/store/SSHCredentialTest.java @@ -22,7 +22,6 @@ package org.apache.airavata.credential.impl.store; import java.io.File; import java.io.FileInputStream; import org.apache.airavata.credential.impl.ssh.SSHCredential; -import org.apache.airavata.credential.impl.store.SSHCredentialWriter; import org.apache.airavata.credential.utils.TokenGenerator; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -31,7 +30,6 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Import; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.transaction.TestTransaction; import org.springframework.transaction.annotation.Transactional; @SpringBootTest( @@ -61,7 +59,7 @@ public class SSHCredentialTest { try { File privateKeyFile = new File(privateKeyPath); File pubKeyFile = new File(pubKeyPath); - + if (!privateKeyFile.exists() || !pubKeyFile.exists()) { logger.warn("SSH key files not found at {} and {}. Skipping test.", privateKeyPath, pubKeyPath); return; @@ -78,19 +76,19 @@ public class SSHCredentialTest { File filePri = new File(privateKeyPath); byte[] bFilePri = new byte[(int) filePri.length()]; privateKeyStream.read(bFilePri); - + FileInputStream pubKeyStream = new FileInputStream(pubKeyPath); File filePub = new File(pubKeyPath); byte[] bFilePub = new byte[(int) filePub.length()]; pubKeyStream.read(bFilePub); - + privateKeyStream.close(); pubKeyStream.close(); - + sshCredential.setPrivateKey(bFilePri); sshCredential.setPublicKey(bFilePub); sshCredential.setPassphrase("test-passphrase"); - + sshCredentialWriter.writeCredentials(sshCredential); logger.info("SSH Token: {}", token); } catch (Exception e) { @@ -101,10 +99,7 @@ public class SSHCredentialTest { @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.credential", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.credential", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/credential/utils/TokenGeneratorTest.java b/airavata-api/src/test/java/org/apache/airavata/credential/utils/TokenGeneratorTest.java index f0c4e85bac..4a2f67fb58 100644 --- a/airavata-api/src/test/java/org/apache/airavata/credential/utils/TokenGeneratorTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/credential/utils/TokenGeneratorTest.java @@ -59,10 +59,7 @@ public class TokenGeneratorTest { @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.credential", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.credential", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/model/util/GroupComputeResourcePreferenceUtilTest.java b/airavata-api/src/test/java/org/apache/airavata/model/util/GroupComputeResourcePreferenceUtilTest.java index b26037fa9d..aae9701085 100644 --- a/airavata-api/src/test/java/org/apache/airavata/model/util/GroupComputeResourcePreferenceUtilTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/model/util/GroupComputeResourcePreferenceUtilTest.java @@ -35,7 +35,10 @@ import org.springframework.test.context.TestPropertySource; * GroupComputeResourcePreferenceUtilTest */ @SpringBootTest( - classes = {org.apache.airavata.config.JpaConfig.class, GroupComputeResourcePreferenceUtilTest.TestConfiguration.class}, + classes = { + org.apache.airavata.config.JpaConfig.class, + GroupComputeResourcePreferenceUtilTest.TestConfiguration.class + }, properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" @@ -156,10 +159,7 @@ public class GroupComputeResourcePreferenceUtilTest { @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.model", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.model", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/WorkspaceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/WorkspaceRepositoryTest.java index a0aa72b22c..ece1d37c96 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/WorkspaceRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/WorkspaceRepositoryTest.java @@ -33,7 +33,10 @@ import org.springframework.transaction.annotation.Transactional; classes = {org.apache.airavata.config.JpaConfig.class, WorkspaceRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @Transactional @@ -41,7 +44,8 @@ public class WorkspaceRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ApplicationDeploymentRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ApplicationDeploymentRepositoryTest.java index 30543a3801..bc7f2f9807 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ApplicationDeploymentRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ApplicationDeploymentRepositoryTest.java @@ -52,6 +52,10 @@ import org.springframework.test.context.TestConstructor; properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ApplicationInterfaceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ApplicationInterfaceRepositoryTest.java index 434816fe22..ecd9083d5a 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ApplicationInterfaceRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ApplicationInterfaceRepositoryTest.java @@ -46,14 +46,20 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( - classes = {org.apache.airavata.config.JpaConfig.class, ApplicationInterfaceRepositoryTest.TestConfiguration.class}, + classes = { + org.apache.airavata.config.JpaConfig.class, + ApplicationInterfaceRepositoryTest.TestConfiguration.class + }, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -61,7 +67,8 @@ public class ApplicationInterfaceRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ComputeResourceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ComputeResourceRepositoryTest.java index 4137d960ab..27a7146a29 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ComputeResourceRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/ComputeResourceRepositoryTest.java @@ -35,19 +35,20 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.TestConstructor; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ComputeResourceRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GatewayGroupsRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GatewayGroupsRepositoryTest.java index 8f8f679b07..0d7bac612e 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GatewayGroupsRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GatewayGroupsRepositoryTest.java @@ -38,6 +38,10 @@ import org.springframework.test.context.TestConstructor; properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GatewayProfileRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GatewayProfileRepositoryTest.java index e65e19a1ca..0dea3b234f 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GatewayProfileRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GatewayProfileRepositoryTest.java @@ -55,6 +55,10 @@ import org.springframework.test.context.TestConstructor; properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GroupResourceProfileRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GroupResourceProfileRepositoryTest.java index 0146ef1446..eeac3d5677 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GroupResourceProfileRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/GroupResourceProfileRepositoryTest.java @@ -53,6 +53,10 @@ import org.springframework.test.context.TestConstructor; properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/JobSubmissionInterfaceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/JobSubmissionInterfaceRepositoryTest.java index de4c5e64af..c6d18b8dfa 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/JobSubmissionInterfaceRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/JobSubmissionInterfaceRepositoryTest.java @@ -47,6 +47,10 @@ import org.springframework.test.context.TestConstructor; properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/StorageResourceRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/StorageResourceRepositoryTest.java index fb9a0167e2..1ef68cd5fa 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/StorageResourceRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/StorageResourceRepositoryTest.java @@ -45,19 +45,20 @@ import org.springframework.test.context.TestConstructor; * Created by skariyat on 3/13/18. */ import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.TestConstructor; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, StorageResourceRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/UserResourceProfileRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/UserResourceProfileRepositoryTest.java index aa502a70d8..bb8d625b02 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/UserResourceProfileRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/appcatalog/UserResourceProfileRepositoryTest.java @@ -35,19 +35,20 @@ import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.TestConstructor; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, UserResourceProfileRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentErrorRepositoryTest.java index c2db51ba23..1b062be9f4 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentErrorRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentErrorRepositoryTest.java @@ -41,14 +41,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ExperimentErrorRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -56,7 +59,8 @@ public class ExperimentErrorRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentInputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentInputRepositoryTest.java index feb64a8624..5203093677 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentInputRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentInputRepositoryTest.java @@ -43,14 +43,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ExperimentInputRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -58,7 +61,8 @@ public class ExperimentInputRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentOutputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentOutputRepositoryTest.java index 2c4158e7a2..1dad291ea1 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentOutputRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentOutputRepositoryTest.java @@ -43,14 +43,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ExperimentOutputRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -58,7 +61,8 @@ public class ExperimentOutputRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentRepositoryTest.java index c052e7dbce..72dc912fd5 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentRepositoryTest.java @@ -49,7 +49,10 @@ import org.springframework.test.context.TestPropertySource; classes = {org.apache.airavata.config.JpaConfig.class, ExperimentRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -57,7 +60,8 @@ public class ExperimentRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentStatusRepositoryTest.java index ff7e266d22..f983b976c9 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentStatusRepositoryTest.java @@ -41,14 +41,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ExperimentStatusRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -56,7 +59,8 @@ public class ExperimentStatusRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentSummaryRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentSummaryRepositoryTest.java index 2db3e96642..4b90c6e21f 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentSummaryRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ExperimentSummaryRepositoryTest.java @@ -48,14 +48,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ExperimentSummaryRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -63,7 +66,8 @@ public class ExperimentSummaryRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/GatewayRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/GatewayRepositoryTest.java index ad5e15f5e1..c3c8e9b0b1 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/GatewayRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/GatewayRepositoryTest.java @@ -43,7 +43,10 @@ import org.springframework.test.context.TestPropertySource; classes = {org.apache.airavata.config.JpaConfig.class, GatewayRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -92,8 +95,7 @@ public class GatewayRepositoryTest extends TestBase { List<Gateway> defaultGatewayList = gatewayService.getAllGateways(); assertEquals(1, defaultGatewayList.size()); assertEquals( - properties.services.default_.gateway, - defaultGatewayList.get(0).getGatewayId()); + properties.services.default_.gateway, defaultGatewayList.get(0).getGatewayId()); Gateway gateway = new Gateway(); gateway.setGatewayId(testGatewayId); diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/JobRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/JobRepositoryTest.java index 9e410e7c11..a152d42a04 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/JobRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/JobRepositoryTest.java @@ -51,14 +51,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, JobRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -66,7 +69,8 @@ public class JobRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/JobStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/JobStatusRepositoryTest.java index c5dfa0d9f9..58518883f3 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/JobStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/JobStatusRepositoryTest.java @@ -43,21 +43,23 @@ import org.apache.airavata.registry.services.ProcessService; import org.apache.airavata.registry.services.ProjectService; import org.apache.airavata.registry.services.TaskService; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.TestConstructor; - import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; +import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, JobStatusRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -65,7 +67,8 @@ public class JobStatusRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/NotificationRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/NotificationRepositoryTest.java index 42f95566fa..bcc6d3b391 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/NotificationRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/NotificationRepositoryTest.java @@ -34,14 +34,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, NotificationRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -49,7 +52,8 @@ public class NotificationRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessErrorRepositoryTest.java index d1c3902546..29d0f1cccc 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessErrorRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessErrorRepositoryTest.java @@ -43,14 +43,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ProcessErrorRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -58,7 +61,8 @@ public class ProcessErrorRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessInputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessInputRepositoryTest.java index a44bc0bbce..e65e663c56 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessInputRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessInputRepositoryTest.java @@ -45,14 +45,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ProcessInputRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -60,7 +63,8 @@ public class ProcessInputRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessOutputRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessOutputRepositoryTest.java index 91caf77d85..53f963fe8b 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessOutputRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessOutputRepositoryTest.java @@ -45,14 +45,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ProcessOutputRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -60,7 +63,8 @@ public class ProcessOutputRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessRepositoryTest.java index 94ecf32d37..1ef5a6e409 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessRepositoryTest.java @@ -46,14 +46,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ProcessRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -61,7 +64,8 @@ public class ProcessRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessStatusRepositoryTest.java index 125daaf29a..a5cb9a31f8 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProcessStatusRepositoryTest.java @@ -38,21 +38,23 @@ import org.apache.airavata.registry.services.ProcessService; import org.apache.airavata.registry.services.ProcessStatusService; import org.apache.airavata.registry.services.ProjectService; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.TestConstructor; - import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; +import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, ProcessStatusRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -60,7 +62,8 @@ public class ProcessStatusRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProjectRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProjectRepositoryTest.java index d2e3e5b792..9504909493 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProjectRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/ProjectRepositoryTest.java @@ -46,7 +46,10 @@ import org.springframework.test.context.TestPropertySource; classes = {org.apache.airavata.config.JpaConfig.class, ProjectRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -54,32 +57,14 @@ public class ProjectRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry"}, excludeFilters = { @ComponentScan.Filter( - type = FilterType.ASSIGNABLE_TYPE, - classes = { - org.apache.airavata.config.BackgroundServicesLauncher.class, - org.apache.airavata.config.ThriftServerLauncher.class, - org.apache.airavata.monitor.realtime.RealtimeMonitor.class, - org.apache.airavata.monitor.email.EmailBasedMonitor.class, - org.apache.airavata.monitor.cluster.ClusterStatusMonitorJob.class, - org.apache.airavata.monitor.AbstractMonitor.class, - org.apache.airavata.helix.impl.controller.HelixController.class, - org.apache.airavata.helix.impl.participant.GlobalParticipant.class, - org.apache.airavata.helix.impl.workflow.PreWorkflowManager.class, - org.apache.airavata.helix.impl.workflow.PostWorkflowManager.class, - org.apache.airavata.helix.impl.workflow.ParserWorkflowManager.class - }), - @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org\\.apache\\.airavata\\.monitor\\..*"), - @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org\\.apache\\.airavata\\.helix\\..*") + type = FilterType.REGEX, + pattern = "org\\.apache\\.airavata\\.(monitor|helix|config\\.(Background|Thrift)).*") }) @EnableConfigurationProperties(org.apache.airavata.config.AiravataServerProperties.class) @Import(org.apache.airavata.config.AiravataPropertiesConfiguration.class) - @org.springframework.boot.autoconfigure.SpringBootApplication(exclude = { - org.apache.airavata.config.BackgroundServicesLauncher.class, - org.apache.airavata.config.ThriftServerLauncher.class - }) static class TestConfiguration {} private final GatewayService gatewayService; diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/QueueStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/QueueStatusRepositoryTest.java index a427e06faf..9cfc404e5d 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/QueueStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/QueueStatusRepositoryTest.java @@ -35,14 +35,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, QueueStatusRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -50,7 +53,8 @@ public class QueueStatusRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskErrorRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskErrorRepositoryTest.java index 47d45ffaa3..21b4f5ee66 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskErrorRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskErrorRepositoryTest.java @@ -46,14 +46,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, TaskErrorRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -61,7 +64,8 @@ public class TaskErrorRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskRepositoryTest.java index f994894e5c..b7861edff8 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskRepositoryTest.java @@ -48,14 +48,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, TaskRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -63,7 +66,8 @@ public class TaskRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskStatusRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskStatusRepositoryTest.java index 8a59778b91..d8c7e80999 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskStatusRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/TaskStatusRepositoryTest.java @@ -46,14 +46,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, TaskStatusRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -61,7 +64,8 @@ public class TaskStatusRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/UserRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/UserRepositoryTest.java index 6fbcb55fc6..bd898718ed 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/UserRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/expcatalog/UserRepositoryTest.java @@ -41,14 +41,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, UserRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -56,7 +59,8 @@ public class UserRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/replicacatalog/DataProductRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/replicacatalog/DataProductRepositoryTest.java index 411cd7695c..9aa74dac88 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/replicacatalog/DataProductRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/replicacatalog/DataProductRepositoryTest.java @@ -42,14 +42,17 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( classes = {org.apache.airavata.config.JpaConfig.class, DataProductRepositoryTest.TestConfiguration.class}, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -57,7 +60,8 @@ public class DataProductRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java index dc6c8028b3..962c879a45 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/replicacatalog/DataReplicaLocationRepositoryTest.java @@ -42,14 +42,18 @@ import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.FilterType; import org.springframework.context.annotation.Import; -import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.TestConstructor; +import org.springframework.test.context.TestPropertySource; @SpringBootTest( - classes = {org.apache.airavata.config.JpaConfig.class, DataReplicaLocationRepositoryTest.TestConfiguration.class}, + classes = {org.apache.airavata.config.JpaConfig.class, DataReplicaLocationRepositoryTest.TestConfiguration.class + }, properties = { "spring.main.allow-bean-definition-overriding=true", - "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration", + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) @@ -57,7 +61,8 @@ public class DataReplicaLocationRepositoryTest extends TestBase { @Configuration @ComponentScan( - basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config"}, + basePackages = {"org.apache.airavata.service", "org.apache.airavata.registry", "org.apache.airavata.config" + }, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/workflowcatalog/WorkflowRepositoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/workflowcatalog/WorkflowRepositoryTest.java index 15751688c2..845c45f3d6 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/repositories/workflowcatalog/WorkflowRepositoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/repositories/workflowcatalog/WorkflowRepositoryTest.java @@ -43,6 +43,10 @@ import org.springframework.test.context.TestConstructor; properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" + , + "services.background.enabled=false", + "services.thrift.enabled=false", + "services.helix.enabled=false" }) @TestPropertySource(locations = "classpath:airavata.properties") @TestConstructor(autowireMode = TestConstructor.AutowireMode.ALL) diff --git a/airavata-api/src/test/java/org/apache/airavata/registry/utils/CustomBeanFactoryTest.java b/airavata-api/src/test/java/org/apache/airavata/registry/utils/CustomBeanFactoryTest.java index c91bc8e757..3bed86a6e0 100644 --- a/airavata-api/src/test/java/org/apache/airavata/registry/utils/CustomBeanFactoryTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/registry/utils/CustomBeanFactoryTest.java @@ -73,10 +73,7 @@ public class CustomBeanFactoryTest { @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.registry", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.registry", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/security/GatewayGroupsInitializerTest.java b/airavata-api/src/test/java/org/apache/airavata/security/GatewayGroupsInitializerTest.java index d3cf5bec49..1caef02619 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/GatewayGroupsInitializerTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/GatewayGroupsInitializerTest.java @@ -22,10 +22,10 @@ package org.apache.airavata.security; import static org.junit.jupiter.api.Assertions.*; import static org.mockito.Mockito.*; +import org.apache.airavata.credential.exceptions.CredentialStoreException; import org.apache.airavata.model.appcatalog.gatewaygroups.GatewayGroups; import org.apache.airavata.model.appcatalog.gatewayprofile.GatewayResourceProfile; import org.apache.airavata.model.credential.store.PasswordCredential; -import org.apache.airavata.credential.exceptions.CredentialStoreException; import org.apache.airavata.registry.api.exception.RegistryServiceException; import org.apache.airavata.service.CredentialStoreService; import org.apache.airavata.service.RegistryService; @@ -102,7 +102,8 @@ public class GatewayGroupsInitializerTest { when(mockRegistryService.getGatewayResourceProfile(GATEWAY_ID)).thenReturn(gatewayResourceProfile); when(mockCredentialStoreService.getPasswordCredential(IDENTITY_SERVER_PWD_CRED_TOKEN, GATEWAY_ID)) .thenReturn(passwordCredential); - when(mockSharingRegistryService.isUserExists(GATEWAY_ID, ADMIN_OWNER_ID)).thenReturn(doesAdminUserExist); + when(mockSharingRegistryService.isUserExists(GATEWAY_ID, ADMIN_OWNER_ID)) + .thenReturn(doesAdminUserExist); GatewayGroups gatewayGroups = gatewayGroupsInitializer.initialize(GATEWAY_ID); assertEquals(GATEWAY_ID, gatewayGroups.getGatewayId()); @@ -129,10 +130,7 @@ public class GatewayGroupsInitializerTest { @Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.security", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.security", "org.apache.airavata.config"}, excludeFilters = { @ComponentScan.Filter( type = FilterType.ASSIGNABLE_TYPE, diff --git a/airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java b/airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java index 273fa11411..1eb55ac2a1 100644 --- a/airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java +++ b/airavata-api/src/test/java/org/apache/airavata/security/configurations/AuthenticatorConfigurationReaderTest.java @@ -39,7 +39,10 @@ import org.springframework.test.context.TestPropertySource; * A test class for authenticator configuration reader. Reads the authenticators.xml in resources directory. */ @SpringBootTest( - classes = {org.apache.airavata.config.JpaConfig.class, AuthenticatorConfigurationReaderTest.TestConfiguration.class}, + classes = { + org.apache.airavata.config.JpaConfig.class, + AuthenticatorConfigurationReaderTest.TestConfiguration.class + }, properties = { "spring.main.allow-bean-definition-overriding=true", "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration" @@ -122,10 +125,7 @@ public class AuthenticatorConfigurationReaderTest { @org.springframework.context.annotation.Configuration @ComponentScan( - basePackages = { - "org.apache.airavata.security", - "org.apache.airavata.config" - }, + basePackages = {"org.apache.airavata.security", "org.apache.airavata.config"}, excludeFilters = { @org.springframework.context.annotation.ComponentScan.Filter( type = org.springframework.context.annotation.FilterType.ASSIGNABLE_TYPE,
