Author: chamikara
Date: Sat Sep 23 08:12:40 2006
New Revision: 449257

URL: http://svn.apache.org/viewvc?view=rev&rev=449257
Log:
Updated the test cases to comply with the recent changes.


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

Modified: 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/PropertyLoaderTest.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/PropertyLoaderTest.java?view=diff&rev=449257&r1=449256&r2=449257
==============================================================================
--- 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/PropertyLoaderTest.java
 (original)
+++ 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/PropertyLoaderTest.java
 Sat Sep 23 08:12:40 2006
@@ -22,12 +22,12 @@
 

 import junit.framework.TestCase;

 

+import org.apache.sandesha2.policy.SandeshaPolicyBean;

 import org.apache.sandesha2.util.PropertyManager;

-import org.apache.sandesha2.util.SandeshaPropertyBean;

 

 public class PropertyLoaderTest extends TestCase {

        

-       SandeshaPropertyBean propertyBean = null;

+       SandeshaPolicyBean propertyBean = null;

        

        public void setUp () {

                String fileName = "./test-resources/sandesha2.properties";

@@ -62,7 +62,7 @@
        }

        

        public void testInactivityTImeout () {

-               long value = propertyBean.getInactiveTimeoutInterval();

+               long value = propertyBean.getInactivityTimeoutInterval();

                assertEquals(value,(60*60*3*1000));

        }

        


Modified: 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/security/SecurityTest.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/security/SecurityTest.java?view=diff&rev=449257&r1=449256&r2=449257
==============================================================================
--- 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/security/SecurityTest.java
 (original)
+++ 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/security/SecurityTest.java
 Sat Sep 23 08:12:40 2006
@@ -27,6 +27,7 @@
 import org.apache.axis2.context.MessageContextConstants;

 import org.apache.axis2.transport.http.SimpleHTTPServer;

 import org.apache.sandesha2.Sandesha2Constants;

+import org.apache.sandesha2.SandeshaException;

 import org.apache.sandesha2.SandeshaTestCase;

 import org.apache.sandesha2.client.SandeshaClient;

 import org.apache.sandesha2.client.SandeshaClientConstants;

@@ -61,6 +62,7 @@
                httpServer = new SimpleHTTPServer (configContext,serverPort);

                httpServer.start();

                Thread.sleep(300);

+               

        }

        

        public void tearDown () throws Exception {


Modified: 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java?view=diff&rev=449257&r1=449256&r2=449257
==============================================================================
--- 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
 (original)
+++ 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/CreateSeqBeanMgrTest.java
 Sat Sep 23 08:12:40 2006
@@ -16,10 +16,10 @@
 

 package org.apache.sandesha2.storage;

 

+import org.apache.sandesha2.policy.SandeshaPolicyBean;

 import org.apache.sandesha2.storage.beanmanagers.CreateSeqBeanMgr;

 import org.apache.sandesha2.storage.beans.CreateSeqBean;

 import org.apache.sandesha2.util.PropertyManager;

-import org.apache.sandesha2.util.SandeshaPropertyBean;

 import org.apache.sandesha2.util.SandeshaUtil;

 import org.apache.sandesha2.Sandesha2Constants;

 import org.apache.sandesha2.SandeshaTestCase;

@@ -41,7 +41,7 @@
     public void setUp() throws Exception {

        

         AxisConfiguration axisConfig =  new AxisConfiguration();

-        SandeshaPropertyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

+        SandeshaPolicyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

         Parameter parameter = new Parameter ();

         parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);

         parameter.setValue(propertyBean);

@@ -62,17 +62,31 @@
     }

 

     public void testDelete() throws SandeshaStorageException {

-        mgr.insert(new CreateSeqBean("TmpSeqId1", "CreateSeqMsgId1", 
"SeqId1"));

+       CreateSeqBean createSeqBean = new CreateSeqBean ();

+       createSeqBean.setInternalSequenceID("TmpSeqId1");

+       createSeqBean.setCreateSeqMsgID("CreateSeqMsgId1");

+       createSeqBean.setSequenceID("SeqId1");

+        mgr.insert(createSeqBean);

         mgr.delete("CreateSeqMsgId1");

         assertNull(mgr.retrieve("CreateSeqMsgId1"));

     }

 

     public void testFind() throws SandeshaStorageException {

-        mgr.insert(new CreateSeqBean("TmpSeqId2", "CreateSeqMsgId2", 
"SeqId2"));

-        mgr.insert(new CreateSeqBean("TmpSeqId2", "CreateSeqMsgId3", 
"SeqId3"));

+       CreateSeqBean createSeqBean1 = new CreateSeqBean ();

+       createSeqBean1.setInternalSequenceID("TmpSeqId1");

+       createSeqBean1.setCreateSeqMsgID("CreateSeqMsgId1");

+       createSeqBean1.setSequenceID("SeqId1");

+       

+       CreateSeqBean createSeqBean2 = new CreateSeqBean ();

+       createSeqBean2.setInternalSequenceID("TmpSeqId1");

+       createSeqBean2.setCreateSeqMsgID("CreateSeqMsgId2");

+       createSeqBean2.setSequenceID("SeqId2");

+       

+        mgr.insert(createSeqBean1);

+        mgr.insert(createSeqBean2);

 

         CreateSeqBean target = new CreateSeqBean();

-        target.setInternalSequenceID("TmpSeqId2");

+        target.setInternalSequenceID("TmpSeqId1");

 

         Iterator iter = mgr.find(target).iterator();

         CreateSeqBean tmp = (CreateSeqBean) iter.next();

@@ -82,13 +96,16 @@
 

         }   else {

             tmp = (CreateSeqBean) iter.next();

-            assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId3"));

+            assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId1"));

         }

     }

 

     public void testInsert() throws SandeshaStorageException{

-        CreateSeqBean bean = new CreateSeqBean("TmpSeqId4", "CreateSeqMsgId4", 
"SeqId4");

-        mgr.insert(bean);

+       CreateSeqBean createSeqBean = new CreateSeqBean ();

+       createSeqBean.setInternalSequenceID("TmpSeqId4");

+       createSeqBean.setCreateSeqMsgID("CreateSeqMsgId4");

+       createSeqBean.setSequenceID("SeqId4");

+        mgr.insert(createSeqBean);

         CreateSeqBean tmpbean = mgr.retrieve("CreateSeqMsgId4");

         assertTrue(tmpbean.getCreateSeqMsgID().equals("CreateSeqMsgId4"));

         assertTrue(tmpbean.getSequenceID().equals("SeqId4"));

@@ -99,18 +116,24 @@
     public void testRetrieve() throws SandeshaStorageException{

         assertNull(mgr.retrieve("CreateSeqMsgId5"));

 

-        CreateSeqBean bean = new CreateSeqBean("TmpSeqId5", "CreateSeqMsgId5", 
"SeqId5");

-        mgr.insert(bean);

+       CreateSeqBean createSeqBean = new CreateSeqBean ();

+       createSeqBean.setInternalSequenceID("TmpSeqId5");

+       createSeqBean.setCreateSeqMsgID("CreateSeqMsgId5");

+       createSeqBean.setSequenceID("SeqId5");

+        mgr.insert(createSeqBean);

         CreateSeqBean tmp = mgr.retrieve("CreateSeqMsgId5");

         assertTrue(tmp.getCreateSeqMsgID().equals("CreateSeqMsgId5"));

     }

 

     public void testUpdate() throws SandeshaStorageException {

-

-        CreateSeqBean bean = new CreateSeqBean("TmpSeqId6", "CreateSeqMsgId6", 
"SeqId6");

-        mgr.insert(bean);

-        bean.setInternalSequenceID("TmpSeqId7");

-        mgr.update(bean);

+       CreateSeqBean createSeqBean = new CreateSeqBean ();

+       createSeqBean.setInternalSequenceID("TmpSeqId6");

+       createSeqBean.setCreateSeqMsgID("CreateSeqMsgId6");

+       createSeqBean.setSequenceID("SeqId6");

+        

+        mgr.insert(createSeqBean);

+        createSeqBean.setInternalSequenceID("TmpSeqId7");

+        mgr.update(createSeqBean);

         CreateSeqBean tmp = mgr.retrieve("CreateSeqMsgId6");

         assertTrue(tmp.getInternalSequenceID().equals("TmpSeqId7"));

     }


Modified: 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java?view=diff&rev=449257&r1=449256&r2=449257
==============================================================================
--- 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
 (original)
+++ 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/NextMsgBeanMgrTest.java
 Sat Sep 23 08:12:40 2006
@@ -16,10 +16,10 @@
 

 package org.apache.sandesha2.storage;

 

+import org.apache.sandesha2.policy.SandeshaPolicyBean;

 import org.apache.sandesha2.storage.beanmanagers.NextMsgBeanMgr;

 import org.apache.sandesha2.storage.beans.NextMsgBean;

 import org.apache.sandesha2.util.PropertyManager;

-import org.apache.sandesha2.util.SandeshaPropertyBean;

 import org.apache.sandesha2.util.SandeshaUtil;

 import org.apache.sandesha2.Sandesha2Constants;

 import org.apache.sandesha2.SandeshaTestCase;

@@ -40,7 +40,7 @@
 

     public void setUp() throws Exception {

         AxisConfiguration axisConfig = new AxisConfiguration();

-        SandeshaPropertyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

+        SandeshaPolicyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

         Parameter parameter = new Parameter ();

         parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);

         parameter.setValue(propertyBean);


Modified: 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java?view=diff&rev=449257&r1=449256&r2=449257
==============================================================================
--- 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
 (original)
+++ 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/RetransmitterBeanMgrTest.java
 Sat Sep 23 08:12:40 2006
@@ -19,10 +19,10 @@
 import org.apache.sandesha2.Sandesha2Constants;

 import org.apache.sandesha2.SandeshaException;

 import org.apache.sandesha2.SandeshaTestCase;

+import org.apache.sandesha2.policy.SandeshaPolicyBean;

 import org.apache.sandesha2.storage.beanmanagers.SenderBeanMgr;

 import org.apache.sandesha2.storage.beans.SenderBean;

 import org.apache.sandesha2.util.PropertyManager;

-import org.apache.sandesha2.util.SandeshaPropertyBean;

 import org.apache.sandesha2.util.SandeshaUtil;

 import org.apache.axis2.description.Parameter;

 import org.apache.axis2.engine.AxisConfiguration;

@@ -42,7 +42,7 @@
 

     public void setUp() throws Exception {

         AxisConfiguration axisConfig = new AxisConfiguration();

-        SandeshaPropertyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

+        SandeshaPolicyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

         Parameter parameter = new Parameter ();

         parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);

         parameter.setValue(propertyBean);


Modified: 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java?view=diff&rev=449257&r1=449256&r2=449257
==============================================================================
--- 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java
 (original)
+++ 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/SequencePropertyBeanMgrTest.java
 Sat Sep 23 08:12:40 2006
@@ -16,10 +16,10 @@
 

 package org.apache.sandesha2.storage;

 

+import org.apache.sandesha2.policy.SandeshaPolicyBean;

 import org.apache.sandesha2.storage.beanmanagers.SequencePropertyBeanMgr;

 import org.apache.sandesha2.storage.beans.SequencePropertyBean;

 import org.apache.sandesha2.util.PropertyManager;

-import org.apache.sandesha2.util.SandeshaPropertyBean;

 import org.apache.sandesha2.util.SandeshaUtil;

 import org.apache.sandesha2.Sandesha2Constants;

 import org.apache.sandesha2.SandeshaTestCase;

@@ -40,7 +40,7 @@
 

     public void setUp() throws Exception {

         AxisConfiguration axisConfig = new AxisConfiguration();

-        SandeshaPropertyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

+        SandeshaPolicyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

         Parameter parameter = new Parameter ();

         parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);

         parameter.setValue(propertyBean);


Modified: 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java?view=diff&rev=449257&r1=449256&r2=449257
==============================================================================
--- 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
 (original)
+++ 
webservices/sandesha/trunk/java/test/src/org/apache/sandesha2/storage/StorageMapBeanMgrTest.java
 Sat Sep 23 08:12:40 2006
@@ -16,10 +16,10 @@
 

 package org.apache.sandesha2.storage;

 

+import org.apache.sandesha2.policy.SandeshaPolicyBean;

 import org.apache.sandesha2.storage.beanmanagers.InvokerBeanMgr;

 import org.apache.sandesha2.storage.beans.InvokerBean;

 import org.apache.sandesha2.util.PropertyManager;

-import org.apache.sandesha2.util.SandeshaPropertyBean;

 import org.apache.sandesha2.util.SandeshaUtil;

 import org.apache.sandesha2.Sandesha2Constants;

 import org.apache.sandesha2.SandeshaTestCase;

@@ -40,7 +40,7 @@
 

     public void setUp() throws Exception {

         AxisConfiguration axisConfig = new AxisConfiguration();

-        SandeshaPropertyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

+        SandeshaPolicyBean propertyBean = 
PropertyManager.loadPropertiesFromDefaultValues();

         Parameter parameter = new Parameter ();

         parameter.setName(Sandesha2Constants.SANDESHA_PROPERTY_BEAN);

         parameter.setValue(propertyBean);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to