[savara-commits] savara SVN: r624 - in branches/experimental/2.0.x/bundles: org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser and 1 other directory.

[do-not-reply at jboss.org]

Author: objectiser
Date: 2011-01-27 08:48:46 -0500 (Thu, 27 Jan 2011)
New Revision: 624

Removed:
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/
Modified:
   branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
   branches/experimental/2.0.x/bundles/pom.xml
Log:
Remove separate bundles.test bundle, as tests have now been localised to the appropriate bundles.

Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java	2011-01-26 17:28:01 UTC (rev 623)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java	2011-01-27 13:48:46 UTC (rev 624)
@@ -44,7 +44,7 @@
 			
 			String spr=new String(os.toByteArray());
 			
-			//spr = spr.replaceAll("\r\n", "\n");
+			spr = spr.replaceAll("\r\n", "\n");
 			
 			java.io.InputStream is=
 				ClassLoader.getSystemResourceAsStream(sprFile);
@@ -59,6 +59,8 @@
 			
 			String sprText=new String(b);
 			
+			sprText = sprText.replaceAll("\r\n", "\n");
+
 			if (spr.equals(sprText) == false) {
 				System.out.println("Derived choreo=\r\n"+spr);
 				fail("Protocol derived from choreography: (len="+spr.length()+")\r\n::"+spr+

Modified: branches/experimental/2.0.x/bundles/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/pom.xml	2011-01-26 17:28:01 UTC (rev 623)
+++ branches/experimental/2.0.x/bundles/pom.xml	2011-01-27 13:48:46 UTC (rev 624)
@@ -30,7 +30,6 @@
 		<module>org.savara.protocol</module>
 		<module>org.savara.scenario</module>
 		<module>org.savara.wsdl</module>
-		<module>org.savara.bundles.tests</module>
 	</modules>
  
 	<build>