Skip to content

Commit a299561

Browse files
authored
Fix integration tests (#2004)
This updates the tests in accordance with the changes in 5363559. The new changes require that the integration test projects now target Java 21 for main and test code.
1 parent 4f22957 commit a299561

8 files changed

+999
-86
lines changed

integration-tests/checkstyle-expected-changes.patch

Lines changed: 744 additions & 57 deletions
Large diffs are not rendered by default.

integration-tests/checkstyle.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test_name="$(basename "${0}" .sh)"
66
project='checkstyle'
77
repository='https://github.com/checkstyle/checkstyle.git'
88
revision='checkstyle-12.0.1'
9-
additional_build_flags='-Perror-prone-compile,error-prone-test-compile -Dmaven.compiler.failOnError=true'
9+
additional_build_flags='-Djava.version=21 -Perror-prone-compile,error-prone-test-compile -Dmaven.compiler.failOnError=true'
1010
additional_source_directories='${project.basedir}${file.separator}src${file.separator}it${file.separator}java,${project.basedir}${file.separator}src${file.separator}xdocs-examples${file.separator}java'
1111
shared_error_prone_flags='-XepExcludedPaths:(\Q${project.basedir}${file.separator}src${file.separator}\E(it|test|xdocs-examples)\Q${file.separator}resources\E|\Q${project.build.directory}${file.separator}\E).*'
1212
patch_error_prone_flags=''

integration-tests/metrics-expected-changes.patch

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3434,7 +3434,13 @@
34343434

34353435
for (int i = 0; i < threadCount; i++) {
34363436
new Thread(
3437-
@@ -898,7 +901,7 @@ class MetricNameTest {
3437+
@@ -893,12 +896,12 @@ class MetricNameTest {
3438+
latch.await(5, TimeUnit.SECONDS);
3439+
3440+
if (!exceptions.isEmpty()) {
3441+
- throw new AssertionError("Thread safety test failed: " + exceptions.get(0).getMessage());
3442+
+ throw new AssertionError("Thread safety test failed: " + exceptions.getFirst().getMessage());
3443+
}
34383444
}
34393445

34403446
@Test
@@ -5175,6 +5181,18 @@
51755181

51765182
private CompiledScript unpickleScript;
51775183

5184+
@@ -166,9 +166,9 @@ class PickledGraphiteTest {
5185+
5186+
for (Object aResult : result) {
5187+
PyTuple datapoint = (PyTuple) aResult;
5188+
- String name = datapoint.get(0).toString();
5189+
+ String name = datapoint.getFirst().toString();
5190+
PyTuple valueTuple = (PyTuple) datapoint.get(1);
5191+
- Object timestamp = valueTuple.get(0);
5192+
+ Object timestamp = valueTuple.getFirst();
5193+
Object value = valueTuple.get(1);
5194+
5195+
results.append(name).append(" ").append(value).append(" ").append(timestamp).append("\n");
51785196
--- a/metrics-healthchecks/src/main/java/io/dropwizard/metrics5/health/AsyncHealthCheckDecorator.java
51795197
+++ b/metrics-healthchecks/src/main/java/io/dropwizard/metrics5/health/AsyncHealthCheckDecorator.java
51805198
@@ -1,5 +1,7 @@

integration-tests/metrics-expected-warnings.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ metrics-core/src/main/java/io/dropwizard/metrics5/InstrumentedExecutorService.ja
1212
metrics-core/src/main/java/io/dropwizard/metrics5/MetricRegistry.java:[56,27] [this-escape] possible 'this' escape before subclass is fully initialized
1313
metrics-core/src/main/java/io/dropwizard/metrics5/ScheduledReporter.java:[40,12] [removal] SecurityManager in java.lang has been deprecated and marked for removal
1414
metrics-core/src/main/java/io/dropwizard/metrics5/ScheduledReporter.java:[40,38] [removal] getSecurityManager() in System has been deprecated and marked for removal
15+
metrics-core/src/test/java/io/dropwizard/metrics5/MetricNameTest.java:[882,83] [deprecation] getId() in Thread has been deprecated
1516
metrics-graphite/src/main/java/io/dropwizard/metrics5/graphite/GraphiteReporter.java:[431,17] [Slf4jLogStatement] Log statement contains 0 placeholders, but specifies 1 matching argument(s)
1617
metrics-graphite/src/main/java/io/dropwizard/metrics5/graphite/GraphiteReporter.java:[436,19] [Slf4jLogStatement] Log statement contains 0 placeholders, but specifies 1 matching argument(s)
1718
metrics-graphite/src/main/java/io/dropwizard/metrics5/graphite/GraphiteReporter.java:[449,20] [Slf4jLogStatement] Log statement contains 0 placeholders, but specifies 1 matching argument(s)

integration-tests/metrics-init.patch

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,3 +87,12 @@
8787
</path>
8888
</annotationProcessorPaths>
8989
</configuration>
90+
@@ -283,7 +316,7 @@
91+
<groupId>org.apache.maven.plugins</groupId>
92+
<artifactId>maven-compiler-plugin</artifactId>
93+
<configuration>
94+
- <release>17</release>
95+
+ <release>21</release>
96+
<fork>true</fork>
97+
<parameters>true</parameters>
98+
<showWarnings>true</showWarnings>

integration-tests/metrics.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ test_name="$(basename "${0}" .sh)"
66
project='metrics'
77
repository='https://github.com/dropwizard/metrics.git'
88
revision='v5.0.5'
9-
additional_build_flags=''
9+
additional_build_flags='-Dmaven.compiler.release=21'
1010
additional_source_directories=''
1111
shared_error_prone_flags='-XepOpt:Slf4jLoggerDeclaration:CanonicalStaticLoggerName=LOGGER'
1212
patch_error_prone_flags=''

integration-tests/prometheus-java-client-expected-changes.patch

Lines changed: 211 additions & 26 deletions
Large diffs are not rendered by default.

integration-tests/prometheus-java-client-init.patch

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,19 @@
1111
.withLogConsumer(LogConsumer.withPrefix(sampleApp))
1212
--- a/pom.xml
1313
+++ b/pom.xml
14+
@@ -252,9 +252,9 @@
15+
<release>${java.version}</release>
16+
<source>${java.version}</source>
17+
<target>${java.version}</target>
18+
- <testRelease>17</testRelease>
19+
- <testSource>17</testSource>
20+
- <testTarget>17</testTarget>
21+
+ <testRelease>${java.version}</testRelease>
22+
+ <testSource>${java.version}</testSource>
23+
+ <testTarget>${java.version}</testTarget>
24+
<showWarnings>true</showWarnings>
25+
<compilerArgs>
26+
<arg>-Xlint:all,-serial,-processing,-options</arg>
1427
@@ -267,21 +267,32 @@
1528
-Xep:MissingSummary:OFF
1629
-Xep:LongDoubleConversion:OFF

0 commit comments

Comments
 (0)