Tests separated to unit,integration and functional folders

HLTech · Dec 7, 2020 · c9a0a0b · c9a0a0b
1 parent 0fd8d7e
commit c9a0a0b
Show file tree

Hide file tree

Showing 27 changed files with 5 additions and 5 deletions.
diff --git a/...oovy/com/hltech/judged/agent/AppIT.groovy → ...tion/com/hltech/judged/agent/AppIT.groovy b/...oovy/com/hltech/judged/agent/AppIT.groovy → ...tion/com/hltech/judged/agent/AppIT.groovy
diff --git a/...ged/agent/ContractTestsGeneratorIT.groovy → ...ged/agent/ContractTestsGeneratorIT.groovy b/...ged/agent/ContractTestsGeneratorIT.groovy → ...ged/agent/ContractTestsGeneratorIT.groovy
diff --git a/.../judged/agent/UpdateServicesTaskUT.groovy → .../judged/agent/UpdateServicesTaskUT.groovy b/.../judged/agent/UpdateServicesTaskUT.groovy → .../judged/agent/UpdateServicesTaskUT.groovy
@@ -2,8 +2,6 @@ package com.hltech.judged.agent
 
 import spock.lang.Specification
 
-import static ServiceLocator.*
-
 class UpdateServicesTaskUT extends Specification {
 
     UpdateServicesTask task;
@@ -17,7 +15,7 @@ class UpdateServicesTaskUT extends Specification {
 
     def "UpdateServices"() {
         setup:
-            locator.locateServices() >> [new Service("service1", "1.0"),new Service("service2", "1.0")]
+            locator.locateServices() >> [new ServiceLocator.Service("service1", "1.0"), new ServiceLocator.Service("service2", "1.0")]
         when:
             task.updateServices()
         then:

diff --git a/...nfig/CachingDelegatingDPublisherUT.groovy → ...nfig/CachingDelegatingDPublisherUT.groovy b/...nfig/CachingDelegatingDPublisherUT.groovy → ...nfig/CachingDelegatingDPublisherUT.groovy
diff --git a/...sul/ConsulTagBasedServiceLocatorUT.groovy → ...sul/ConsulTagBasedServiceLocatorUT.groovy b/...sul/ConsulTagBasedServiceLocatorUT.groovy → ...sul/ConsulTagBasedServiceLocatorUT.groovy
diff --git a/.../k8s/K8sLabelBasedServiceLocatorUT.groovy → .../k8s/K8sLabelBasedServiceLocatorUT.groovy b/.../k8s/K8sLabelBasedServiceLocatorUT.groovy → .../k8s/K8sLabelBasedServiceLocatorUT.groovy
diff --git a/...com/hltech/judged/server/SwaggerIT.groovy → ...com/hltech/judged/server/SwaggerIT.groovy b/...com/hltech/judged/server/SwaggerIT.groovy → ...com/hltech/judged/server/SwaggerIT.groovy
diff --git a/...ServiceIdContractsRepositoryImplIT.groovy → ...ServiceIdContractsRepositoryImplIT.groovy b/...ServiceIdContractsRepositoryImplIT.groovy → ...ServiceIdContractsRepositoryImplIT.groovy
diff --git a/...ronment/JPAEnvironmentRepositoryIT.groovy → ...ronment/JPAEnvironmentRepositoryIT.groovy b/...ronment/JPAEnvironmentRepositoryIT.groovy → ...ronment/JPAEnvironmentRepositoryIT.groovy
diff --git a/...st/contracts/ContractsControllerIT.groovy → ...st/contracts/ContractsControllerIT.groovy b/...st/contracts/ContractsControllerIT.groovy → ...st/contracts/ContractsControllerIT.groovy
diff --git a/...nvironment/EnvironmentControllerIT.groovy → ...nvironment/EnvironmentControllerIT.groovy b/...nvironment/EnvironmentControllerIT.groovy → ...nvironment/EnvironmentControllerIT.groovy
diff --git a/...ship/InterrelationshipControllerIT.groovy → ...ship/InterrelationshipControllerIT.groovy b/...ship/InterrelationshipControllerIT.groovy → ...ship/InterrelationshipControllerIT.groovy
diff --git a/.../validation/ValidationControllerIT.groovy → .../validation/ValidationControllerIT.groovy b/.../validation/ValidationControllerIT.groovy → .../validation/ValidationControllerIT.groovy
diff --git a/...om/hltech/judged/server/ArchUnitUT.groovy → ...om/hltech/judged/server/ArchUnitUT.groovy b/...om/hltech/judged/server/ArchUnitUT.groovy → ...om/hltech/judged/server/ArchUnitUT.groovy
diff --git a/...tech/judged/server/domain/JudgeDUT.groovy → ...tech/judged/server/domain/JudgeDUT.groovy b/...tech/judged/server/domain/JudgeDUT.groovy → ...tech/judged/server/domain/JudgeDUT.groovy
@@ -19,7 +19,7 @@ import spock.lang.Subject
 
 import static org.assertj.core.util.Lists.newArrayList
 
-class JudgeDUT extends Specification {
+class RestContractValidatorUT extends Specification {
 
     def serviceContractsRepository = new InMemoryServiceContractsRepository()
     def environmentRepository = new InMemoryEnvironmentRepository()

diff --git a/...InMemoryServiceContractsRepository.groovy → ...InMemoryServiceContractsRepository.groovy b/...InMemoryServiceContractsRepository.groovy → ...InMemoryServiceContractsRepository.groovy
diff --git a/...r/domain/environment/EnvironmentUT.groovy → ...r/domain/environment/EnvironmentUT.groovy b/...r/domain/environment/EnvironmentUT.groovy → ...r/domain/environment/EnvironmentUT.groovy
diff --git a/...onment/InMemoryEnvironmentRepository.java → ...onment/InMemoryEnvironmentRepository.java b/...onment/InMemoryEnvironmentRepository.java → ...onment/InMemoryEnvironmentRepository.java
diff --git a/...idation/jms/JmsContractValidatorUT.groovy → ...idation/jms/JmsContractValidatorUT.groovy b/...idation/jms/JmsContractValidatorUT.groovy → ...idation/jms/JmsContractValidatorUT.groovy
diff --git a/...alidation/ping/PingContractValidator.java → ...alidation/ping/PingContractValidator.java b/...alidation/ping/PingContractValidator.java → ...alidation/ping/PingContractValidator.java
diff --git a/...ation/rest/RestContractValidatorUT.groovy → ...ation/rest/RestContractValidatorUT.groovy b/...ation/rest/RestContractValidatorUT.groovy → ...ation/rest/RestContractValidatorUT.groovy
diff --git a/...s/rest/contracts/ContractsMapperUT.groovy → ...s/rest/contracts/ContractsMapperUT.groovy b/...s/rest/contracts/ContractsMapperUT.groovy → ...s/rest/contracts/ContractsMapperUT.groovy
diff --git a/...nvironment/EnvironmentControllerUT.groovy → ...nvironment/EnvironmentControllerUT.groovy b/...nvironment/EnvironmentControllerUT.groovy → ...nvironment/EnvironmentControllerUT.groovy
diff --git a/...ship/InterrelationshipControllerUT.groovy → ...ship/InterrelationshipControllerUT.groovy b/...ship/InterrelationshipControllerUT.groovy → ...ship/InterrelationshipControllerUT.groovy
diff --git a/...faces/rest/validation/ConvertersUT.groovy → ...faces/rest/validation/ConvertersUT.groovy b/...faces/rest/validation/ConvertersUT.groovy → ...faces/rest/validation/ConvertersUT.groovy
diff --git a/.../validation/ValidationControllerUT.groovy → .../validation/ValidationControllerUT.groovy b/.../validation/ValidationControllerUT.groovy → .../validation/ValidationControllerUT.groovy
diff --git a/pom.xml b/pom.xml
@@ -102,7 +102,7 @@
                     <configuration>
                         <testSources>
                             <testSource>
-                                <directory>${project.basedir}/src/test/groovy</directory>
+                                <directory>${project.basedir}/src/test</directory>
                                 <includes>
                                     <include>**/*.groovy</include>
                                 </includes>
@@ -137,6 +137,8 @@
                         <includes>
                             <include>**/*IT.java</include>
                             <include>**/*IT.groovy</include>
+                            <include>**/*FT.java</include>
+                            <include>**/*FT.groovy</include>
                         </includes>
                     </configuration>
                     <executions>