Skip to content

Commit 75557fa

Browse files
robertpatrickrobertpatrick
authored
splitting system test up into multiple modules (#1201)
1 parent dd45fef commit 75557fa

35 files changed

+509
-176
lines changed

‎Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,11 @@ pipeline {
6262
}
6363
}
6464
steps {
65-
sh 'mvn -B -DskipITs=false -Dmw_home=${ORACLE_HOME} -Ddb.use.container.network=true verify'
65+
sh 'mvn -B -DskipITs=false -Dmw_home=${ORACLE_HOME} -Ddb.use.container.network=true install'
6666
}
6767
post {
6868
always {
69-
junit 'system-test/target/failsafe-reports/*.xml'
69+
junit 'system-test/integration-tests/target/failsafe-reports/*.xml'
7070
}
7171
}
7272
}

‎system-test/apps/pom.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2022, Oracle and/or its affiliates.
4+
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
5+
-->
6+
<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">
7+
<modelVersion>4.0.0</modelVersion>
8+
9+
<artifactId>weblogic-deploy-system-test-apps</artifactId>
10+
<packaging>pom</packaging>
11+
12+
<parent>
13+
<artifactId>weblogic-deploy-system-test</artifactId>
14+
<groupId>com.oracle.weblogic.lifecycle</groupId>
15+
<version>2.3.4-SNAPSHOT</version>
16+
<relativePath>../pom.xml</relativePath>
17+
</parent>
18+
19+
<modules>
20+
<module>simple-app</module>
21+
<module>simple-app-archive</module>
22+
<module>simple-app-updated-archive</module>
23+
</modules>
24+
</project>

‎system-test/apps/simple-app-archive/pom.xml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2017, 2022, Oracle and/or its affiliates.
4+
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
5+
-->
6+
<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">
7+
<modelVersion>4.0.0</modelVersion>
8+
9+
<artifactId>weblogic-deploy-system-test-apps-simple-app-archive</artifactId>
10+
<packaging>pom</packaging>
11+
12+
<parent>
13+
<artifactId>weblogic-deploy-system-test-apps</artifactId>
14+
<groupId>com.oracle.weblogic.lifecycle</groupId>
15+
<version>2.3.4-SNAPSHOT</version>
16+
<relativePath>../pom.xml</relativePath>
17+
</parent>
18+
19+
<build>
20+
<plugins>
21+
<plugin>
22+
<groupId>org.apache.maven.plugins</groupId>
23+
<artifactId>maven-dependency-plugin</artifactId>
24+
<executions>
25+
<execution>
26+
<id>get-simple-app-war</id>
27+
<phase>prepare-package</phase>
28+
<goals>
29+
<goal>copy</goal>
30+
</goals>
31+
<configuration>
32+
<artifactItems>
33+
<artifactItem>
34+
<groupId>com.oracle.weblogic.lifecycle</groupId>
35+
<artifactId>weblogic-deploy-system-test-apps-simple-app</artifactId>
36+
<version>${project.version}</version>
37+
<type>war</type>
38+
<overWrite>true</overWrite>
39+
<outputDirectory>${project.build.directory}</outputDirectory>
40+
<destFileName>simple-app.war</destFileName>
41+
</artifactItem>
42+
</artifactItems>
43+
</configuration>
44+
</execution>
45+
</executions>
46+
</plugin>
47+
<plugin>
48+
<groupId>org.apache.maven.plugins</groupId>
49+
<artifactId>maven-assembly-plugin</artifactId>
50+
<executions>
51+
<execution>
52+
<id>build-archive-file</id>
53+
<phase>package</phase>
54+
<goals>
55+
<goal>single</goal>
56+
</goals>
57+
<configuration>
58+
<finalName>archive</finalName>
59+
<descriptors>
60+
<descriptor>src/assembly/zip.xml</descriptor>
61+
</descriptors>
62+
<appendAssemblyId>false</appendAssemblyId>
63+
</configuration>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
</plugins>
68+
</build>
69+
</project>

‎system-test/apps/simple-app-archive/src/assembly/zip.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!--
2+
Copyright (c) 2022, Oracle Corporation and/or its affiliates. All rights reserved.
3+
The Universal Permissive License (UPL), Version 1.0
4+
-->
5+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1"
6+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 http://maven.apache.org/xsd/assembly-2.1.1.xsd">
8+
<id>zip</id>
9+
<baseDirectory>wlsdeploy</baseDirectory>
10+
<formats>
11+
<format>zip</format>
12+
</formats>
13+
14+
<fileSets>
15+
<fileSet>
16+
<directory>${project.build.directory}</directory>
17+
<outputDirectory>applications</outputDirectory>
18+
<includes>
19+
<include>simple-app.war</include>
20+
</includes>
21+
</fileSet>
22+
</fileSets>
23+
</assembly>

