Author: cmueller
Date: Sat Nov 3 15:33:40 2012
New Revision: 1405361
URL: http://svn.apache.org/viewvc?rev=1405361&view=rev
Log:
CAMEL-5731: Setting alphabet header to 8-bit doesn't update data coding
Thanks Francois Kritzinger for the test case
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java?rev=1405361&r1=1405360&r2=1405361&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSubmitSmCommand.java
Sat Nov 3 15:33:40 2012
@@ -124,6 +124,8 @@ public class SmppSubmitSmCommand extends
if (in.getHeaders().containsKey(SmppConstants.DATA_CODING)) {
submitSm.setDataCoding(in.getHeader(SmppConstants.DATA_CODING,
Byte.class));
+ } else if (in.getHeaders().containsKey(SmppConstants.ALPHABET)) {
+ submitSm.setDataCoding(in.getHeader(SmppConstants.ALPHABET,
Byte.class));
} else {
submitSm.setDataCoding(config.getDataCoding());
}
Modified:
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java?rev=1405361&r1=1405360&r2=1405361&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-smpp/src/test/java/org/apache/camel/component/smpp/SmppSubmitSmCommandTest.java
Sat Nov 3 15:33:40 2012
@@ -24,6 +24,7 @@ import org.apache.camel.Exchange;
import org.apache.camel.ExchangePattern;
import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.impl.DefaultExchange;
+import org.jsmpp.bean.Alphabet;
import org.jsmpp.bean.DataCoding;
import org.jsmpp.bean.ESMClass;
import org.jsmpp.bean.NumberingPlanIndicator;
@@ -42,6 +43,7 @@ import static org.easymock.EasyMock.aryE
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isNull;
+import static org.easymock.EasyMock.not;
import static org.easymock.classextension.EasyMock.createMock;
import static org.easymock.classextension.EasyMock.replay;
import static org.easymock.classextension.EasyMock.verify;
@@ -201,4 +203,26 @@ public class SmppSubmitSmCommandTest {
assertEquals(Arrays.asList("1"),
exchange.getOut().getHeader(SmppConstants.ID));
assertEquals(1,
exchange.getOut().getHeader(SmppConstants.SENT_MESSAGE_COUNT));
}
+
+ @Test
+ public void alphabetUpdatesDataCoding() throws Exception {
+ final byte incorrectDataCoding = 0x00;
+ byte[] body = {'A', 'B', 'C'};
+
+ Exchange exchange = new DefaultExchange(new DefaultCamelContext(),
+ ExchangePattern.InOut);
+ exchange.getIn().setHeader(SmppConstants.COMMAND, "SubmitSm");
+ exchange.getIn().setHeader(SmppConstants.ALPHABET,
Alphabet.ALPHA_8_BIT.value());
+ exchange.getIn().setBody(body);
+ expect(session.submitShortMessage(eq("CMT"), eq(TypeOfNumber.UNKNOWN),
eq(NumberingPlanIndicator.UNKNOWN), eq("1616"), eq(TypeOfNumber.UNKNOWN),
eq(NumberingPlanIndicator.UNKNOWN),
+ eq("1717"), eq(new ESMClass()), eq((byte) 0), eq((byte) 1),
(String) isNull(), (String) isNull(), eq(new
RegisteredDelivery(SMSCDeliveryReceipt.SUCCESS_FAILURE)),
+ eq(ReplaceIfPresentFlag.DEFAULT.value()),
not(eq(DataCoding.newInstance(incorrectDataCoding))), eq((byte) 0),
aryEq(body)))
+ .andReturn("1");
+
+ replay(session);
+
+ command.execute(exchange);
+
+ verify(session);
+ }
}
\ No newline at end of file
