TS-8032 Add more nested test projects

cqse · May 1, 2023 · 73dbbf0 · 73dbbf0
1 parent b13ff1a
commit 73dbbf0
Show file tree

Hide file tree

Showing 11 changed files with 143 additions and 51 deletions.
diff --git a/system-tests/maven-external-upload-test/root-project/pom.xml b/system-tests/maven-external-upload-test/root-project/pom.xml
@@ -4,15 +4,11 @@
 
 
     <modelVersion>4.0.0</modelVersion>
-
     <groupId>org.example</groupId>
-
     <artifactId>root-project</artifactId>
-
     <version>1.0-SNAPSHOT</version>
 
     <name>root-project</name>
-
     <packaging>pom</packaging>
 
     <properties>
@@ -103,15 +99,12 @@
                         </execution>
                     </executions>
                     <configuration>
-                        <teamscaleUrl>http://localhost:${tia.teamscale.fake.port}</teamscaleUrl>
-                        <projectId>m</projectId>
-                        <username>build</username>
-                        <accessToken>6lJKEvNHeTxGPhMAi4D84DWqzoSFL1p4</accessToken>
+                        <teamscaleUrl>http://localhost:8080</teamscaleUrl>
+                        <projectId>mavensystemtestroot</projectId>
+                        <username>admin</username>
+                        <accessToken>LiNbRhi2KtGvlQX8Oli05K3LKMgO5jS4</accessToken>
                         <endCommit>master:HEAD</endCommit>
                         <partition>MyPartition</partition>
-                        <includes>
-                            <include>*foo.*</include>
-                        </includes>
                     </configuration>
                 </plugin>
             </plugins>

diff --git a/system-tests/maven-external-upload-test/root-project/sub-project-A/pom.xml b/system-tests/maven-external-upload-test/root-project/sub-project-A/pom.xml
@@ -33,10 +33,6 @@
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>com.teamscale</groupId>
-        <artifactId>teamscale-maven-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 

diff --git a/system-tests/maven-external-upload-test/root-project/sub-project-B/pom.xml b/system-tests/maven-external-upload-test/root-project/sub-project-B/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
@@ -11,33 +11,10 @@
   <version>1.0-SNAPSHOT</version>
 
   <name>sub-project-B</name>
+  <packaging>pom</packaging>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.junit.jupiter</groupId>
-      <artifactId>junit-jupiter-engine</artifactId>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-failsafe-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.jacoco</groupId>
-        <artifactId>jacoco-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>com.teamscale</groupId>
-        <artifactId>teamscale-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>
-
+  <modules>
+    <module>sub-project-B1</module>
+    <module>sub-project-B2</module>
+  </modules>
 </project>
diff --git a/system-tests/maven-external-upload-test/root-project/sub-project-B/sub-project-B1/pom.xml b/system-tests/maven-external-upload-test/root-project/sub-project-B/sub-project-B1/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>sub-project-B</artifactId>
+    <groupId>org.example</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>sub-project-B1</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>sub-project-B1</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/...ect-B/src/main/java/org/example/SUTB.java → ...t-B1/src/main/java/org/example/SUTB1.java b/...ect-B/src/main/java/org/example/SUTB.java → ...t-B1/src/main/java/org/example/SUTB1.java
@@ -4,7 +4,7 @@
  * Hello world!
  *
  */
-public class SUTB
+public class SUTB1
 {
     public void goo() {
         System.out.println("goo");

diff --git a/...-B/src/test/java/org/example/IntegIT.java → ...B1/src/test/java/org/example/IntegIT.java b/...-B/src/test/java/org/example/IntegIT.java → ...B1/src/test/java/org/example/IntegIT.java
@@ -1,17 +1,17 @@
 package bar;
 
 import org.junit.jupiter.api.Test;
-import org.example.SUTB;
+import org.example.SUTB1;
 
 public class IntegIT {
 
     @Test
     public void itBlub() throws Exception {
-        new SUTB().blub();
+        new SUTB1().blub();
     }
 
     @Test
     public void itGoo() {
-        new SUTB().goo();
+        new SUTB1().goo();
     }
 }
diff --git a/...B/src/test/java/org/example/UnitTest.java → ...1/src/test/java/org/example/UnitTest.java b/...B/src/test/java/org/example/UnitTest.java → ...1/src/test/java/org/example/UnitTest.java
@@ -1,17 +1,17 @@
 package bar;
 
 import org.junit.jupiter.api.Test;
-import org.example.SUTB;
+import org.example.SUTB1;
 
 public class UnitTest {
 
     @Test
     public void utBlub() {
-        new SUTB().blub();
+        new SUTB1().blub();
     }
 
     @Test
     public void utGoo() {
-        new SUTB().goo();
+        new SUTB1().goo();
     }
 }
diff --git a/system-tests/maven-external-upload-test/root-project/sub-project-B/sub-project-B2/pom.xml b/system-tests/maven-external-upload-test/root-project/sub-project-B/sub-project-B2/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <artifactId>sub-project-B</artifactId>
+    <groupId>org.example</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>sub-project-B2</artifactId>
+  <version>1.0-SNAPSHOT</version>
+
+  <name>sub-project-B2</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>org.jacoco</groupId>
+        <artifactId>jacoco-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/...pload-test/root-project/sub-project-B/sub-project-B2/src/main/java/org/example/SUTB2.java b/...pload-test/root-project/sub-project-B/sub-project-B2/src/main/java/org/example/SUTB2.java
@@ -0,0 +1,16 @@
+package org.example;
+
+/**
+ * Hello world!
+ *
+ */
+public class SUTB2
+{
+    public void goo() {
+        System.out.println("goo");
+    }
+
+    public void blub() {
+        System.out.println("blub");
+    }
+}
diff --git a/...oad-test/root-project/sub-project-B/sub-project-B2/src/test/java/org/example/IntegIT.java b/...oad-test/root-project/sub-project-B/sub-project-B2/src/test/java/org/example/IntegIT.java
@@ -0,0 +1,17 @@
+package bar;
+
+import org.junit.jupiter.api.Test;
+import org.example.SUTB2;
+
+public class IntegIT {
+
+    @Test
+    public void itBlub() throws Exception {
+        new SUTB2().blub();
+    }
+
+    @Test
+    public void itGoo() {
+        new SUTB2().goo();
+    }
+}
diff --git a/...ad-test/root-project/sub-project-B/sub-project-B2/src/test/java/org/example/UnitTest.java b/...ad-test/root-project/sub-project-B/sub-project-B2/src/test/java/org/example/UnitTest.java
@@ -0,0 +1,17 @@
+package bar;
+
+import org.junit.jupiter.api.Test;
+import org.example.SUTB2;
+
+public class UnitTest {
+
+    @Test
+    public void utBlub() {
+        new SUTB2().blub();
+    }
+
+    @Test
+    public void utGoo() {
+        new SUTB2().goo();
+    }
+}