Author: mckierna
Date: Fri Jul 11 02:09:11 2008
New Revision: 675874
URL: http://svn.apache.org/viewvc?rev=675874&view=rev
Log:
Test repository error in build, improve RMSBean cloning, improve serialization
tests
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
webservices/sandesha/trunk/java/modules/tests/pom.xml
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/MessageContextSerializationTest.java
webservices/sandesha/trunk/java/modules/tests/test-resources/MessageContext.dat
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java?rev=675874&r1=675873&r2=675874&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/storage/beans/RMSBean.java
Fri Jul 11 02:09:11 2008
@@ -174,7 +174,7 @@
public RMSBean(RMSBean beanToCopy) {
super(beanToCopy);
anonymousUUID = beanToCopy.getAnonymousUUID();
- clientCompletedMessages = new
RangeString(beanToCopy.getClientCompletedMessages().toString());
+ clientCompletedMessages =
RangeString.clone(beanToCopy.getClientCompletedMessages());
createSeqMsgID = beanToCopy.getCreateSeqMsgID();
createSequenceMsgStoreKey =
beanToCopy.getCreateSequenceMsgStoreKey();
expectedReplies = beanToCopy.getExpectedReplies();
Modified:
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java?rev=675874&r1=675873&r2=675874&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
(original)
+++
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/util/RangeString.java
Fri Jul 11 02:09:11 2008
@@ -251,6 +251,17 @@
return returnList;
}
+ public static RangeString clone(RangeString original){
+ RangeString newString = new RangeString();
+ if(original!=null){
+ Range[] ranges = original.getRanges();
+ for(int i = 0; i<ranges.length; i++){
+ newString.addRange(ranges[i]);
+ }
+ }
+ return newString;
+ }
+
/**
* Adds the Range into the existing RangeString
* Any existing Ranges that are encompassed in this new Range are
removed.
Modified: webservices/sandesha/trunk/java/modules/tests/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/pom.xml?rev=675874&r1=675873&r2=675874&view=diff
==============================================================================
--- webservices/sandesha/trunk/java/modules/tests/pom.xml (original)
+++ webservices/sandesha/trunk/java/modules/tests/pom.xml Fri Jul 11 02:09:11
2008
@@ -41,6 +41,7 @@
<include>**/*.properties</include>
<include>**/*.xml</include>
<include>**/*.xsl</include>
+ <include>**/*.dat</include>
</includes>
</testResource>
</testResources>
Modified:
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/MessageContextSerializationTest.java
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/MessageContextSerializationTest.java?rev=675874&r1=675873&r2=675874&view=diff
==============================================================================
---
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/MessageContextSerializationTest.java
(original)
+++
webservices/sandesha/trunk/java/modules/tests/src/test/java/org/apache/sandesha2/MessageContextSerializationTest.java
Fri Jul 11 02:09:11 2008
@@ -91,7 +91,9 @@
FileInputStream fis = new FileInputStream(resourceDir +
File.separator + msgCtxDatFileName);
ObjectInputStream msgCtxData = new
ObjectInputStream(fis);
MessageContext msg =
(MessageContext)msgCtxData.readObject();
- //TODO any extra properties set earlier should be read
and verified here
+
assertEquals(expectedMessageContext.getFrom().getAddress(),
msg.getFrom().getAddress());
+ assertEquals(expectedMessageContext.getMessageID(),
msg.getMessageID());
+
assertEquals(expectedMessageContext.getReplyTo().getAddress(),
msg.getReplyTo().getAddress());
}
}
@@ -159,7 +161,9 @@
ConfigurationContext configContext =
ConfigurationContextFactory.createConfigurationContextFromFileSystem(repoPath,axis2_xml);
expectedMessageContext = configContext.createMessageContext();
- //TODO this could be improved by adding some RM sequence headers
+ expectedMessageContext.setFrom(epr);
+ expectedMessageContext.setMessageID("someMessageID");
+ expectedMessageContext.setReplyTo(epr);
}
/**
@@ -211,10 +215,10 @@
* This main method, when run, will setup the .dat files that this test
expects.
* These files should be checked into SVN when generated/modified
*/
-// public static void main(String[] args)throws Exception{
-// MessageContextSerializationTest test = new
MessageContextSerializationTest("");
-// test.setUp();
-// test.produceDataSet();
-// }
+ public static void main(String[] args)throws Exception{
+ MessageContextSerializationTest test = new
MessageContextSerializationTest("");
+ test.setUp();
+ test.produceDataSet();
+ }
}
Modified:
webservices/sandesha/trunk/java/modules/tests/test-resources/MessageContext.dat
URL:
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/tests/test-resources/MessageContext.dat?rev=675874&r1=675873&r2=675874&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
