[jboss-svn-commits] JBL Code SVN: r8409 - labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config

[jboss-svn-commits at lists.jboss.org]

Author: tfennelly
Date: 2006-12-19 11:34:36 -0500 (Tue, 19 Dec 2006)
New Revision: 8409

Modified:
   labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java
Log:
fix to remove EOL bug on test comparison

Modified: labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java	2006-12-19 15:54:17 UTC (rev 8408)
+++ labs/jbossesb/trunk/product/core/listeners/tests/src/org/jboss/soa/esb/listeners/config/GeneratorUnitTest.java	2006-12-19 16:34:36 UTC (rev 8409)
@@ -37,6 +37,8 @@
 import org.jboss.soa.esb.listeners.config.ServiceDocument.Service;
 import org.jboss.soa.esb.testutils.FileUtil;
 
+import com.sun.java_cup.internal.internal_error;
+
 /**
  * Generator unit tests.
  * @author <a href="mailto:tom.fennelly at jboss.com">tom.fennelly at jboss.com</a>
@@ -71,16 +73,30 @@
 		String expectedGatewayConfig = new String(StreamUtils.readStream(getClass().getResourceAsStream("jbossesb_config_01_gateways.xml")));
 		String actualGatewayConfig = FileUtil.readTextFile(gatewayConfig);
 		System.out.println("[" + actualGatewayConfig + "]");
-		assertEquals(expectedGatewayConfig, actualGatewayConfig);
+		assertEquals(removeEOL(expectedGatewayConfig), removeEOL(actualGatewayConfig));
 		
 		awareConfig = new File(outdir, Generator.ESB_CONFIG_XML_FILE);
 		assertTrue(awareConfig.exists());
 		String expectedESBAwareConfig = new String(StreamUtils.readStream(getClass().getResourceAsStream("jbossesb_config_01_esbaware.xml")));
 		String actualESBAwareConfig = FileUtil.readTextFile(awareConfig);
 		System.out.println("[" + actualESBAwareConfig + "]");
-		assertEquals(expectedESBAwareConfig, actualESBAwareConfig);
+		assertEquals(removeEOL(expectedESBAwareConfig), removeEOL(actualESBAwareConfig));
 	}
 	
+	private String removeEOL(String string) {
+		StringBuffer stringBuf = new StringBuffer(string.length());
+
+		for(int i = 0; i < string.length(); i++) {
+			char character = string.charAt(i);
+			
+			if(character != '\r' && character != '\n') {
+				stringBuf.append(character);
+			}
+		}
+		
+		return stringBuf.toString();
+	}
+
 	public void test_model() throws ConfigurationException, IOException {
 		Generator generator = new Generator(getClass().getResourceAsStream("jbossesb_config_01.xml"));
 		XMLBeansModel model = generator.getModel();