Skip to content

Commit b94a7d8

Browse files
acogoluegnesacogoluegnes
committed
Revamp AMQP 1.0 plugin Java test project
Bump dependencies (using JMS 3.1 now, which requires Java 11), format code.
1 parent 87d8460 commit b94a7d8

File tree

4 files changed

+106
-89
lines changed

4 files changed

+106
-89
lines changed

‎.github/dependabot.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ updates:
5656
schedule:
5757
interval: "daily"
5858
target-branch: "main"
59+
ignore:
60+
- dependency-name: "ch.qos.logback:logback-classic"
61+
versions: [ "[1.3,)" ]
5962
- package-ecosystem: "maven"
6063
directory: "deps/rabbitmq_auth_backend_http/examples/rabbitmq_auth_backend_spring_boot"
6164
schedule:

‎deps/rabbitmq_amqp1_0/test/system_SUITE_data/java-tests/pom.xml

Lines changed: 38 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,44 @@
77
<version>1.0-SNAPSHOT</version>
88
<name>rabbitmq-amqp1.0-java-tests</name>
99
<url>https://www.rabbitmq.com</url>
10+
<properties>
11+
<junit.jupiter.version>5.9.3</junit.jupiter.version>
12+
<qpid-jms-client.version>2.3.0</qpid-jms-client.version>
13+
<logback.version>1.2.11</logback.version>
14+
<spotless.version>2.24.0</spotless.version>
15+
<google-java-format.version>1.17.0</google-java-format.version>
16+
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
17+
<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
18+
</properties>
1019
<dependencies>
1120
<dependency>
12-
<groupId>junit</groupId>
13-
<artifactId>junit</artifactId>
14-
<version>4.13.1</version>
21+
<groupId>org.junit.jupiter</groupId>
22+
<artifactId>junit-jupiter-engine</artifactId>
23+
<version>${junit.jupiter.version}</version>
1524
<scope>test</scope>
1625
</dependency>
17-
<!-- <dependency> -->
18-
<!-- <groupId>org.apache.qpid</groupId> -->
19-
<!-- <artifactId>proton-j</artifactId> -->
20-
<!-- <version>0.13.0</version> -->
21-
<!-- <scope>test</scope> -->
22-
<!-- </dependency> -->
26+
2327
<dependency>
2428
<groupId>org.apache.qpid</groupId>
2529
<artifactId>qpid-jms-client</artifactId>
26-
<version>0.31.0</version>
30+
<version>${qpid-jms-client.version}</version>
2731
<scope>test</scope>
2832
</dependency>
33+
34+
<dependency>
35+
<groupId>ch.qos.logback</groupId>
36+
<artifactId>logback-classic</artifactId>
37+
<version>${logback.version}</version>
38+
<scope>test</scope>
39+
</dependency>
40+
2941
</dependencies>
3042
<build>
3143
<plugins>
3244
<plugin>
3345
<groupId>org.apache.maven.plugins</groupId>
3446
<artifactId>maven-compiler-plugin</artifactId>
35-
<version>3.8.1</version>
47+
<version>${maven-compiler-plugin.version}</version>
3648
<configuration>
3749
<source>1.8</source>
3850
<target>1.8</target>
@@ -41,7 +53,7 @@
4153
<plugin>
4254
<groupId>org.apache.maven.plugins</groupId>
4355
<artifactId>maven-surefire-plugin</artifactId>
44-
<version>2.22.2</version>
56+
<version>${maven-surefire-plugin.version}</version>
4557
<configuration>
4658
<systemPropertyVariables>
4759
<rmq_broker_uri>${rmq_broker_uri}</rmq_broker_uri>
@@ -53,6 +65,20 @@
5365
<argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
5466
</configuration>
5567
</plugin>
68+
<plugin>
69+
<groupId>com.diffplug.spotless</groupId>
70+
<artifactId>spotless-maven-plugin</artifactId>
71+
<version>${spotless.version}</version>
72+
<configuration>
73+
<java>
74+
<googleJavaFormat>
75+
<version>${google-java-format.version}</version>
76+
<style>GOOGLE</style>
77+
</googleJavaFormat>
78+
</java>
79+
</configuration>
80+
</plugin>
81+
5682
</plugins>
5783
</build>
5884
</project>

‎deps/rabbitmq_amqp1_0/test/system_SUITE_data/java-tests/src/test/java/com/rabbitmq/amqp1_0/tests/jms/RoundTripTest.java

Lines changed: 52 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,58 @@
22

33
package com.rabbitmq.amqp1_0.tests.jms;
44

5-
import java.util.*;
6-
7-
import junit.framework.Test;
8-
import junit.framework.TestCase;
9-
import junit.framework.TestSuite;
5+
import static org.junit.jupiter.api.Assertions.assertEquals;
6+
import static org.junit.jupiter.api.Assertions.assertNotNull;
107

