Revision: 409aa396cbf3
Author: Sergey Vetyutnev <[email protected]>
Date: Fri Jan 18 03:01:51 2013
Log: CAP update to fit ISUP serialization update
http://code.google.com/p/jss7/source/detail?r=409aa396cbf3
Modified:
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPApplicationContext.java
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPApplicationContextVersion.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/EsiBcsm/TBusySpecificInfoTest.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/CallingPartyNumberCapTest.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/CauseCapTest.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/DigitsTest.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/EstablishTemporaryConnectionTest.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/PromptAndCollectUserInformationResponseTest.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/EventSpecificInformationBCSMTest.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/RequestedInformationTest.java
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/VariablePartTest.java
=======================================
---
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPApplicationContext.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPApplicationContext.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
=======================================
---
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPApplicationContextVersion.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-api/src/main/java/org/mobicents/protocols/ss7/cap/api/CAPApplicationContextVersion.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/EsiBcsm/TBusySpecificInfoTest.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/EsiBcsm/TBusySpecificInfoTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -38,7 +38,7 @@
import
org.mobicents.protocols.ss7.isup.impl.message.parameter.CauseIndicatorsImpl;
import
org.mobicents.protocols.ss7.isup.message.parameter.CalledPartyNumber;
import org.mobicents.protocols.ss7.isup.message.parameter.CauseIndicators;
-import org.testng.*;import org.testng.annotations.*;
+import org.testng.annotations.*;
/**
*
@@ -77,7 +77,7 @@
@Test(groups = { "functional.encode","circuitSwitchedCall.primitive"})
public void testEncode() throws Exception {
- CauseIndicators causeIndicators = new CauseIndicatorsImpl(0, 4, 16,
null);
+ CauseIndicators causeIndicators = new CauseIndicatorsImpl(0, 4, 0, 16,
null);
CauseCap busyCause = new CauseCapImpl(causeIndicators);
CalledPartyNumberImpl calledPartyNumber = new
CalledPartyNumberImpl(0, "111222333", 1, 1);
CalledPartyNumberCapImpl forwardingDestinationNumber = new
CalledPartyNumberCapImpl(calledPartyNumber);
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/CallingPartyNumberCapTest.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/CallingPartyNumberCapTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -31,7 +31,7 @@
import org.mobicents.protocols.asn.Tag;
import
org.mobicents.protocols.ss7.isup.impl.message.parameter.CallingPartyNumberImpl;
import
org.mobicents.protocols.ss7.isup.message.parameter.CallingPartyNumber;
-import org.testng.*;import org.testng.annotations.*;
+import org.testng.annotations.*;
/**
*
@@ -61,7 +61,7 @@
assertTrue(cpn.isOddFlag());
assertEquals(cpn.getNumberingPlanIndicator(), 1);
assertEquals(cpn.getScreeningIndicator(), 1);
- assertEquals(cpn.getAddressRepresentationREstrictedIndicator(),
0);
+ assertEquals(cpn.getAddressRepresentationRestrictedIndicator(),
0);
assertEquals(cpn.getNumberIncompleteIndicator(), 0);
assertEquals(cpn.getNatureOfAddressIndicator(), 4);
assertTrue(cpn.getAddress().equals("41789005047"));
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/CauseCapTest.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/CauseCapTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -31,7 +31,7 @@
import org.mobicents.protocols.asn.Tag;
import
org.mobicents.protocols.ss7.isup.impl.message.parameter.CauseIndicatorsImpl;
import org.mobicents.protocols.ss7.isup.message.parameter.CauseIndicators;
-import org.testng.*;import org.testng.annotations.*;
+import org.testng.annotations.*;
/**
*
@@ -72,7 +72,7 @@
elem.encodeAll(aos, Tag.CLASS_CONTEXT_SPECIFIC, 0);
assertTrue(Arrays.equals(aos.toByteArray(), this.getData()));
- CauseIndicators ci = new CauseIndicatorsImpl(0, 4, 16, null);
+ CauseIndicators ci = new CauseIndicatorsImpl(0, 4, 0, 16, null);
elem = new CauseCapImpl(ci);
aos = new AsnOutputStream();
elem.encodeAll(aos, Tag.CLASS_CONTEXT_SPECIFIC, 0);
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/DigitsTest.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/isup/DigitsTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -33,7 +33,7 @@
import
org.mobicents.protocols.ss7.isup.impl.message.parameter.GenericNumberImpl;
import org.mobicents.protocols.ss7.isup.message.parameter.GenericDigits;
import org.mobicents.protocols.ss7.isup.message.parameter.GenericNumber;
-import org.testng.*;import org.testng.annotations.*;
+import org.testng.annotations.*;
/**
*
@@ -50,8 +50,8 @@
return new byte[] { (byte) 157, 7, 3, (byte) 132, 33, 7, 1, 9,
0 };
}
- public int[] getGenericDigitsInt() {
- return new int[] { 5, 6, 7, 8 };
+ public byte[] getGenericDigitsInt() {
+ return new byte[] { 5, 6, 7, 8 };
}
@Test(groups = { "functional.decode","isup"})
@@ -66,7 +66,7 @@
GenericDigits gd = elem.getGenericDigits();
assertEquals(gd.getEncodingScheme(), 2);
assertEquals(gd.getTypeOfDigits(), 1);
- assertTrue(Arrays.equals(gd.getDigits(),
getGenericDigitsInt()));
+ assertTrue(Arrays.equals(gd.getEncodedDigits(),
getGenericDigitsInt()));
data = this.getData2();
ais = new AsnInputStream(data);
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/EstablishTemporaryConnectionTest.java
Wed May 16 05:00:01 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/EstablishTemporaryConnectionTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -55,8 +55,8 @@
(byte) 129, 0, 48, 9, 2, 1, 3, 10, 1, 1, (byte) 129, 1, (byte) 255,
(byte) 166, 3, (byte) 130, 1, 1, (byte) 135, 1, 8, (byte) 159, 50, 1, 11 };
}
- public int[] getCorrelationIDDigits() {
- return new int[] { 1, 2, 3, 4 };
+ public byte[] getCorrelationIDDigits() {
+ return new byte[] { 1, 2, 3, 4 };
}
@@ -82,7 +82,7 @@
assertEquals(elem.getAssistingSSPIPRoutingAddress().getGenericNumber().getScreeningIndicator(),
1);
assertEquals(elem.getCorrelationID().getGenericDigits().getEncodingScheme(),
2);
assertEquals(elem.getCorrelationID().getGenericDigits().getTypeOfDigits(),
0);
-
assertTrue(Arrays.equals(elem.getCorrelationID().getGenericDigits().getDigits(),
getCorrelationIDDigits()));
+
assertTrue(Arrays.equals(elem.getCorrelationID().getGenericDigits().getEncodedDigits(),
getCorrelationIDDigits()));
assertTrue(Arrays.equals(elem.getScfID().getData(),
getScfIDData()));
assertEquals(elem.getServiceInteractionIndicatorsTwo().getBothwayThroughConnectionInd(),
BothwayThroughConnectionInd.bothwayPathNotRequired);
assertNull(elem.getCallSegmentID());
@@ -103,7 +103,7 @@
assertEquals(elem.getAssistingSSPIPRoutingAddress().getGenericNumber().getScreeningIndicator(),
1);
assertEquals(elem.getCorrelationID().getGenericDigits().getEncodingScheme(),
2);
assertEquals(elem.getCorrelationID().getGenericDigits().getTypeOfDigits(),
0);
-
assertTrue(Arrays.equals(elem.getCorrelationID().getGenericDigits().getDigits(),
getCorrelationIDDigits()));
+
assertTrue(Arrays.equals(elem.getCorrelationID().getGenericDigits().getEncodedDigits(),
getCorrelationIDDigits()));
assertTrue(Arrays.equals(elem.getScfID().getData(),
getScfIDData()));
assertEquals(elem.getServiceInteractionIndicatorsTwo().getBothwayThroughConnectionInd(),
BothwayThroughConnectionInd.bothwayPathNotRequired);
assertEquals((int)elem.getCallSegmentID(), 8);
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/PromptAndCollectUserInformationResponseTest.java
Wed May 16 05:00:01 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/PromptAndCollectUserInformationResponseTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -44,8 +44,8 @@
return new byte[] { (byte) 128, 4, 65, 44, 55, 66 };
}
- public int[] getDigits() {
- return new int[] { 44, 55, 66 };
+ public byte[] getDigits() {
+ return new byte[] { 44, 55, 66 };
}
@Test(groups = { "functional.decode","circuitSwitchedCall"})
@@ -59,7 +59,7 @@
elem.decodeAll(ais);
assertEquals(elem.getDigitsResponse().getGenericDigits().getEncodingScheme(),
2);
assertEquals(elem.getDigitsResponse().getGenericDigits().getTypeOfDigits(),
1);
-
assertTrue(Arrays.equals(elem.getDigitsResponse().getGenericDigits().getDigits(),
this.getDigits()));
+
assertTrue(Arrays.equals(elem.getDigitsResponse().getGenericDigits().getEncodedDigits(),
this.getDigits()));
}
@Test(groups = { "functional.encode","circuitSwitchedCall"})
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/EventSpecificInformationBCSMTest.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/EventSpecificInformationBCSMTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -46,7 +46,7 @@
import
org.mobicents.protocols.ss7.isup.impl.message.parameter.CauseIndicatorsImpl;
import
org.mobicents.protocols.ss7.isup.message.parameter.CalledPartyNumber;
import org.mobicents.protocols.ss7.isup.message.parameter.CauseIndicators;
-import org.testng.*;import org.testng.annotations.*;
+import org.testng.annotations.*;
/**
*
@@ -185,7 +185,7 @@
@Test(groups = { "functional.encode","circuitSwitchedCall.primitive"})
public void testEncode() throws Exception {
- CauseIndicators causeIndicators = new CauseIndicatorsImpl(0, 4, 16,
null);
+ CauseIndicators causeIndicators = new CauseIndicatorsImpl(0, 4, 0, 16,
null);
CauseCap failureCause = new CauseCapImpl(causeIndicators);
RouteSelectFailureSpecificInfo routeSelectFailureSpecificInfo = new
RouteSelectFailureSpecificInfoImpl(failureCause);
EventSpecificInformationBCSMImpl elem = new
EventSpecificInformationBCSMImpl(routeSelectFailureSpecificInfo);
@@ -193,7 +193,7 @@
elem.encodeAll(aos);
assertTrue(Arrays.equals(aos.toByteArray(), this.getData1()));
- causeIndicators = new CauseIndicatorsImpl(0, 4, 16, null);
+ causeIndicators = new CauseIndicatorsImpl(0, 4, 0, 16, null);
CauseCap busyCause = new CauseCapImpl(causeIndicators);
OCalledPartyBusySpecificInfoImpl oCalledPartyBusySpecificInfoImpl = new
OCalledPartyBusySpecificInfoImpl(busyCause);
elem = new
EventSpecificInformationBCSMImpl(oCalledPartyBusySpecificInfoImpl);
@@ -213,7 +213,7 @@
elem.encodeAll(aos);
assertTrue(Arrays.equals(aos.toByteArray(), this.getData4()));
- causeIndicators = new CauseIndicatorsImpl(0, 4, 16, null);
+ causeIndicators = new CauseIndicatorsImpl(0, 4, 0, 16, null);
CauseCap releaseCause = new CauseCapImpl(causeIndicators);
ODisconnectSpecificInfoImpl oDisconnectSpecificInfo = new
ODisconnectSpecificInfoImpl(releaseCause);
elem = new
EventSpecificInformationBCSMImpl(oDisconnectSpecificInfo);
@@ -221,7 +221,7 @@
elem.encodeAll(aos);
assertTrue(Arrays.equals(aos.toByteArray(), this.getData5()));
- causeIndicators = new CauseIndicatorsImpl(0, 4, 16, null);
+ causeIndicators = new CauseIndicatorsImpl(0, 4, 0, 16, null);
busyCause = new CauseCapImpl(causeIndicators);
TBusySpecificInfoImpl tBusySpecificInfo = new
TBusySpecificInfoImpl(busyCause, false, false, null);
elem = new EventSpecificInformationBCSMImpl(tBusySpecificInfo);
@@ -244,7 +244,7 @@
elem.encodeAll(aos);
assertTrue(Arrays.equals(aos.toByteArray(), this.getData8()));
- causeIndicators = new CauseIndicatorsImpl(0, 4, 16, null);
+ causeIndicators = new CauseIndicatorsImpl(0, 4, 0, 16, null);
releaseCause = new CauseCapImpl(causeIndicators);
TDisconnectSpecificInfoImpl tDisconnectSpecificInfo = new
TDisconnectSpecificInfoImpl(releaseCause);
elem = new
EventSpecificInformationBCSMImpl(tDisconnectSpecificInfo);
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/RequestedInformationTest.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/RequestedInformationTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -33,7 +33,7 @@
import org.mobicents.protocols.ss7.cap.primitives.DateAndTimeImpl;
import
org.mobicents.protocols.ss7.isup.impl.message.parameter.CauseIndicatorsImpl;
import org.mobicents.protocols.ss7.isup.message.parameter.CauseIndicators;
-import org.testng.*;import org.testng.annotations.*;
+import org.testng.annotations.*;
/**
*
@@ -115,9 +115,9 @@
aos = new AsnOutputStream();
elem.encodeAll(aos);
assertTrue(Arrays.equals(aos.toByteArray(), this.getData2()));
-
- CauseIndicatorsImpl ci = new CauseIndicatorsImpl(0, 2, 17,
null);
- // int codingStandard, int location, int causeValue, byte[]
diagnostics
+
+ CauseIndicatorsImpl ci = new CauseIndicatorsImpl(0, 2, 0, 17,
null);
+ // int codingStandard, int location, int recommendation, int causeValue,
byte[] diagnostics
CauseCapImpl cc = new CauseCapImpl(ci);
elem = new RequestedInformationImpl(cc);
aos = new AsnOutputStream();
=======================================
---
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/VariablePartTest.java
Mon Apr 23 10:53:14 2012
+++
/cap/cap-impl/src/test/java/org/mobicents/protocols/ss7/cap/service/circuitSwitchedCall/primitive/VariablePartTest.java
Fri Jan 18 03:01:51 2013
@@ -1,6 +1,6 @@
/*
- * JBoss, Home of Professional Open Source
- * Copyright 2011, Red Hat, Inc. and individual contributors
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2012, Telestax Inc and individual contributors
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
@@ -47,8 +47,8 @@
return new byte[] { (byte) 129, 4, 96, 18, 17, 16 };
}
- public int[] getGenericDigitsData() {
- return new int[] { 18, 17, 16 };
+ public byte[] getGenericDigitsData() {
+ return new byte[] { 18, 17, 16 };
}
public byte[] getData3() {
@@ -87,7 +87,7 @@
assertNull(elem.getInteger());
assertEquals(elem.getNumber().getGenericDigits().getEncodingScheme(), 3);
assertEquals(elem.getNumber().getGenericDigits().getTypeOfDigits(), 0);
-
assertTrue(Arrays.equals(elem.getNumber().getGenericDigits().getDigits(),
getGenericDigitsData()));
+
assertTrue(Arrays.equals(elem.getNumber().getGenericDigits().getEncodedDigits(),
getGenericDigitsData()));
assertNull(elem.getTime());
assertNull(elem.getDate());
assertNull(elem.getPrice());
