[royale-compiler] branch develop updated: move that fix and try again

[ah...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new 3393dfd  move that fix and try again
3393dfd is described below

commit 3393dfd0d06d8be43d4aec289e379aa351af8d47
Author: Alex Harui <ah...@apache.org>
AuthorDate: Sun Dec 10 19:30:59 2017 -0800

    move that fix and try again
---
 compiler/src/test/java/as/ASFeatureTestsBase.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/src/test/java/as/ASFeatureTestsBase.java b/compiler/src/test/java/as/ASFeatureTestsBase.java
index 9ff4ccb..c66a58c 100644
--- a/compiler/src/test/java/as/ASFeatureTestsBase.java
+++ b/compiler/src/test/java/as/ASFeatureTestsBase.java
@@ -235,6 +235,7 @@ public class ASFeatureTestsBase
 						e.printStackTrace();
 					}
 					String ours = out.toString();
+					ours = ours.replaceAll("\r\n", "\n");
 					className = className.replace(".", "_");
 					String resultName = className + "_" + methodName + "_swfdump.xml";
 					File resultFile = new File(testAdapter.getUnitTestBaseDir(), "swfdumps/" + resultName);
@@ -257,6 +258,7 @@ public class ASFeatureTestsBase
 						}
 						fileReader.close();
 						resultText = stringBuffer.toString();
+						resultText = resultText.replaceAll("\r\n", "\n");
 						String tempClassName = tempASFile.getName();
 						tempClassName = tempClassName.replace(".as", "");
 						tempClassName = tempClassName.replace(".mxml", "");
@@ -270,8 +272,6 @@ public class ASFeatureTestsBase
 					} catch (IOException e) {
 						e.printStackTrace();
 					}
-					ours = ours.replaceAll("\r\n", "\n");
-					resultText = resultText.replaceAll("\r\n", "\n");
 					// remove file length because the generated classname could have a different
 					// length and affect the swf length
 					int c = resultText.indexOf("<!-- framecount");

-- 
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].