11-
import javax.jms.Connection;
12-
import javax.jms.ConnectionFactory;
13-
import javax.jms.DeliveryMode;
14-
import javax.jms.Destination;
15-
import javax.jms.ExceptionListener;
16-
import javax.jms.JMSException;
17-
import javax.jms.Message;
18-
import javax.jms.MessageConsumer;
19-
import javax.jms.MessageProducer;
20-
import javax.jms.Session;
21-
import javax.jms.TextMessage;
8+
import java.util.*;
9+
//import javax.jms.Connection;
10+
//import javax.jms.ConnectionFactory;
11+
//import javax.jms.DeliveryMode;
12+
//import javax.jms.Destination;
13+
//import javax.jms.Message;
14+
//import javax.jms.MessageConsumer;
15+
//import javax.jms.MessageProducer;
16+
//import javax.jms.Session;
17+
//import javax.jms.TextMessage;
2218
import javax.naming.Context;
23-
import javax.naming.InitialContext;
24-
25-
/**
26-
* Unit test for simple App.
27-
*/
28-
public class RoundTripTest
29-
extends TestCase
30-
{
31-
public static final String ADDRESS = "/jms-roundtrip-q";
32-
public static final String PAYLOAD = "Payload";
33-
34-
/**
35-
* Create the test case
36-
*
37-
* @param testName name of the test case
38-
*/
39-
public RoundTripTest(String testName)
40-
{
41-
super(testName);
42-
}
43-
44-
/**
45-
* @return the suite of tests being tested
46-
*/
47-
public static Test suite()
48-
{
49-
return new TestSuite(RoundTripTest.class);
50-
}
51-
52-
public void test_roundtrip () throws Exception
53-
{
54-
String uri = System.getProperty("rmq_broker_uri");
55-
String address = uri + ADDRESS;
56-
Hashtable<Object, Object> env = new Hashtable<Object, Object>();
57-
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.qpid.jms.jndi.JmsInitialContextFactory");
58-
env.put("connectionfactory.myFactoryLookup", uri);
59-
env.put("queue.myQueueLookup", "my-queue");
60-
env.put("jms.sendTimeout", 5);
61-
env.put("jms.requestTimeout", 5);
62-
javax.naming.Context context = new javax.naming.InitialContext(env);
63-
64-
assertNotNull(uri);
65-
66-
ConnectionFactory factory = (ConnectionFactory) context.lookup("myFactoryLookup");
67-
Destination queue = (Destination) context.lookup("myQueueLookup");
68-
69-
Connection connection = factory.createConnection("guest", "guest");
70-
connection.start();
71-
72-
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
73-
74-
MessageProducer messageProducer = session.createProducer(queue);
75-
MessageConsumer messageConsumer = session.createConsumer(queue);
76-
77-
TextMessage message = session.createTextMessage("Hello world!");
78-
messageProducer.send(message, DeliveryMode.NON_PERSISTENT,
79-
Message.DEFAULT_PRIORITY, Message.DEFAULT_TIME_TO_LIVE);
80-
TextMessage receivedMessage = (TextMessage) messageConsumer.receive(2000L);
81-
82-
assertEquals(message.getText(), receivedMessage.getText());
83-
}
19+
import jakarta.jms.*;
20+
import org.junit.jupiter.api.Test;
21+
22+
/** Unit test for simple App. */
23+
public class RoundTripTest {
24+
25+
@Test
26+
public void test_roundtrip() throws Exception {
27+
String uri = System.getProperty("rmq_broker_uri", "amqp://localhost:5672");
28+
Hashtable<Object, Object> env = new Hashtable<>();
29+
env.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.qpid.jms.jndi.JmsInitialContextFactory");
30+
env.put("connectionfactory.myFactoryLookup", uri);
31+
env.put("queue.myQueueLookup", "my-queue");
32+
env.put("jms.sendTimeout", 5);
33+
env.put("jms.requestTimeout", 5);
34+
javax.naming.Context context = new javax.naming.InitialContext(env);
35+
36+
assertNotNull(uri);
37+
38+
ConnectionFactory factory = (ConnectionFactory) context.lookup("myFactoryLookup");
39+
Destination queue = (Destination) context.lookup("myQueueLookup");
40+
41+
Connection connection = factory.createConnection("guest", "guest");
42+
connection.start();
43+
44+
Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE);
45+
46+
MessageProducer messageProducer = session.createProducer(queue);
47+
MessageConsumer messageConsumer = session.createConsumer(queue);
48+
49+
TextMessage message = session.createTextMessage("Hello world!");
50+
messageProducer.send(
51+
message,
52+
DeliveryMode.NON_PERSISTENT,
53+
Message.DEFAULT_PRIORITY,
54+
Message.DEFAULT_TIME_TO_LIVE);
55+
TextMessage receivedMessage = (TextMessage) messageConsumer.receive(2000L);
56+
57+
assertEquals(message.getText(), receivedMessage.getText());
58+
}
8459
}

‎deps/rabbitmq_amqp1_0/test/system_SUITE_data/java-tests/src/test/resources/logback-test.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<configuration>
2+
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
3+
<encoder>
4+
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
5+
</encoder>
6+
</appender>
7+
8+
<logger name="com.rabbitmq" level="info" />
9+
10+
<root level="warn">
11+
<appender-ref ref="STDOUT" />
12+
</root>
13+
</configuration>

0 commit comments

Comments
 (0)