You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ch...@apache.org on 2005/12/21 03:07:25 UTC

svn commit: r358179 - in /webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage: CreateSeqBeanMgrTest.java NextMsgBeanMgrTest.java RetransmitterBeanMgrTest.java SequencePropertyBeanMgrTest.java StorageMapBeanMgrTest.java

Author: chamikara
Date: Tue Dec 20 18:07:02 2005
New Revision: 358179

URL: http://svn.apache.org/viewcvs?rev=358179&view=rev
Log:
Updated the test cases.

Modified:
    webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
    webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
    webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
    webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java
    webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java

Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java?rev=358179&r1=358178&r2=358179&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java Tue Dec 20 18:07:02 2005
@@ -26,70 +26,77 @@
 
 public class CreateSeqBeanMgrTest extends SandeshaTestCase {
     private CreateSeqBeanMgr mgr;
-
+    Transaction transaction;
+    
     public CreateSeqBeanMgrTest() {
         super("CreateSeqBeanMgrTest");
     }
 
     public void setUp() throws Exception {
+    	
         AxisConfiguration axisConfig =  new AxisConfiguration();
         ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
 
         StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx);
+        transaction = storageManager.getTransaction();
         mgr = storageManager.getCreateSeqBeanMgr();
     }
+    
+    public void tearDown() throws Exception {
+    	transaction.commit();
+    }
 
