You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2009/01/26 23:05:22 UTC

svn commit: r737888 - in /servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp: SmppXBeanDeployerTest.java SpringComponentTest.java

Author: lhein
Date: Mon Jan 26 22:05:21 2009
New Revision: 737888

URL: http://svn.apache.org/viewvc?rev=737888&view=rev
Log:
started fixing wrong test cases...still in progress

Modified:
    servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java
    servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java

Modified: servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java?rev=737888&r1=737887&r2=737888&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java (original)
+++ servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SmppXBeanDeployerTest.java Mon Jan 26 22:05:21 2009
@@ -4,7 +4,8 @@
 import java.net.URI;
 import java.net.URL;
 
-import javax.jbi.messaging.InOut;
+import javax.jbi.messaging.ExchangeStatus;
+import javax.jbi.messaging.InOnly;
 import javax.xml.namespace.QName;
 
 import junit.framework.TestCase;
@@ -13,6 +14,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.client.DefaultServiceMixClient;
 import org.apache.servicemix.jbi.container.JBIContainer;
+import org.apache.servicemix.jbi.jaxp.SourceTransformer;
 import org.apache.servicemix.jbi.jaxp.StringSource;
 
 /**
@@ -24,6 +26,16 @@
 
     private final static transient Log log = LogFactory.getLog(SmppXBeanDeployerTest.class);
 
+    private static final String SOURCE = "0123456789";
+    private static final String DESTINATION = "9876543210";
+    private static final String TEXT = "This is a SMPP test ...";
+    private static final String NPI = "NATIONAL";
+    private static final String TON = "INTERNATIONAL";
+
+    private static final String MSG_VALID = "<message><source>" + SOURCE + "</source><destination>"
+                                            + DESTINATION + "</destination><text>" + TEXT + "</text><npi>"
+                                            + NPI + "</npi><ton>" + TON + "</ton></message>";
+    
     protected JBIContainer container;
 
     protected void setUp() throws Exception {
@@ -78,12 +90,15 @@
 
         // main test
         DefaultServiceMixClient client = new DefaultServiceMixClient(container);
-        InOut me = client.createInOutExchange();
+        InOnly me = client.createInOnlyExchange();
         me.setService(new QName("http://test", "service"));
-        me.getInMessage().setContent(new StringSource("<test>Test</test>"));
+        me.getInMessage().setContent(new StringSource(MSG_VALID));
         client.sendSync(me);
-        // TODO test the MessageExchange ERROR status and fault
-        client.done(me);
+        
+        if (me.getStatus() == ExchangeStatus.ERROR) {
+            fail("Received ERROR status: " + me.getError());
+        } else if (me.getFault() != null) {
+            fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
+        } 
     }
-
 }

Modified: servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java?rev=737888&r1=737887&r2=737888&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java (original)
+++ servicemix/components/bindings/servicemix-smpp/trunk/src/test/java/org/apache/servicemix/smpp/SpringComponentTest.java Mon Jan 26 22:05:21 2009
@@ -1,8 +1,7 @@
 package org.apache.servicemix.smpp;
 
 import javax.jbi.messaging.ExchangeStatus;
-import javax.jbi.messaging.InOut;
-import javax.jbi.messaging.NormalizedMessage;
+import javax.jbi.messaging.InOnly;
 import javax.xml.namespace.QName;
 
 import org.apache.servicemix.client.DefaultServiceMixClient;
@@ -25,13 +24,12 @@
 
     public void testSending() throws Exception {
         ServiceMixClient client = new DefaultServiceMixClient(jbi);
-        InOut me = client.createInOutExchange();
+        InOnly me = client.createInOnlyExchange();
         me.setService(new QName("http://test", "service"));
-        NormalizedMessage message = me.getInMessage();
-        message.setContent(new StringSource(MESSAGE));
+        me.getInMessage().setContent(new StringSource(MESSAGE));
         client.sendSync(me);
         if (me.getStatus() == ExchangeStatus.ERROR) {
-            fail("Received ERROR status: " + me.getError().getMessage());
+            fail("Received ERROR status: " + me.getError());
         } else if (me.getFault() != null) {
             fail("Received fault: " + new SourceTransformer().toString(me.getFault().getContent()));
         }