Skip to content

Commit a468e22

Browse files
committed
Merge pull request #1679 from pzygielo/cmdversion
2 parents fbef88e + 87eb322 commit a468e22

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

mq/main/mq-client/src/main/java/com/sun/messaging/jmq/jmsclient/ConnectionMetaDataAdapter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public abstract class ConnectionMetaDataAdapter implements ConnectionMetaData {
2525
private static final int JMSMajorVersion = 3;
2626
private static final int JMSMinorVersion = 1;
2727
private static final String JMSProviderName = new Version().getProductName();
28-
private static final String providerVersion = "6.3";
28+
private static final String providerVersion = "6.4";
2929
private static final int providerMajorVersion = 6;
30-
private static final int providerMinorVersion = 3;
30+
private static final int providerMinorVersion = 4;
3131

3232
public static String getMqName() {
3333
return JMSProviderName;

mq/main/mq-client/src/test/java/com/sun/messaging/jmq/jmsclient/ConnectionMetaDataImplTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.sun.messaging.jmq.jmsclient;
1818

1919
import static org.junit.jupiter.api.Assertions.*;
20+
import com.sun.messaging.jmq.Version;
2021

2122
import org.junit.jupiter.api.Test;
2223
import org.junit.jupiter.api.extension.ExtendWith;
@@ -51,4 +52,16 @@ void testProviderVersionConsistency() throws JMSException {
5152

5253
assertEquals(String.format("%d.%d", majorVersion, minorVersion), version);
5354
}
55+
56+
@Test
57+
void testProviderVersionMatchesProject() throws JMSException {
58+
var cmdi = new ConnectionMetaDataImpl(stubCon);
59+
60+
int providerMajorVersion = cmdi.getProviderMajorVersion();
61+
int providerMinorVersion = cmdi.getProviderMinorVersion();
62+
var versionFromProperties = new Version(false);
63+
64+
assertEquals(versionFromProperties.getMajorVersion(), providerMajorVersion);
65+
assertEquals(versionFromProperties.getMinorVersion(), providerMinorVersion);
66+
}
5467
}

0 commit comments

Comments
 (0)