‎system-test/apps/simple-app-updated-archive/pom.xml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2017, 2022, Oracle and/or its affiliates.
4+
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
5+
-->
6+
<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">
7+
<modelVersion>4.0.0</modelVersion>
8+
9+
<artifactId>weblogic-deploy-system-test-apps-simple-app-updated-archive</artifactId>
10+
<packaging>pom</packaging>
11+
12+
<parent>
13+
<artifactId>weblogic-deploy-system-test-apps</artifactId>
14+
<groupId>com.oracle.weblogic.lifecycle</groupId>
15+
<version>2.3.4-SNAPSHOT</version>
16+
<relativePath>../pom.xml</relativePath>
17+
</parent>
18+
19+
<properties>
20+
<webapp-name>simple-app</webapp-name>
21+
<webapp-dir>${project.build.directory}/${webapp-name}</webapp-dir>
22+
</properties>
23+
24+
<build>
25+
<finalName>${webapp-name}</finalName>
26+
<plugins>
27+
<plugin>
28+
<groupId>org.apache.maven.plugins</groupId>
29+
<artifactId>maven-dependency-plugin</artifactId>
30+
<executions>
31+
<execution>
32+
<id>get-simple-app-war</id>
33+
<phase>prepare-package</phase>
34+
<goals>
35+
<goal>unpack</goal>
36+
</goals>
37+
<configuration>
38+
<artifactItems>
39+
<artifactItem>
40+
<groupId>com.oracle.weblogic.lifecycle</groupId>
41+
<artifactId>weblogic-deploy-system-test-apps-simple-app</artifactId>
42+
<version>${project.version}</version>
43+
<type>war</type>
44+
<overWrite>true</overWrite>
45+
<outputDirectory>${webapp-dir}</outputDirectory>
46+
<includes>WEB-INF/**/*,**/*.html</includes>
47+
</artifactItem>
48+
</artifactItems>
49+
</configuration>
50+
</execution>
51+
</executions>
52+
</plugin>
53+
<plugin>
54+
<groupId>org.apache.maven.plugins</groupId>
55+
<artifactId>maven-resources-plugin</artifactId>
56+
<executions>
57+
<execution>
58+
<id>add-dummy-file</id>
59+
<phase>prepare-package</phase>
60+
<goals>
61+
<goal>copy-resources</goal>
62+
</goals>
63+
<configuration>
64+
<outputDirectory>${webapp-dir}</outputDirectory>
65+
<resources>
66+
<resource>
67+
<directory>${project.basedir}/src/main/resources</directory>
68+
<includes>
69+
<include>dummy.html</include>
70+
</includes>
71+
</resource>
72+
</resources>
73+
</configuration>
74+
</execution>
75+
</executions>
76+
</plugin>
77+
<plugin>
78+
<groupId>org.apache.maven.plugins</groupId>
79+
<artifactId>maven-war-plugin</artifactId>
80+
<version>3.3.2</version>
81+
<executions>
82+
<execution>
83+
<id>build-war-file</id>
84+
<phase>package</phase>
85+
<goals>
86+
<goal>war</goal>
87+
</goals>
88+
<configuration>
89+
<warSourceDirectory>${webapp-dir}</warSourceDirectory>
90+
</configuration>
91+
</execution>
92+
</executions>
93+
</plugin>
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-assembly-plugin</artifactId>
97+
<executions>
98+
<execution>
99+
<id>build-archive-file</id>
100+
<phase>package</phase>
101+
<goals>
102+
<goal>single</goal>
103+
</goals>
104+
<configuration>
105+
<finalName>archive2</finalName>
106+
<descriptors>
107+
<descriptor>src/assembly/zip.xml</descriptor>
108+
</descriptors>
109+
<appendAssemblyId>false</appendAssemblyId>
110+
</configuration>
111+
</execution>
112+
</executions>
113+
</plugin>
114+
</plugins>
115+
</build>
116+
</project>

‎system-test/apps/simple-app-updated-archive/src/assembly/zip.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<!--
2+
Copyright (c) 2022, Oracle Corporation and/or its affiliates. All rights reserved.
3+
The Universal Permissive License (UPL), Version 1.0
4+
-->
5+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.1"
6+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.1 http://maven.apache.org/xsd/assembly-2.1.1.xsd">
8+
<id>war</id>
9+
<baseDirectory>wlsdeploy</baseDirectory>
10+
<formats>
11+
<format>zip</format>
12+
</formats>
13+
14+
<fileSets>
15+
<fileSet>
16+
<directory>${project.build.directory}</directory>
17+
<outputDirectory>applications</outputDirectory>
18+
<includes>
19+
<include>simple-app.war</include>
20+
</includes>
21+
</fileSet>
22+
</fileSets>
23+
</assembly>

‎system-test/apps/simple-app-updated-archive/src/main/resources/dummy.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<html>
2+
<head>
3+
<title>Dummy Page</title>
4+
</head>
5+
<body>
6+
<p>This is a dummy page!</p>
7+
</body>
8+
</html>

‎system-test/apps/simple-app/pom.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2017, 2022, Oracle and/or its affiliates.
4+
Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
5+
-->
6+
<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">
7+
<modelVersion>4.0.0</modelVersion>
8+
9+
<artifactId>weblogic-deploy-system-test-apps-simple-app</artifactId>
10+
<packaging>war</packaging>
11+
12+
<parent>
13+
<artifactId>weblogic-deploy-system-test-apps</artifactId>
14+
<groupId>com.oracle.weblogic.lifecycle</groupId>
15+
<version>2.3.4-SNAPSHOT</version>
16+
<relativePath>../pom.xml</relativePath>
17+
</parent>
18+
19+
<build>
20+
<finalName>simple-app</finalName>
21+
<plugins>
22+
<plugin>
23+
<groupId>org.apache.maven.plugins</groupId>
24+
<artifactId>maven-war-plugin</artifactId>
25+
</plugin>
26+
</plugins>
27+
</build>
28+
</project>

‎system-test/src/test/resources/archive/simple-app/WEB-INF/web.xml renamed to ‎system-test/apps/simple-app/src/main/webapp/WEB-INF/web.xml

File renamed without changes.

‎system-test/src/test/resources/archive/simple-app/WEB-INF/weblogic.xml renamed to ‎system-test/apps/simple-app/src/main/webapp/WEB-INF/weblogic.xml

File renamed without changes.

0 commit comments

Comments
 (0)