Skip to content

Commit 2bec803

Browse files
authored
Merge pull request #269 from Karm/adds-quarkus-to-testsuite
Adds Quarkus to the TS, CircleCI update for TS, whitelists
2 parents 6edd815 + 5607062 commit 2bec803

File tree

4 files changed

+71
-10
lines changed

4 files changed

+71
-10
lines changed

.circleci/config.yml

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
version: 2.1
22
executors:
33
maven-builder:
4-
docker:
5-
- image: circleci/openjdk:11-jdk
4+
machine: true
65
docker-publisher:
76
environment:
87
IMAGE_NAME: microprofile/start.microprofile.io
@@ -23,12 +22,28 @@ jobs:
2322
curl -X POST -i -H "Content-Type: application/json" -H "Accept: application/json" -H "Authorization: Bearer $GITTER_TOKEN" \
2423
"https://api.gitter.im/v1/rooms/$GITTER_ROOM_ID/chatMessages" -d \
2524
"{\"text\":\"Automatic message: Hello, new [build]($CIRCLE_BUILD_URL) has started.\"}"
26-
- run: mvn dependency:go-offline -Pthorntail -Djdk.net.URLClassPath.disableClassPathURLCheck=true
25+
- run: if [[ ! -d ${HOME}/jdk-11.0.4+11 ]];then wget https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.4%2B11/OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz;fi;
26+
- run: if [[ ! -d ${HOME}/jdk-11.0.4+11 ]];then tar -xvf OpenJDK11U-jdk_x64_linux_hotspot_11.0.4_11.tar.gz -C ${HOME}/;fi;
27+
- run: if [[ ! -d ${HOME}/apache-maven-3.6.3 ]];then wget https://archive.apache.org/dist/maven/maven-3/3.6.3/binaries/apache-maven-3.6.3-bin.tar.gz;fi;
28+
- run: if [[ ! -d ${HOME}/apache-maven-3.6.3 ]];then tar -xvf apache-maven-3.6.3-bin.tar.gz -C ${HOME}/;fi;
29+
- run:
30+
name: build-fetch
31+
command: |
32+
export PATH=${HOME}/apache-maven-3.6.3/bin:${HOME}/jdk-11.0.4+11/bin:${PATH}; \
33+
export JAVA_HOME=${HOME}/jdk-11.0.4+11/; \
34+
mvn -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 dependency:go-offline -Pthorntail
2735
- save_cache:
2836
paths:
29-
- ~/.m2
37+
- ${HOME}/.m2
38+
- ${HOME}/apache-maven-3.6.3
39+
- ${HOME}/jdk-11.0.4+11
3040
key: v1-dependencies-{{ checksum "pom.xml" }}
31-
- run: mvn clean package -Pthorntail -Djdk.net.URLClassPath.disableClassPathURLCheck=true
41+
- run:
42+
name: package-tests
43+
command: |
44+
export PATH=${HOME}/apache-maven-3.6.3/bin:${HOME}/jdk-11.0.4+11/bin:${PATH}; \
45+
export JAVA_HOME=${HOME}/jdk-11.0.4+11/; \
46+
mvn -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 clean package -Pthorntail -Dskip.integration.tests=false -DSTARTER_TS_WORKSPACE=/dev/shm/
3247
- persist_to_workspace:
3348
root: .
3449
paths:

src/it/java/org/eclipse/microprofile/starter/TestMatrixTest.java

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,4 +446,36 @@ public void tomeeJWTRest() throws IOException, InterruptedException {
446446
testRuntime("TOMEE", "tomee",
447447
SpecSelection.JWT_REST, new int[]{8009, 8005, 8180, 8109, 8105});
448448
}
449+
450+
@Test
451+
@RunAsClient
452+
@InSequence(25)
453+
public void quarkusEmpty() throws IOException, InterruptedException {
454+
testRuntime("QUARKUS", "quarkus",
455+
SpecSelection.EMPTY, new int[]{9990});
456+
}
457+
458+
@Test
459+
@RunAsClient
460+
@InSequence(26)
461+
public void quarkusAll() throws IOException, InterruptedException {
462+
testRuntime("QUARKUS", "quarkus",
463+
SpecSelection.ALL, new int[]{9990, 8180, 10090});
464+
}
465+
466+
@Test
467+
@RunAsClient
468+
@InSequence(27)
469+
public void quarkusAllButJWTRest() throws IOException, InterruptedException {
470+
testRuntime("QUARKUS", "quarkus",
471+
SpecSelection.ALL_BUT_JWT_REST, new int[]{9990});
472+
}
473+
474+
@Test
475+
@RunAsClient
476+
@InSequence(28)
477+
public void quarkusJWTRest() throws IOException, InterruptedException {
478+
testRuntime("QUARKUS", "quarkus",
479+
SpecSelection.JWT_REST, new int[]{9990, 8180, 10090});
480+
}
449481
}

src/it/java/org/eclipse/microprofile/starter/utils/Logs.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ public static void checkLog(String testClass, String testMethod, String logname,
5252
whiteList = Whitelist.KUMULUZEE.errs;
5353
} else if (testMethod.contains(Whitelist.TOMEE.name)) {
5454
whiteList = Whitelist.TOMEE.errs;
55+
} else if (testMethod.contains(Whitelist.QUARKUS.name)) {
56+
whiteList = Whitelist.QUARKUS.errs;
5557
} else {
5658
throw new IllegalArgumentException(
5759
"testMethod as matter of convention should always contain lower-case server name, e.g. thorntail");
@@ -71,7 +73,7 @@ public static void checkLog(String testClass, String testMethod, String logname,
7173
}
7274
}
7375
assertFalse(logname + " should not contain `ERROR' lines that are not whitelisted. " +
74-
"See target" + File.separator + "archived-logs" + File.separator + testClass + File.separator + testMethod + File.separator + log.getName() + "",
76+
"See target" + File.separator + "archived-logs" + File.separator + testClass + File.separator + testMethod + File.separator + log.getName(),
7577
error && !whiteListed);
7678
}
7779
}

src/it/java/org/eclipse/microprofile/starter/utils/Whitelist.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,26 @@
2727
* @author Michal Karm Babacek <[email protected]>
2828
*/
2929
public enum Whitelist {
30-
THORNTAIL_V2("thorntail", new String[]{}),
31-
PAYARA_MICRO("payara", new String[]{}),
30+
THORNTAIL_V2("thorntail", new String[]{
31+
"wildfly-domain-http-error-context"
32+
}),
33+
PAYARA_MICRO("payara", new String[]{
34+
"com.hazelcast.nio.tcp.TcpIpConnectionErrorHandler"
35+
}),
3236
LIBERTY("liberty", new String[]{
3337
"OpenTracing cannot track JAX-RS requests because an OpentracingTracerFactory class was not provided."
3438
}),
3539
HELIDON("helidon", new String[]{}),
36-
KUMULUZEE("kumuluzee", new String[]{"Copying error_prone_annotations"}),
37-
TOMEE("tomee", new String[]{});
40+
KUMULUZEE("kumuluzee", new String[]{
41+
"error_prone_annotations",
42+
"error_prone_parent",
43+
"underlying class loading error: Type Failure to load: com.mongodb.MongoClient not found."
44+
}),
45+
TOMEE("tomee", new String[]{}),
46+
QUARKUS("quarkus", new String[]{
47+
"[org.jboss.threads.errors] Thread Thread[build",
48+
"org/jboss/threads/EnhancedQueueExecutor"
49+
});
3850

3951
public final String name;
4052
public final String[] errs;

0 commit comments

Comments
 (0)