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

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


The following commit(s) were added to refs/heads/feature/rename by this push:
     new 0c06266  handle windows paths
0c06266 is described below

commit 0c0626655a602f446e1306647ac292a7b901bb3c
Author: Alex Harui <aha...@apache.org>
AuthorDate: Thu Nov 30 17:06:43 2017 -0800

    handle windows paths
---
 .../compiler/internal/codegen/js/royale/TestRoyaleProject.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
 
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
index a89e7f4..927bbae 100644
--- 
a/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
+++ 
b/compiler-jx/src/test/java/org/apache/royale/compiler/internal/codegen/js/royale/TestRoyaleProject.java
@@ -208,7 +208,10 @@ public class TestRoyaleProject extends TestGoogProject
         String out = sb.toString();
         out = out.replace("\\", "/");
 
-        String expected = testAdapter.getUnitTestBaseDir().getPath() + 
"/royale/projects/bad_overrides/Test.as(31:29)\n" +
+        String path = testAdapter.getUnitTestBaseDir().getPath();
+        path = path.replace("\\", "/");
+        
+        String expected = path + 
"/royale/projects/bad_overrides/Test.as(31:29)\n" +
                 "interface method someFunction in interface IA is implemented 
with an incompatible signature in class Test\n" +
                 testAdapter.getUnitTestBaseDir().getPath() + 
"/royale/projects/bad_overrides/Test.as(36:26)\n" +
                 "interface method someOtherFunction in interface IA is 
implemented with an incompatible signature in class Test\n" +
@@ -239,7 +242,10 @@ public class TestRoyaleProject extends TestGoogProject
         String out = sb.toString();
         out = out.replace("\\", "/");
 
-        assertThat(out, is(testAdapter.getUnitTestBaseDir().getPath() +
+        String path = testAdapter.getUnitTestBaseDir().getPath();
+        path = path.replace("\\", "/");
+        
+        assertThat(out, is(path +
                 
"/royale/projects/package_conflicts_ambiguous_definition/mypackage/TestClass.as(29:20)\nAmbiguous
 reference to Event\n" +
                 testAdapter.getUnitTestBaseDir().getPath() +
                 
"/royale/projects/package_conflicts_ambiguous_definition/mypackage/TestClass.as(30:41)\nAmbiguous
 reference to Event\n"));

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

Reply via email to