Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SMPP Server tests and extensions version fixes #294

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SMPP Server tests and extensions version fixes #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4aec2cd
Fixed version of smpp.extensions and Esme constructor in Tx and Rx sm…
FerUy Jul 20, 2018
53cf0a0
Deleted an unneeded helper comment
FerUy Jul 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions ...bb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/rx/RxSmppServerSbbTest.java
View file
Open in desktop
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 All @@ -113,8 +114,8 @@

/**
*
* @author sergey vetyutnev
*
* @author <a href="mailto:serg.vetyutnev@gmail.com"> Sergey Vetyutnev </a>
* @modified <a href="mailto:[email protected]"> Fernando Mendioroz </a>
*/
public class RxSmppServerSbbTest {
private RxSmppServerSbbProxy sbb;
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
20 changes: 11 additions & 9 deletions ...bb/src/test/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbbTest.java
View file
Open in desktop
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 All @@ -86,7 +87,8 @@

/**
*
* @author sergey vetyutnev
* @author <a href="mailto:[email protected]"> Sergey Vetyutnev </a>
* @modified <a href="mailto:[email protected]"> Fernando Mendioroz </a>
*
*/
public class TxSmppServerSbbTest {
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -403,7 +405,7 @@ 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);
ActivityContextInterface aci = new SmppTransactionProxy(esme);

SubmitMulti event = new SubmitMulti();
Expand Down Expand Up @@ -539,7 +541,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();
Expand Down Expand Up @@ -725,7 +727,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();
Expand Down Expand Up @@ -809,7 +811,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();
Expand Down Expand Up @@ -865,7 +867,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();
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
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