-    public void testDelete() {
+    public void testDelete() throws SandeshaStorageException {
         mgr.insert(new CreateSeqBean("TmpSeqId1", "CreateSeqMsgId1", "SeqId1"));
         mgr.delete("CreateSeqMsgId1");
         assertNull(mgr.retrieve("CreateSeqMsgId1"));
     }
 
-    public void testFind() {
+    public void testFind() throws SandeshaStorageException {
         mgr.insert(new CreateSeqBean("TmpSeqId2", "CreateSeqMsgId2", "SeqId2"));
         mgr.insert(new CreateSeqBean("TmpSeqId2", "CreateSeqMsgId3", "SeqId3"));
 
         CreateSeqBean target = new CreateSeqBean();
-        target.setInternalSequenceId("TmpSeqId2");
+        target.setInternalSequenceID("TmpSeqId2");
 
         Iterator iter = mgr.find(target).iterator();
         CreateSeqBean tmp = (CreateSeqBean) iter.next();
-        if (tmp.getCreateSeqMsgId().equals("CreateSeqMsgId1")) {
+        if (tmp.getCreateSeqMsgID().equals("CreateSeqMsgId1")) {
             tmp = (CreateSeqBean) iter.next();
-            assertTrue(tmp.getCreateSeqMsgId().equals("CreateSeqMsgId2"));
+            assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId2"));
 
         }   else {
             tmp = (CreateSeqBean) iter.next();
-            assertTrue(tmp.getCreateSeqMsgId().equals("CreateSeqMsgId3"));
+            assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId3"));
         }
     }
 
-    public void testInsert() {
+    public void testInsert() throws SandeshaStorageException{
         CreateSeqBean bean = new CreateSeqBean("TmpSeqId4", "CreateSeqMsgId4", "SeqId4");
         mgr.insert(bean);
         CreateSeqBean tmpbean = mgr.retrieve("CreateSeqMsgId4");
-        assertTrue(tmpbean.getCreateSeqMsgId().equals("CreateSeqMsgId4"));
-        assertTrue(tmpbean.getSequenceId().equals("SeqId4"));
-        assertTrue(tmpbean.getInternalSequenceId().equals("TmpSeqId4"));
+        assertTrue(tmpbean.getCreateSeqMsgID().equals("CreateSeqMsgId4"));
+        assertTrue(tmpbean.getSequenceID().equals("SeqId4"));
+        assertTrue(tmpbean.getInternalSequenceID().equals("TmpSeqId4"));
     }
 
 
-    public void testRetrieve() {
+    public void testRetrieve() throws SandeshaStorageException{
         assertNull(mgr.retrieve("CreateSeqMsgId5"));
 
         CreateSeqBean bean = new CreateSeqBean("TmpSeqId5", "CreateSeqMsgId5", "SeqId5");
         mgr.insert(bean);
         CreateSeqBean tmp = mgr.retrieve("CreateSeqMsgId5");
-        assertTrue(tmp.getCreateSeqMsgId().equals("CreateSeqMsgId5"));
+        assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId5"));
     }
 
-    public void testUpdate() {
+    public void testUpdate() throws SandeshaStorageException {
 
         CreateSeqBean bean = new CreateSeqBean("TmpSeqId6", "CreateSeqMsgId6", "SeqId6");
         mgr.insert(bean);
-        bean.setInternalSequenceId("TmpSeqId7");
+        bean.setInternalSequenceID("TmpSeqId7");
         mgr.update(bean);
         CreateSeqBean tmp = mgr.retrieve("CreateSeqMsgId6");
-        assertTrue(tmp.getInternalSequenceId().equals("TmpSeqId7"));
+        assertTrue(tmp.getInternalSequenceID().equals("TmpSeqId7"));
     }
 }

Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java?rev=358179&r1=358178&r2=358179&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java Tue Dec 20 18:07:02 2005
@@ -25,8 +25,10 @@
  */
 
 public class NextMsgBeanMgrTest extends SandeshaTestCase {
-    private NextMsgBeanMgr mgr;
-
+    
+	private NextMsgBeanMgr mgr;
+	Transaction transaction;
+	
     public NextMsgBeanMgrTest(String name) {
         super(name);
     }
@@ -35,17 +37,22 @@
         AxisConfiguration axisConfig = new AxisConfiguration();
         ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
         StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx);
+        transaction = storageManager.getTransaction();
         mgr = storageManager.getNextMsgBeanMgr();
 
     }
+    
+    public void tearDown() throws Exception {
+    	transaction.commit();
+    }
 
-    public void testDelete() {
+    public void testDelete() throws SandeshaStorageException{
         mgr.insert(new NextMsgBean("SeqId1", 1001));
         mgr.delete("SeqId1");
         assertNull(mgr.retrieve("SeqId1"));
     }
 
-    public void testFind() {
+    public void testFind() throws SandeshaStorageException {
         mgr.insert(new NextMsgBean("SeqId2", 1002));
         mgr.insert(new NextMsgBean("SeqId3", 1002));
 
@@ -55,24 +62,24 @@
         Iterator iterator = mgr.find(target).iterator();
         NextMsgBean tmp = (NextMsgBean) iterator.next();
 
-        if (tmp.getSequenceId().equals("SeqId2")) {
+        if (tmp.getSequenceID().equals("SeqId2")) {
             tmp = (NextMsgBean) iterator.next();
-            tmp.getSequenceId().equals("SeqId3");
+            tmp.getSequenceID().equals("SeqId3");
         } else {
             tmp = (NextMsgBean) iterator.next();
-            tmp.getSequenceId().equals("SeqId2");
+            tmp.getSequenceID().equals("SeqId2");
         }
 
     }
 
-    public void testInsert() {
+    public void testInsert() throws SandeshaStorageException {
         NextMsgBean bean = new NextMsgBean("SeqId4", 1004);
         mgr.insert(bean);
         NextMsgBean tmp = mgr.retrieve("SeqId4");
         assertTrue(tmp.getNextMsgNoToProcess() == 1004);
     }
 
-    public void testRetrieve() {
+    public void testRetrieve() throws SandeshaStorageException {
         assertNull(mgr.retrieve("SeqId5"));
         mgr.insert(new NextMsgBean("SeqId5", 1005));
 
@@ -80,7 +87,7 @@
         assertTrue(tmp.getNextMsgNoToProcess() == 1005);
     }
 
-    public void testUpdate() {
+    public void testUpdate() throws SandeshaStorageException {
         NextMsgBean bean = new NextMsgBean("SeqId6", 1006);
         mgr.insert(bean);
         bean.setNextMsgNoToProcess(1007);

Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java?rev=358179&r1=358178&r2=358179&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java Tue Dec 20 18:07:02 2005
@@ -26,8 +26,10 @@
  */
 
 public class RetransmitterBeanMgrTest extends SandeshaTestCase {
-    private SenderBeanMgr mgr;
-
+    
+	private SenderBeanMgr mgr;
+	Transaction transaction;
+	
     public RetransmitterBeanMgrTest() {
         super("RetransmitterBeanMgrTest");
     }
@@ -36,10 +38,15 @@
         AxisConfiguration axisConfig = new AxisConfiguration();
         ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
         StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx);
+        transaction = storageManager.getTransaction();
         mgr = storageManager.getRetransmitterBeanMgr();
     }
+    
+    public void tearDown() throws Exception {
+    	transaction.commit();
+    }
 
-    public void testDelete() {
+    public void testDelete() throws SandeshaStorageException {
         assertNull(mgr.retrieve(""));
         try {
             mgr.insert(new SenderBean("MsgId1", "Key1", false , 1001 , "TmpSeqId1", 1001));
@@ -49,23 +56,23 @@
         assertNotNull(mgr.retrieve("MsgId1"));
     }
 
-    public void testFind() {
+    public void testFind() throws SandeshaStorageException {
         try {
             mgr.insert(new SenderBean("MsgId2", "Key2", false , 1001 , "TmpSeqId2", 1002));
             mgr.insert(new SenderBean("MsgId3", "Key3", false , 1001 , "TmpSeqId2", 1003));
 
             SenderBean target = new SenderBean();
-            target.setInternalSequenceId("TmpSeqId2");
+            target.setInternalSequenceID("TmpSeqId2");
 
             Iterator iterator = mgr.find(target).iterator();
             SenderBean tmp = (SenderBean) iterator.next();
 
-            if (tmp.getMessageId().equals("MsgId2")) {
+            if (tmp.getMessageID().equals("MsgId2")) {
                 tmp = (SenderBean) iterator.next();
-                assertTrue(tmp.getMessageId().equals("MsgId3"));
+                assertTrue(tmp.getMessageID().equals("MsgId3"));
             } else {
                 tmp = (SenderBean) iterator.next();
-                assertTrue(tmp.getMessageId().equals("MsgId2"));
+                assertTrue(tmp.getMessageID().equals("MsgId2"));
             }
 
 
@@ -76,18 +83,18 @@
 
     }
 
-    public void testInsert() {
-        try {
-            mgr.insert(new SenderBean());
-            fail("should throw an exception");
-
-        } catch (SandeshaException ex) {
-        }
+    public void testInsert() throws SandeshaStorageException {
+//        try {
+//            mgr.insert(new SenderBean());
+//            fail("should throw an exception");
+//
+//        } catch (SandeshaException ex) {
+//        }
 
         try {
             mgr.insert(new SenderBean("MsgId4","Key4", false , 1001 , "TmpSeqId4", 1004));
             SenderBean tmp = mgr.retrieve("MsgId4");
-            assertTrue(tmp.getKey().equals("Key4"));
+            assertTrue(tmp.getMessageContextRefKey().equals("Key4"));
 
 
         } catch (SandeshaException e) {
@@ -96,7 +103,7 @@
 
     }
 
-    public void testRetrieve() {
+    public void testRetrieve() throws SandeshaStorageException {
         assertNull(mgr.retrieve("MsgId5"));
         try {
             mgr.insert(new SenderBean("MsgId5", "Key5", false , 1001 , "TmpSeqId5", 1005));
@@ -106,7 +113,7 @@
         assertNotNull(mgr.retrieve("MsgId5"));
     }
 
-    public void testUpdate() {
+    public void testUpdate() throws SandeshaStorageException {
         SenderBean bean = new SenderBean("MsgId6", "Key6", false , 1001 , "TmpSeqId6", 1006);
         try {
             mgr.insert(bean);

Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java?rev=358179&r1=358178&r2=358179&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java Tue Dec 20 18:07:02 2005
@@ -26,7 +26,8 @@
 
 public class SequencePropertyBeanMgrTest extends SandeshaTestCase {
     SequencePropertyBeanMgr mgr;
-
+    Transaction transaction;
+    
     public SequencePropertyBeanMgrTest() {
         super("SequencePropertyBeanMgrTest");
     }
@@ -34,18 +35,23 @@
     public void setUp() throws Exception {
         AxisConfiguration axisConfig = new AxisConfiguration();
         ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
-        StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx);;
+        StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx);
+        transaction = storageManager.getTransaction();
         mgr = storageManager.getSequencePropretyBeanMgr();
 
     }
+    
+    public void tearDown() throws Exception {
+    	transaction.commit();
+    }
 
-    public void testDelete() {
+    public void testDelete() throws SandeshaStorageException {
         mgr.insert(new SequencePropertyBean("SeqId1", "Name1", "Value1"));
         mgr.delete("SeqId1", "Name1");
         assertNull(mgr.retrieve("SeqId1", "Name1"));
     }
 
-    public void testFind() {
+    public void testFind() throws SandeshaStorageException {
         mgr.insert(new SequencePropertyBean("SeqId2", "Name2", "Value2"));
         mgr.insert(new SequencePropertyBean("SeqId3", "Name3", "Value2"));
 
@@ -53,30 +59,30 @@
         bean.setValue("Value2");
         Iterator iter = mgr.find(bean).iterator();
         SequencePropertyBean tmp = (SequencePropertyBean) iter.next();
-        if (tmp.getSequenceId().equals("SeqId2")) {
+        if (tmp.getSequenceID().equals("SeqId2")) {
             tmp = (SequencePropertyBean) iter.next();
-            assertTrue(tmp.getSequenceId().equals("SeqId3"));
+            assertTrue(tmp.getSequenceID().equals("SeqId3"));
         } else {
             tmp = (SequencePropertyBean) iter.next();
-            assertTrue(tmp.getSequenceId().equals("SeqId2"));
+            assertTrue(tmp.getSequenceID().equals("SeqId2"));
         }
     }
 
-    public void testInsert() {
+    public void testInsert() throws SandeshaStorageException {
         mgr.insert(new SequencePropertyBean("SeqId4", "Name4", "Value4"));
         SequencePropertyBean tmp = mgr.retrieve("SeqId4", "Name4");
         assertTrue(tmp.getValue().equals("Value4"));
 
     }
 
-    public void testRetrieve() {
+    public void testRetrieve() throws SandeshaStorageException {
         assertNull(mgr.retrieve("SeqId5", "Name5"));
         mgr.insert(new SequencePropertyBean("SeqId5", "Name5", "Value5"));
         assertNotNull(mgr.retrieve("SeqId5", "Name5"));
     }
 
 
-    public void testUpdate() {
+    public void testUpdate() throws SandeshaStorageException {
         SequencePropertyBean bean = new SequencePropertyBean("SeqId6", "Name6", "Value6");
         mgr.insert(bean);
         bean.setValue("Value7");

Modified: webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java?rev=358179&r1=358178&r2=358179&view=diff
==============================================================================
--- webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java (original)
+++ webservices/sandesha/trunk/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java Tue Dec 20 18:07:02 2005
@@ -27,7 +27,8 @@
 public class StorageMapBeanMgrTest extends SandeshaTestCase {
 
     InvokerBeanMgr mgr;
-
+    Transaction transaction;
+    
     public StorageMapBeanMgrTest() {
         super ("StorageMapBeanMgrTest");
     }
@@ -36,51 +37,57 @@
         AxisConfiguration axisConfig = new AxisConfiguration();
         ConfigurationContext configCtx = new ConfigurationContext(axisConfig);
         StorageManager storageManager = SandeshaUtil.getSandeshaStorageManager(configCtx);
+        transaction = storageManager.getTransaction();
         mgr = storageManager.getStorageMapBeanMgr();
     }
+    
+    public void tearDown() throws Exception {
+    	transaction.commit();
+    }
 
-    public void testDelete() {
+    public void testDelete() throws SandeshaStorageException {
         mgr.insert(new InvokerBean("Key1", 1001, "SeqId1"));
         mgr.delete("Key1");
         assertNull(mgr.retrieve("Key1"));
     }
 
-    public void testFind() {
+    public void testFind() throws SandeshaStorageException {
         mgr.insert(new InvokerBean("Key2", 1002, "SeqId2"));
         mgr.insert(new InvokerBean("Key3", 1003, "SeqId2"));
 
         InvokerBean bean = new InvokerBean();
-        bean.setSequenceId("SeqId2");
+        bean.setSequenceID("SeqId2");
 
         Iterator iter = mgr.find(bean).iterator();
         InvokerBean tmp = (InvokerBean) iter.next();
 
-        if (tmp.getKey().equals("Key2")) {
+        if (tmp.getMessageContextRefKey().equals("Key2")) {
             tmp = (InvokerBean) iter.next();
-            assertTrue(tmp.getKey().equals("Key3"));
+            assertTrue(tmp.getMessageContextRefKey().equals("Key3"));
         } else {
             tmp = (InvokerBean) iter.next();
-            assertTrue(tmp.getKey().equals("Key2"));
+            assertTrue(tmp.getMessageContextRefKey().equals("Key2"));
 
         }
     }
 
-    public void testInsert() {
+    public void testInsert() throws SandeshaStorageException {
         mgr.insert(new InvokerBean("Key4", 1004, "SeqId4"));
         InvokerBean tmp = mgr.retrieve("Key4");
-        assertTrue(tmp.getKey().equals("Key4"));
+        assertTrue(tmp.getMessageContextRefKey().equals("Key4"));
     }
 
-    public void testRetrieve() {
+    public void testRetrieve() throws SandeshaStorageException {
         assertNull(mgr.retrieve("Key5"));
         mgr.insert(new InvokerBean("Key5", 1004, "SeqId5"));
         assertNotNull(mgr.retrieve("Key5"));
     }
 
-    public void testUpdate() {
+    public void testUpdate() throws SandeshaStorageException {
         InvokerBean bean = new InvokerBean("Key6", 1006, "SeqId6");
         mgr.insert(bean);
         bean.setMsgNo(1007);
+        mgr.update(bean);
         InvokerBean tmp = mgr.retrieve("Key6");
         assertTrue(tmp.getMsgNo() == 1007);
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org