Skip to content

Commit 3922787

Browse files
dhoarddhoard
authored
Updated code to support Verifyica 1.0.0 (#1405)
Signed-off-by: dhoard <doug.hoard@gmail.com>
1 parent feb2320 commit 3922787

File tree

57 files changed

+431
-566
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+431
-566
lines changed

‎integration_test_suite/integration_tests/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<project.build.outputEncoding>UTF-8</project.build.outputEncoding>
3030
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
3131
<prometheus.metrics.version>1.5.0</prometheus.metrics.version>
32-
<verifyica.version>0.20.0</verifyica.version>
32+
<verifyica.version>1.0.0</verifyica.version>
3333
<automatic.module.name>io.prometheus.jmx.test</automatic.module.name>
3434
</properties>
3535

‎integration_test_suite/integration_tests/src/main/java/io/prometheus/jmx/test/support/util/TestSupport.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ private TestSupport() {
4545
* @return a Network
4646
*/
4747
public static Network getOrCreateNetwork(ArgumentContext argumentContext) {
48-
Network network = argumentContext.classContext().map().getAs(NETWORK);
48+
Network network = argumentContext.getClassContext().getMap().getAs(NETWORK);
4949
if (network == null) {
5050
// Create the network at the test argument scope
5151
// Get the id to force the network creation
5252
network = Network.newNetwork();
5353
network.getId();
5454

55-
argumentContext.map().put(NETWORK, network);
55+
argumentContext.getMap().put(NETWORK, network);
5656
}
5757
return network;
5858
}
@@ -67,8 +67,8 @@ public static Network getOrCreateNetwork(ArgumentContext argumentContext) {
6767
public static void initializeExporterTestEnvironment(
6868
ArgumentContext argumentContext, Network network, Class<?> testClass) {
6969
argumentContext
70-
.testArgument(JmxExporterTestEnvironment.class)
71-
.payload()
70+
.getArgumentAs(JmxExporterTestEnvironment.class)
71+
.getPayload()
7272
.initialize(testClass, network);
7373
}
7474

@@ -82,8 +82,8 @@ public static void initializeExporterTestEnvironment(
8282
public static void initializeIsolatorExporterTestEnvironment(
8383
ArgumentContext argumentContext, Network network, Class<?> testClass) {
8484
argumentContext
85-
.testArgument(IsolatorExporterTestEnvironment.class)
86-
.payload()
85+
.getArgumentAs(IsolatorExporterTestEnvironment.class)
86+
.getPayload()
8787
.initialize(testClass, network);
8888
}
8989

@@ -93,10 +93,10 @@ public static void initializeIsolatorExporterTestEnvironment(
9393
* @param argumentContext argumentContext
9494
*/
9595
public static void destroyExporterTestEnvironment(ArgumentContext argumentContext) {
96-
Optional.ofNullable(argumentContext.testArgument(JmxExporterTestEnvironment.class))
96+
Optional.ofNullable(argumentContext.getArgumentAs(JmxExporterTestEnvironment.class))
9797
.ifPresent(
9898
exporterTestEnvironmentArgument ->
99-
exporterTestEnvironmentArgument.payload().destroy());
99+
exporterTestEnvironmentArgument.getPayload().destroy());
100100
}
101101

102102
/**
@@ -105,10 +105,10 @@ public static void destroyExporterTestEnvironment(ArgumentContext argumentContex
105105
* @param argumentContext argumentContext
106106
*/
107107
public static void destroyIsolatorExporterTestEnvironment(ArgumentContext argumentContext) {
108-
Optional.ofNullable(argumentContext.testArgument(IsolatorExporterTestEnvironment.class))
108+
Optional.ofNullable(argumentContext.getArgumentAs(IsolatorExporterTestEnvironment.class))
109109
.ifPresent(
110110
exporterTestEnvironmentArgument ->
111-
exporterTestEnvironmentArgument.payload().destroy());
111+
exporterTestEnvironmentArgument.getPayload().destroy());
112112
}
113113

114114
/**
@@ -117,7 +117,7 @@ public static void destroyIsolatorExporterTestEnvironment(ArgumentContext argume
117117
* @param argumentContext argumentContext
118118
*/
119119
public static void destroyNetwork(ArgumentContext argumentContext) {
120-
Optional.ofNullable(argumentContext.map().removeAs(NETWORK, Network.class))
120+
Optional.ofNullable(argumentContext.getMap().removeAs(NETWORK, Network.class))
121121
.ifPresent(Network::close);
122122
}
123123

‎integration_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/LocalTest.java‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
import org.verifyica.api.Argument;
5757
import org.verifyica.api.ArgumentContext;
5858
import org.verifyica.api.ClassContext;
59-
import org.verifyica.api.TemporaryDirectory;
6059
import org.verifyica.api.Verifyica;
60+
import org.verifyica.api.util.TemporaryDirectory;
6161

6262
/**
6363
* LocalTest that verifies the functionality of the JMX Exporter code.
@@ -98,7 +98,8 @@ public static Stream<Argument<String>> arguments() {
9898
@Verifyica.Prepare
9999
public static void prepare(ClassContext classContext) throws Throwable {
100100
// Derive the resource path based on the test class name
101-
String resource = (classContext.testClass().getName().replace(".", "/") + "/exporter.yaml");
101+
String resource =
102+
(classContext.getTestClass().getName().replace(".", "/") + "/exporter.yaml");
102103

103104
// Create a temporary directory
104105
TemporaryDirectory temporaryDirectory = TemporaryDirectory.newDirectory();
@@ -144,14 +145,15 @@ public static void prepare(ClassContext classContext) throws Throwable {
144145
}
145146
}));
146147

147-
classContext.map().put(HTTP_SERVER, httpServer);
148-
classContext.map().put(URL, BASE_URL + httpServer.getPort());
148+
classContext.getMap().put(HTTP_SERVER, httpServer);
149+
classContext.getMap().put(URL, BASE_URL + httpServer.getPort());
149150
}
150151

151152
@Verifyica.Test
152153
@Verifyica.Order(1)
153154
public void testHealthy(ArgumentContext argumentContext) throws Throwable {
154-
String url = argumentContext.classContext().map().getAs(URL) + JmxExporterPath.HEALTHY;
155+
String url =
156+
argumentContext.getClassContext().getMap().getAs(URL) + JmxExporterPath.HEALTHY;
155157

156158
HttpResponse httpResponse = HttpClient.sendRequest(url);
157159

@@ -160,7 +162,8 @@ public void testHealthy(ArgumentContext argumentContext) throws Throwable {
160162

161163
@Verifyica.Test
162164
public void testDefaultTextMetrics(ArgumentContext argumentContext) throws Throwable {
163-
String url = argumentContext.classContext().map().getAs(URL) + JmxExporterPath.METRICS;
165+
String url =
166+
argumentContext.getClassContext().getMap().getAs(URL) + JmxExporterPath.METRICS;
164167

165168
// Run the test code multiple times
166169
new Repeater(ITERATIONS)
@@ -176,7 +179,8 @@ public void testDefaultTextMetrics(ArgumentContext argumentContext) throws Throw
176179

177180
@Verifyica.Test
178181
public void testOpenMetricsTextMetrics(ArgumentContext argumentContext) throws Throwable {
179-
String url = argumentContext.classContext().map().getAs(URL) + JmxExporterPath.METRICS;
182+
String url =
183+
argumentContext.getClassContext().getMap().getAs(URL) + JmxExporterPath.METRICS;
180184

181185
// Run the test code multiple times
182186
new Repeater(ITERATIONS)
@@ -198,7 +202,8 @@ public void testOpenMetricsTextMetrics(ArgumentContext argumentContext) throws T
198202

199203
@Verifyica.Test
200204
public void testPrometheusTextMetrics(ArgumentContext argumentContext) throws Throwable {
201-
String url = argumentContext.classContext().map().getAs(URL) + JmxExporterPath.METRICS;
205+
String url =
206+
argumentContext.getClassContext().getMap().getAs(URL) + JmxExporterPath.METRICS;
202207

203208
// Run the test code multiple times
204209
new Repeater(ITERATIONS)
@@ -219,7 +224,8 @@ public void testPrometheusTextMetrics(ArgumentContext argumentContext) throws Th
219224

220225
@Verifyica.Test
221226
public void testPrometheusProtobufMetrics(ArgumentContext argumentContext) throws Throwable {
222-
String url = argumentContext.classContext().map().getAs(URL) + JmxExporterPath.METRICS;
227+
String url =
228+
argumentContext.getClassContext().getMap().getAs(URL) + JmxExporterPath.METRICS;
223229

224230
// Run the test code multiple times
225231
new Repeater(ITERATIONS)
@@ -243,7 +249,7 @@ public void testPrometheusProtobufMetrics(ArgumentContext argumentContext) throw
243249
public static void conclude(ClassContext classContext)
244250
throws IOException, MalformedObjectNameException {
245251
// Clean up the HTTP server
246-
HTTPServer httpServer = classContext.map().removeAs(HTTP_SERVER);
252+
HTTPServer httpServer = classContext.getMap().removeAs(HTTP_SERVER);
247253
if (httpServer != null) {
248254
httpServer.stop();
249255
}

‎integration_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/AutoIncrementingMBeanTest.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,16 +36,15 @@
3636
import java.util.Collection;
3737
import java.util.HashSet;
3838
import java.util.LinkedHashMap;
39-
import java.util.List;
4039
import java.util.Map;
4140
import java.util.Optional;
4241
import java.util.Set;
4342
import java.util.stream.Stream;
4443
import org.opentest4j.AssertionFailedError;
4544
import org.testcontainers.containers.Network;
4645
import org.verifyica.api.ArgumentContext;
47-
import org.verifyica.api.Trap;
4846
import org.verifyica.api.Verifyica;
47+
import org.verifyica.api.util.CleanupExecutor;
4948

5049
public class AutoIncrementingMBeanTest {
5150

@@ -56,7 +55,7 @@ public static Stream<JmxExporterTestEnvironment> arguments() {
5655

5756
@Verifyica.BeforeAll
5857
public void beforeAll(ArgumentContext argumentContext) {
59-
Class<?> testClass = argumentContext.classContext().testClass();
58+
Class<?> testClass = argumentContext.getClassContext().getTestClass();
6059
Network network = TestSupport.getOrCreateNetwork(argumentContext);
6160
TestSupport.initializeExporterTestEnvironment(argumentContext, network, testClass);
6261
}
@@ -135,12 +134,11 @@ public void testPrometheusProtobufMetrics(JmxExporterTestEnvironment jmxExporter
135134

136135
@Verifyica.AfterAll
137136
public void afterAll(ArgumentContext argumentContext) throws Throwable {
138-
List<Trap> traps = new ArrayList<>();
139-
140-
traps.add(new Trap(() -> TestSupport.destroyExporterTestEnvironment(argumentContext)));
141-
traps.add(new Trap(() -> TestSupport.destroyNetwork(argumentContext)));
142-
143-
Trap.assertEmpty(traps);
137+
new CleanupExecutor()
138+
.addTask(() -> TestSupport.destroyExporterTestEnvironment(argumentContext))
139+
.addTask(() -> TestSupport.destroyNetwork(argumentContext))
140+
.execute()
141+
.throwIfFailed();
144142
}
145143

146144
@Verifyica.Test

‎integration_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/BasicIsolatorTest.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@
3535
import java.util.Collection;
3636
import java.util.HashSet;
3737
import java.util.LinkedHashMap;
38-
import java.util.List;
3938
import java.util.Map;
4039
import java.util.Set;
4140
import java.util.stream.Stream;
4241
import org.testcontainers.containers.Network;
4342
import org.verifyica.api.ArgumentContext;
44-
import org.verifyica.api.Trap;
4543
import org.verifyica.api.Verifyica;
44+
import org.verifyica.api.util.CleanupExecutor;
4645

4746
public class BasicIsolatorTest {
4847

@@ -61,7 +60,7 @@ public static Stream<IsolatorExporterTestEnvironment> arguments() {
6160

6261
@Verifyica.BeforeAll
6362
public void beforeAll(ArgumentContext argumentContext) {
64-
Class<?> testClass = argumentContext.classContext().testClass();
63+
Class<?> testClass = argumentContext.getClassContext().getTestClass();
6564
Network network = TestSupport.getOrCreateNetwork(argumentContext);
6665
TestSupport.initializeIsolatorExporterTestEnvironment(argumentContext, network, testClass);
6766
}
@@ -217,14 +216,11 @@ public void testPrometheusProtobufMetrics(
217216

218217
@Verifyica.AfterAll
219218
public void afterAll(ArgumentContext argumentContext) throws Throwable {
220-
List<Trap> traps = new ArrayList<>();
221-
222-
traps.add(
223-
new Trap(
224-
() -> TestSupport.destroyIsolatorExporterTestEnvironment(argumentContext)));
225-
traps.add(new Trap(() -> TestSupport.destroyNetwork(argumentContext)));
226-
227-
Trap.assertEmpty(traps);
219+
new CleanupExecutor()
220+
.addTask(() -> TestSupport.destroyIsolatorExporterTestEnvironment(argumentContext))
221+
.addTask(() -> TestSupport.destroyNetwork(argumentContext))
222+
.execute()
223+
.throwIfFailed();
228224
}
229225

230226
private void assertMetricsResponse(

‎integration_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/BasicTest.java‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,13 @@
3636
import java.util.Collection;
3737
import java.util.HashSet;
3838
import java.util.LinkedHashMap;
39-
import java.util.List;
4039
import java.util.Map;
4140
import java.util.Set;
4241
import java.util.stream.Stream;
4342
import org.testcontainers.containers.Network;
4443
import org.verifyica.api.ArgumentContext;
45-
import org.verifyica.api.Trap;
4644
import org.verifyica.api.Verifyica;
45+
import org.verifyica.api.util.CleanupExecutor;
4746

4847
public class BasicTest {
4948

@@ -54,7 +53,7 @@ public static Stream<JmxExporterTestEnvironment> arguments() {
5453

5554
@Verifyica.BeforeAll
5655
public void beforeAll(ArgumentContext argumentContext) {
57-
Class<?> testClass = argumentContext.classContext().testClass();
56+
Class<?> testClass = argumentContext.getClassContext().getTestClass();
5857
Network network = TestSupport.getOrCreateNetwork(argumentContext);
5958
TestSupport.initializeExporterTestEnvironment(argumentContext, network, testClass);
6059
}
@@ -133,12 +132,11 @@ public void testPrometheusProtobufMetrics(JmxExporterTestEnvironment jmxExporter
133132

134133
@Verifyica.AfterAll
135134
public void afterAll(ArgumentContext argumentContext) throws Throwable {
136-
List<Trap> traps = new ArrayList<>();
137-
138-
traps.add(new Trap(() -> TestSupport.destroyExporterTestEnvironment(argumentContext)));
139-
traps.add(new Trap(() -> TestSupport.destroyNetwork(argumentContext)));
140-
141-
Trap.assertEmpty(traps);
135+
new CleanupExecutor()
136+
.addTask(() -> TestSupport.destroyExporterTestEnvironment(argumentContext))
137+
.addTask(() -> TestSupport.destroyNetwork(argumentContext))
138+
.execute()
139+
.throwIfFailed();
142140
}
143141

144142
private void assertMetricsResponse(

‎integration_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/BlacklistObjectNamesTest.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@
3030
import io.prometheus.jmx.test.support.metrics.MetricsParser;
3131
import io.prometheus.jmx.test.support.util.TestSupport;
3232
import java.io.IOException;
33-
import java.util.ArrayList;
3433
import java.util.Collection;
35-
import java.util.List;
3634
import java.util.stream.Stream;
3735
import org.testcontainers.containers.Network;
3836
import org.verifyica.api.ArgumentContext;
39-
import org.verifyica.api.Trap;
4037
import org.verifyica.api.Verifyica;
38+
import org.verifyica.api.util.CleanupExecutor;
4139

4240
public class BlacklistObjectNamesTest {
4341

@@ -48,7 +46,7 @@ public static Stream<JmxExporterTestEnvironment> arguments() {
4846

4947
@Verifyica.BeforeAll
5048
public void beforeAll(ArgumentContext argumentContext) {
51-
Class<?> testClass = argumentContext.classContext().testClass();
49+
Class<?> testClass = argumentContext.getClassContext().getTestClass();
5250
Network network = TestSupport.getOrCreateNetwork(argumentContext);
5351
TestSupport.initializeExporterTestEnvironment(argumentContext, network, testClass);
5452
}
@@ -118,12 +116,11 @@ public void testPrometheusProtobufMetrics(JmxExporterTestEnvironment jmxExporter
118116

119117
@Verifyica.AfterAll
120118
public void afterAll(ArgumentContext argumentContext) throws Throwable {
121-
List<Trap> traps = new ArrayList<>();
122-
123-
traps.add(new Trap(() -> TestSupport.destroyExporterTestEnvironment(argumentContext)));
124-
traps.add(new Trap(() -> TestSupport.destroyNetwork(argumentContext)));
125-
126-
Trap.assertEmpty(traps);
119+
new CleanupExecutor()
120+
.addTask(() -> TestSupport.destroyExporterTestEnvironment(argumentContext))
121+
.addTask(() -> TestSupport.destroyNetwork(argumentContext))
122+
.execute()
123+
.throwIfFailed();
127124
}
128125

129126
private void assertMetricsResponse(

‎integration_test_suite/integration_tests/src/test/java/io/prometheus/jmx/test/core/CompositeKeyDataTest.java‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,12 @@
3030
import io.prometheus.jmx.test.support.metrics.MetricsParser;
3131
import io.prometheus.jmx.test.support.util.TestSupport;
3232
import java.io.IOException;
33-
import java.util.ArrayList;
3433
import java.util.Collection;
35-
import java.util.List;
3634
import java.util.stream.Stream;
3735
import org.testcontainers.containers.Network;
3836
import org.verifyica.api.ArgumentContext;
39-
import org.verifyica.api.Trap;
4037
import org.verifyica.api.Verifyica;
38+
import org.verifyica.api.util.CleanupExecutor;
4139

4240
public class CompositeKeyDataTest {
4341

@@ -48,7 +46,7 @@ public static Stream<JmxExporterTestEnvironment> arguments() {
4846

4947
@Verifyica.BeforeAll
5048
public void beforeAll(ArgumentContext argumentContext) {
51-
Class<?> testClass = argumentContext.classContext().testClass();
49+
Class<?> testClass = argumentContext.getClassContext().getTestClass();
5250
Network network = TestSupport.getOrCreateNetwork(argumentContext);
5351
TestSupport.initializeExporterTestEnvironment(argumentContext, network, testClass);
5452
}
@@ -118,12 +116,11 @@ public void testPrometheusProtobufMetrics(JmxExporterTestEnvironment jmxExporter
118116

119117
@Verifyica.AfterAll
120118
public void afterAll(ArgumentContext argumentContext) throws Throwable {
121-
List<Trap> traps = new ArrayList<>();
122-
123-
traps.add(new Trap(() -> TestSupport.destroyExporterTestEnvironment(argumentContext)));
124-
traps.add(new Trap(() -> TestSupport.destroyNetwork(argumentContext)));
125-
126-
Trap.assertEmpty(traps);
119+
new CleanupExecutor()
120+
.addTask(() -> TestSupport.destroyExporterTestEnvironment(argumentContext))
121+
.addTask(() -> TestSupport.destroyNetwork(argumentContext))
122+
.execute()
123+
.throwIfFailed();
127124
}
128125

129126
private void assertMetricsResponse(

0 commit comments

Comments
 (0)