Skip to content

Commit 3beb0cb

Browse files
committed
Fix maven dependency and unit tests
The unit tests used the wrong classloader and thus failed to inject the proper config
1 parent a0297b6 commit 3beb0cb

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

amqp-connector/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<!-- Workaround for Beta features -->
1616
<dependency>
1717
<groupId>io.quarkus</groupId>
18-
<artifactId>quarkus-smallrye-reactive-messaging-amqp</artifactId>
18+
<artifactId>quarkus-messaging-amqp</artifactId>
1919
</dependency>
2020
<dependency>
2121
<groupId>io.quarkus</groupId>
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>org.jboss.weld</groupId>
7272
<artifactId>weld-junit5</artifactId>
73-
<version>4.0.3.Final</version>
73+
<version>5.0.0.Final</version>
7474
<scope>test</scope>
7575
</dependency>
7676
<dependency>
@@ -82,7 +82,7 @@
8282
<groupId>io.smallrye.reactive</groupId>
8383
<artifactId>test-common</artifactId>
8484
<scope>test</scope>
85-
<version>4.26.0</version>
85+
<version>4.27.0</version>
8686
</dependency>
8787
</dependencies>
88-
</project>
88+
</project>

amqp-connector/src/test/java/de/uni_stuttgart/tik/viplab/websocket_api/amqp/AMQPConnectorWithDumpTypeAllTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,8 @@ public void installConfig(Map<String,String> configMap) {
121121
.addDefaultInterceptors()
122122
.build();
123123
ConfigProviderResolver.instance()
124-
.releaseConfig(ConfigProvider.getConfig(AMQPConnectorWithDumpTypeAllTest.class.getClassLoader()));
125-
ConfigProviderResolver.instance().registerConfig(config, AMQPConnectorWithDumpTypeAllTest.class.getClassLoader());
124+
.releaseConfig(ConfigProvider.getConfig(Thread.currentThread().getContextClassLoader()));
125+
ConfigProviderResolver.instance().registerConfig(config, Thread.currentThread().getContextClassLoader());
126126
}
127127

128128
@WeldSetup
@@ -206,17 +206,16 @@ void testCompleteResultJSON(AMQPConnector connector) throws NoSuchMethodExceptio
206206
// TODO add proper testing code for the value of the message
207207
});
208208
verify(session).send(Mockito.isA(ComputationResultMessage.class));
209-
List<Path> files = null;
209+
List<Path> files;
210210
try (Stream<Path> stream = Files.list(sharedTempDir)) {
211211
files = stream.filter(file -> !Files.isDirectory(file))
212-
.collect(Collectors.toList());
212+
.toList();
213213
}
214214
assertEquals(1,
215215
files.size());
216216
assertEquals(messagePayload,
217217
Files.readString(files.get(0)));
218-
assertEquals(true,
219-
Files.deleteIfExists(files.get(0)));
218+
assertTrue(Files.deleteIfExists(files.get(0)));
220219
verify(logger,
221220
never()).error(any());
222221
verify(logger,

amqp-connector/src/test/java/de/uni_stuttgart/tik/viplab/websocket_api/amqp/AMQPConnectorWithDumpTypeInvalidTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ public void installConfig(Map<String,String> configMap) {
122122
.addDefaultInterceptors()
123123
.build();
124124
ConfigProviderResolver.instance()
125-
.releaseConfig(ConfigProvider.getConfig(AMQPConnectorWithDumpTypeAllTest.class.getClassLoader()));
126-
ConfigProviderResolver.instance().registerConfig(config, AMQPConnectorWithDumpTypeAllTest.class.getClassLoader());
125+
.releaseConfig(ConfigProvider.getConfig(Thread.currentThread().getContextClassLoader()));
126+
ConfigProviderResolver.instance().registerConfig(config, Thread.currentThread().getContextClassLoader());
127127
}
128128

129129
@WeldSetup

amqp-connector/src/test/java/de/uni_stuttgart/tik/viplab/websocket_api/amqp/AMQPConnectorWithDumpTypeNoneTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ public void installConfig(Map<String,String> configMap) {
101101
.addDefaultInterceptors()
102102
.build();
103103
ConfigProviderResolver.instance()
104-
.releaseConfig(ConfigProvider.getConfig(AMQPConnectorWithDumpTypeAllTest.class.getClassLoader()));
105-
ConfigProviderResolver.instance().registerConfig(config, AMQPConnectorWithDumpTypeAllTest.class.getClassLoader());
104+
.releaseConfig(ConfigProvider.getConfig(Thread.currentThread().getContextClassLoader()));
105+
ConfigProviderResolver.instance().registerConfig(config, Thread.currentThread().getContextClassLoader());
106106
}
107107

108108
@WeldSetup

0 commit comments

Comments
 (0)