From 4aec2cd613bf70864194a5bc863a02a8bb456bbc Mon Sep 17 00:00:00 2001 From: Fernando Mendioroz Date: Fri, 20 Jul 2018 11:03:19 -0500 Subject: [PATCH 1/2] Fixed version of smpp.extensions and Esme constructor in Tx and Rx smpp server tests --- .../smpp/server/rx/RxSmppServerSbbTest.java | 7 +++-- .../smpp/server/tx/TxSmppServerSbbTest.java | 28 +++++++++++++------ pom.xml | 2 +- 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java b/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java index 98b732772..7ef73fd7c 100644 --- a/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java +++ b/core/slee/services/rxsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java @@ -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; @@ -113,8 +114,8 @@ /** * - * @author sergey vetyutnev - * + * @author Sergey Vetyutnev + * @modified Fernando Mendioroz */ public class RxSmppServerSbbTest { private RxSmppServerSbbProxy sbb; @@ -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(); diff --git a/core/slee/services/txsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java b/core/slee/services/txsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java index 1834a8b36..61f6d7db7 100644 --- a/core/slee/services/txsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java +++ b/core/slee/services/txsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java @@ -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; @@ -86,7 +87,8 @@ /** * - * @author sergey vetyutnev + * @author Sergey Vetyutnev + * @modified Fernando Mendioroz * */ public class TxSmppServerSbbTest { @@ -210,7 +212,7 @@ 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(); @@ -264,7 +266,7 @@ 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(); @@ -339,7 +341,7 @@ 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(); @@ -403,7 +405,15 @@ 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); + 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); + /* + Error:(403, 21) java: no suitable constructor found for Esme(java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,boolean,,org.restcomm.smpp.SmppInterfaceVersionType,int,int,,com.cloudhopper.smpp.SmppBindType,com.cloudhopper.smpp.SmppSession.Type,int,long,long,long,long,long,java.lang.String,boolean,int,int,int,int,int,java.lang.String,int,int,java.lang.String,int,boolean,int,int,int,int,int,int,int,int,int,int,int) + constructor org.restcomm.smpp.Esme.Esme() is not applicable + (actual and formal argument lists differ in length) + constructor org.restcomm.smpp.Esme.Esme(java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,boolean,java.lang.String,org.restcomm.smpp.SmppInterfaceVersionType,int,int,java.lang.String,com.cloudhopper.smpp.SmppBindType,com.cloudhopper.smpp.SmppSession.Type,int,long,long,long,long,long,java.lang.String,boolean,int,int,long,int,int,java.lang.String,int,int,java.lang.String,int,boolean,long,long,long,long,int,int,int,int,int,int,int,org.restcomm.smpp.SmppEncodingWithDefault,org.restcomm.smpp.SmppEncodingWithDefault,boolean) is not applicable + (actual and formal argument lists differ in length) + Esme(org.restcomm.smpp.SmppEncodingWithDefault,org.restcomm.smpp.SmppEncodingWithDefault,boolean) is not applicable + */ ActivityContextInterface aci = new SmppTransactionProxy(esme); SubmitMulti event = new SubmitMulti(); @@ -539,7 +549,7 @@ 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(); @@ -725,7 +735,7 @@ 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(); @@ -809,7 +819,7 @@ 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(); @@ -865,7 +875,7 @@ 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(); diff --git a/pom.xml b/pom.xml index 9ceb6e2bc..bf3abed98 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 5.1.0-9 - 7.1.0-154 + 7.1.0-153 7.1.0-128 1.5.6 From 53cf0a04ad79c533b416d278b99b12e74ec007f5 Mon Sep 17 00:00:00 2001 From: Fernando Mendioroz Date: Fri, 20 Jul 2018 11:12:34 -0500 Subject: [PATCH 2/2] Deleted an unneeded helper comment --- .../slee/services/smpp/server/tx/TxSmppServerSbbTest.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/core/slee/services/txsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java b/core/slee/services/txsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java index 61f6d7db7..7f3794faa 100644 --- a/core/slee/services/txsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java +++ b/core/slee/services/txsmppserversbb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java @@ -406,14 +406,6 @@ public void testSubmitMulti() throws Exception { 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, SmppEncodingWithDefault.Utf8,SmppEncodingWithDefault.Utf8, false); - /* - Error:(403, 21) java: no suitable constructor found for Esme(java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,boolean,,org.restcomm.smpp.SmppInterfaceVersionType,int,int,,com.cloudhopper.smpp.SmppBindType,com.cloudhopper.smpp.SmppSession.Type,int,long,long,long,long,long,java.lang.String,boolean,int,int,int,int,int,java.lang.String,int,int,java.lang.String,int,boolean,int,int,int,int,int,int,int,int,int,int,int) - constructor org.restcomm.smpp.Esme.Esme() is not applicable - (actual and formal argument lists differ in length) - constructor org.restcomm.smpp.Esme.Esme(java.lang.String,java.lang.String,java.lang.String,java.lang.String,int,boolean,java.lang.String,org.restcomm.smpp.SmppInterfaceVersionType,int,int,java.lang.String,com.cloudhopper.smpp.SmppBindType,com.cloudhopper.smpp.SmppSession.Type,int,long,long,long,long,long,java.lang.String,boolean,int,int,long,int,int,java.lang.String,int,int,java.lang.String,int,boolean,long,long,long,long,int,int,int,int,int,int,int,org.restcomm.smpp.SmppEncodingWithDefault,org.restcomm.smpp.SmppEncodingWithDefault,boolean) is not applicable - (actual and formal argument lists differ in length) - Esme(org.restcomm.smpp.SmppEncodingWithDefault,org.restcomm.smpp.SmppEncodingWithDefault,boolean) is not applicable - */ ActivityContextInterface aci = new SmppTransactionProxy(esme); SubmitMulti event = new SubmitMulti();