Skip to content

Commit 0054368

Browse files
committed
- build: ci: add server name to test name
- now maven will display the server name on test - remove/cleanup display name for servertest: hide arguments
1 parent 95a96fb commit 0054368

6 files changed

Lines changed: 42 additions & 4 deletions

File tree

pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1409,6 +1409,14 @@
14091409
<jooby.maven.build>true</jooby.maven.build>
14101410
</systemPropertyVariables>
14111411
<argLine>@{argLine}</argLine>
1412+
<statelessTestsetReporter implementation="org.apache.maven.plugin.surefire.extensions.junit5.JUnit5Xml30StatelessReporter">
1413+
<disable>false</disable>
1414+
<version>3.0</version>
1415+
<usePhrasedFileName>false</usePhrasedFileName>
1416+
<usePhrasedTestSuiteClassName>true</usePhrasedTestSuiteClassName>
1417+
<usePhrasedTestCaseClassName>true</usePhrasedTestCaseClassName>
1418+
<usePhrasedTestCaseMethodName>true</usePhrasedTestCaseMethodName>
1419+
</statelessTestsetReporter>
14121420
</configuration>
14131421
</plugin>
14141422
</plugins>

tests/src/test/java/io/jooby/i3500/WidgetService.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ public WidgetService() {
1818
"/api/widgets1",
1919
ctx -> {
2020
Widget widget = ctx.body().to(Widget.class);
21-
System.out.println("Created " + widget);
2221
return ctx.send(StatusCode.CREATED);
2322
});
2423

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
/*
2+
* Jooby https://jooby.io
3+
* Apache License Version 2.0 https://jooby.io/LICENSE.txt
4+
* Copyright 2014 Edgar Espina
5+
*/
6+
package io.jooby.junit;
7+
8+
import java.lang.reflect.Method;
9+
import java.util.List;
10+
import java.util.stream.Stream;
11+
12+
import org.junit.jupiter.api.DisplayNameGenerator;
13+
14+
public class CleanMethodNameGenerator extends DisplayNameGenerator.Standard {
15+
@Override
16+
public String generateDisplayNameForMethod(
17+
List<Class<?>> enclosingInstanceTypes, Class<?> testClass, Method testMethod) {
18+
// remove (ServerTestRunner) from test name:
19+
var args =
20+
Stream.of(testMethod.getParameters())
21+
.filter(param -> !param.getType().equals(ServerTestRunner.class))
22+
.toList();
23+
return args.isEmpty()
24+
? testMethod.getName()
25+
: super.generateDisplayNameForMethod(enclosingInstanceTypes, testClass, testMethod);
26+
}
27+
}

tests/src/test/java/io/jooby/junit/ServerExtensionImpl.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private TestTemplateInvocationContext invocationContext(ServerInfo serverInfo) {
117117
return new TestTemplateInvocationContext() {
118118
@Override
119119
public String getDisplayName(int invocationIndex) {
120-
return serverInfo.description;
120+
return isMavenBuild() ? "(" + serverInfo.description + ")" : serverInfo.description;
121121
}
122122

123123
@Override
@@ -138,4 +138,8 @@ private static String displayName(Class server, ExecutionMode mode, int i, int t
138138
}
139139
return displayName.toString();
140140
}
141+
142+
static boolean isMavenBuild() {
143+
return !System.getProperty("surefire.real.class.path", "").isEmpty();
144+
}
141145
}

tests/src/test/java/io/jooby/junit/ServerTestRunner.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ public void ready(SneakyThrows.Consumer2<WebClient, WebClient> onReady) {
9191
System.setProperty("___server_name__", server.getName());
9292
var app = provider.get();
9393
// Reduce log from maven build:
94-
var mavenBuild = System.getProperty("surefire.real.class.path", "").length() > 0;
95-
if (mavenBuild) {
94+
if (ServerExtensionImpl.isMavenBuild()) {
9695
applogger = app.getClass().getName();
9796
app.setStartupSummary(List.of(StartupSummary.NONE));
9897
app.error(
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
junit.jupiter.displayname.generator.default=io.jooby.junit.CleanMethodNameGenerator

0 commit comments

Comments
 (0)