Weird test fixes

IsantePlus · Apr 16, 2021 · 0b0b04b · 0b0b04b
1 parent dae4654
commit 0b0b04b
Show file tree

Hide file tree

Showing 138 changed files with 58 additions and 4,918 deletions.
diff --git a/api-2.1/pom.xml b/api-2.1/pom.xml
@@ -23,13 +23,13 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>${project.parent.artifactId}-test-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>${project.parent.groupId}</groupId>-->
+<!--            <artifactId>${project.parent.artifactId}-test-data</artifactId>-->
+<!--            <version>${project.parent.version}</version>-->
+<!--            <type>test-jar</type>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>

diff --git a/api-2.2/pom.xml b/api-2.2/pom.xml
@@ -26,13 +26,13 @@
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>${project.parent.artifactId}-test-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>${project.parent.groupId}</groupId>-->
+<!--            <artifactId>${project.parent.artifactId}-test-data</artifactId>-->
+<!--            <version>${project.parent.version}</version>-->
+<!--            <type>test-jar</type>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>

diff --git a/api/pom.xml b/api/pom.xml
@@ -48,13 +48,13 @@
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>${project.parent.artifactId}-test-data</artifactId>
-			<version>${project.parent.version}</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>${project.parent.groupId}</groupId>-->
+<!--			<artifactId>${project.parent.artifactId}-test-data</artifactId>-->
+<!--			<version>${project.parent.version}</version>-->
+<!--			<type>test-jar</type>-->
+<!--			<scope>test</scope>-->
+<!--		</dependency>-->
     </dependencies>
 
 	<build>

diff --git a/integration-tests-2.1/pom.xml b/integration-tests-2.1/pom.xml
@@ -52,13 +52,13 @@
 			<type>test-jar</type>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>${project.parent.artifactId}-test-data</artifactId>
-			<version>${project.parent.version}</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>${project.parent.groupId}</groupId>-->
+<!--			<artifactId>${project.parent.artifactId}-test-data</artifactId>-->
+<!--			<version>${project.parent.version}</version>-->
+<!--			<type>test-jar</type>-->
+<!--			<scope>test</scope>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>

diff --git a/integration-tests-2.2/pom.xml b/integration-tests-2.2/pom.xml
@@ -50,13 +50,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>${project.parent.artifactId}-test-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>${project.parent.groupId}</groupId>-->
+<!--            <artifactId>${project.parent.artifactId}-test-data</artifactId>-->
+<!--            <version>${project.parent.version}</version>-->
+<!--            <type>test-jar</type>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -44,13 +44,13 @@
             <type>test-jar</type>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>${project.parent.artifactId}-test-data</artifactId>
-            <version>${project.parent.version}</version>
-            <type>test-jar</type>
-            <scope>test</scope>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>${project.parent.groupId}</groupId>-->
+<!--            <artifactId>${project.parent.artifactId}-test-data</artifactId>-->
+<!--            <version>${project.parent.version}</version>-->
+<!--            <type>test-jar</type>-->
+<!--            <scope>test</scope>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>

diff --git a/omod/pom.xml b/omod/pom.xml
@@ -17,14 +17,14 @@
             <artifactId>${project.parent.artifactId}-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>${project.parent.artifactId}-api</artifactId>
-			<version>${project.version}</version>
-			<type>test-jar</type>
-			<classifier>tests</classifier>
-			<scope>test</scope>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>${project.parent.groupId}</groupId>-->
+<!--			<artifactId>${project.parent.artifactId}-api</artifactId>-->
+<!--			<version>${project.version}</version>-->
+<!--			<type>test-jar</type>-->
+<!--			<classifier>tests</classifier>-->
+<!--			<scope>test</scope>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>${project.parent.groupId}</groupId>
 			<artifactId>${project.parent.artifactId}-api-2.1</artifactId>
@@ -35,13 +35,13 @@
 			<artifactId>${project.parent.artifactId}-api-2.2</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>${project.parent.groupId}</groupId>
-			<artifactId>${project.parent.artifactId}-test-data</artifactId>
-			<version>${project.parent.version}</version>
-			<type>test-jar</type>
-			<scope>test</scope>
-		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>${project.parent.groupId}</groupId>-->
+<!--			<artifactId>${project.parent.artifactId}-test-data</artifactId>-->
+<!--			<version>${project.parent.version}</version>-->
+<!--			<type>test-jar</type>-->
+<!--			<scope>test</scope>-->
+<!--		</dependency>-->
 		<dependency>
 			<groupId>org.openmrs.web</groupId>
 			<artifactId>openmrs-web</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
     </scm>
 
     <modules>
-        <module>test-data</module>
+<!--        <module>test-data</module>-->
         <module>api</module>
         <module>api-2.1</module>
         <module>api-2.2</module>

diff --git a/test-data/pom.xml b/test-data/pom.xml
diff --git a/.../org/openmrs/module/fhir2/api/dao/impl/FhirAllergyIntoleranceDaoImplTest_initial_data.xml b/.../org/openmrs/module/fhir2/api/dao/impl/FhirAllergyIntoleranceDaoImplTest_initial_data.xml
diff --git a/...st/resources/org/openmrs/module/fhir2/api/dao/impl/FhirCohortDaoImplTest_initial_data.xml b/...st/resources/org/openmrs/module/fhir2/api/dao/impl/FhirCohortDaoImplTest_initial_data.xml
diff --git a/...esources/org/openmrs/module/fhir2/api/dao/impl/FhirCohortListDaoImplTest_initial_data.xml b/...esources/org/openmrs/module/fhir2/api/dao/impl/FhirCohortListDaoImplTest_initial_data.xml