Skip to content

Commit

Permalink
Fixed smpp.extensions.version and Esme constructor in Tx and Rx smpp …
Browse files Browse the repository at this point in the history 
…server tests. This fixes RestComm#294, fixes RestComm#295, fixes RestComm#296
  • Loading branch information
@zvikara
zvikara committed Jan 21, 2019
1 parent f8d139c commit fd34282
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
3 changes: 2 additions & 1 deletion ...bb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
import org.restcomm.smpp.EsmeManagement;
import org.restcomm.smpp.EsmeManagementProxy;
import org.restcomm.smpp.SmppEncoding;
import org.restcomm.smpp.SmppEncodingWithDefault;
import org.restcomm.smpp.SmppInterfaceVersionType;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeMethod;
Expand Down Expand Up @@ -184,7 +185,7 @@ public void setUpClass() throws Exception {
//
esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null, SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER,
SmppSession.Type.CLIENT, windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout, "Esme_1", true, 30000, 0,
0L, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
0L, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);

SmsSetCache.getInstance().clearProcessingSmsSet();

Expand Down
27 changes: 18 additions & 9 deletions ...bb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import org.restcomm.slee.resource.smpp.SmppTransaction;
import org.restcomm.smpp.Esme;
import org.restcomm.smpp.SmppEncoding;
import org.restcomm.smpp.SmppEncodingWithDefault;
import org.restcomm.smpp.SmppInterfaceVersionType;
import org.restcomm.smpp.SmppManagement;
import org.testng.annotations.AfterMethod;
Expand Down Expand Up @@ -210,7 +211,8 @@ public void testSubmitSm() throws Exception {
Esme esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null,
SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER, SmppSession.Type.CLIENT,
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout,
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false,
0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

SubmitSm event = new SubmitSm();
Expand Down Expand Up @@ -264,7 +266,8 @@ public void testSubmitSm_Gsm7Enc() throws Exception {
Esme esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null,
SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER, SmppSession.Type.CLIENT,
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout,
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false,
0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

SubmitSm event = new SubmitSm();
Expand Down Expand Up @@ -339,7 +342,8 @@ public void testDataSm() throws Exception {
Esme esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null,
SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER, SmppSession.Type.CLIENT,
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout,
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false,
0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

DataSm event = new DataSm();
Expand Down Expand Up @@ -402,8 +406,9 @@ public void testSubmitMulti() throws Exception {

Esme esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null,
SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER, SmppSession.Type.CLIENT,
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout, "Esme_1",
true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout,
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false,
0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

SubmitMulti event = new SubmitMulti();
Expand Down Expand Up @@ -539,7 +544,8 @@ public void testSubmitSm_BadCodingSchema() throws Exception {
Esme esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null,
SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER, SmppSession.Type.CLIENT,
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout,
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false,
0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

SubmitSm event = new SubmitSm();
Expand Down Expand Up @@ -725,7 +731,8 @@ public void testSubmitSm_MProc() throws Exception {
Esme esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null,
SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER, SmppSession.Type.CLIENT,
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout,
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false,
0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

SubmitSm event = new SubmitSm();
Expand Down Expand Up @@ -809,7 +816,8 @@ public void testUSim() throws Exception {
Esme esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null,
SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER, SmppSession.Type.CLIENT,
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout,
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false,
0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

SubmitSm event = new SubmitSm();
Expand Down Expand Up @@ -865,7 +873,8 @@ public void testUcs2Udh() throws Exception {
Esme esme = new Esme("Esme_1", "Esme_systemId_1", "pwd", "host", 0, false, null,
SmppInterfaceVersionType.SMPP34, -1, -1, null, SmppBindType.TRANSCEIVER, SmppSession.Type.CLIENT,
windowSize, connectTimeout, requestExpiryTimeout, clientBindTimeout, windowMonitorInterval, windowWaitTimeout,
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false, 0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1);
"Esme_1", true, 30000, 0, 0, -1, -1, "^[0-9a-zA-Z]*", -1, -1, "^[0-9a-zA-Z]*", 0, false,
0, 0, 0, 0, -1, -1, 0, -1, -1, -1, -1, SmppEncodingWithDefault.Utf8, SmppEncodingWithDefault.Utf8, false);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

SubmitSm event = new SubmitSm();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<!-- cloudhopper smpp -->
<!-- <ch.smpp.namespace>com.fizzed</ch.smpp.namespace> --> <!-- com.fizzed com.cloudhopper -->
<ch.smpp.version>5.1.0-9</ch.smpp.version>
<smpp.extensions.version>7.1.0-154</smpp.extensions.version>
<smpp.extensions.version>7.1.0-153</smpp.extensions.version>
<smpp.ra.version>7.1.0-128</smpp.ra.version>
<slf4j.version>1.5.6</slf4j.version> <!-- 1.5.6, 1.6.0, 1.7.10 -->

Expand Down

0 comments on commit fd34282

Please sign in to comment.