From: aclement <aclement>
Date: Mon, 21 Aug 2006 12:34:46 +0000 (+0000)
Subject: 145963: work on linux
X-Git-Tag: BEFORE_133532~93
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bec92132ab1ee779bc910c62fd8cb854973d06cf;p=aspectj.git

145963: work on linux
---

diff --git a/tests/model/expected/pr145963_1.txt b/tests/model/expected/pr145963_1.txt
index 3a0f42f14..5e2067ec2 100644
--- a/tests/model/expected/pr145963_1.txt
+++ b/tests/model/expected/pr145963_1.txt
@@ -1,24 +1,24 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
   pkg  [package] 
-    SourceAspect.aj  [java source file] TEST_SANDBOX\SourceAspect.aj:1::0
+    SourceAspect.aj  [java source file] TEST_SANDBOX\SourceAspect.aj:1:
       import declarations  [import reference] 
-      SourceAspect  [aspect] TEST_SANDBOX\SourceAspect.aj:3::30
-        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5::49
-        p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7::154
-        before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9::187
-    BinaryAspect.class (binary)  [class] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1::0
+      SourceAspect  [aspect] TEST_SANDBOX\SourceAspect.aj:3:
+        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5:
+        p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7:
+        before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9:
+    BinaryAspect.class (binary)  [class] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1:
       import declarations  [import reference] 
-      BinaryAspect  [aspect] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1::0
-        p()  [pointcut] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:7::0
-        before(): p..  [advice] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:9::0
-        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:5::0
+      BinaryAspect  [aspect] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:1:
+        p()  [pointcut] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:7:
+        before(): p..  [advice] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:9:
+        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!pkg\BinaryAspect.class:5:
   pack  [package] 
-    C.java  [java source file] TEST_SANDBOX\C.java:1::0
+    C.java  [java source file] TEST_SANDBOX\C.java:1:
       import declarations  [import reference] 
-      C  [class] TEST_SANDBOX\C.java:3::30
-        method1()  [method] TEST_SANDBOX\C.java:5::50
-          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6::93
+      C  [class] TEST_SANDBOX\C.java:3:
+        method1()  [method] TEST_SANDBOX\C.java:5:
+          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
 (targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect&before (advises) <pack{C.java[C~method1
diff --git a/tests/model/expected/pr145963_2.txt b/tests/model/expected/pr145963_2.txt
index 576724c4c..7c996f7c5 100644
--- a/tests/model/expected/pr145963_2.txt
+++ b/tests/model/expected/pr145963_2.txt
@@ -1,24 +1,24 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
   pkg  [package] 
-    SourceAspect.aj  [java source file] TEST_SANDBOX\SourceAspect.aj:1::0
+    SourceAspect.aj  [java source file] TEST_SANDBOX\SourceAspect.aj:1:
       import declarations  [import reference] 
-      SourceAspect  [aspect] TEST_SANDBOX\SourceAspect.aj:3::30
-        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5::49
-        p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7::154
-        before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9::187
-    BinaryAspect.class (binary)  [class] TEST_SANDBOX!pkg\BinaryAspect.class:1::0
+      SourceAspect  [aspect] TEST_SANDBOX\SourceAspect.aj:3:
+        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\SourceAspect.aj:5:
+        p()  [pointcut] TEST_SANDBOX\SourceAspect.aj:7:
+        before(): p..  [advice] TEST_SANDBOX\SourceAspect.aj:9:
+    BinaryAspect.class (binary)  [class] TEST_SANDBOX!pkg\BinaryAspect.class:1:
       import declarations  [import reference] 
-      BinaryAspect  [aspect] TEST_SANDBOX!pkg\BinaryAspect.class:1::0
-        p()  [pointcut] TEST_SANDBOX!pkg\BinaryAspect.class:7::0
-        before(): p..  [advice] TEST_SANDBOX!pkg\BinaryAspect.class:9::0
-        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX!pkg\BinaryAspect.class:5::0
+      BinaryAspect  [aspect] TEST_SANDBOX!pkg\BinaryAspect.class:1:
+        p()  [pointcut] TEST_SANDBOX!pkg\BinaryAspect.class:7:
+        before(): p..  [advice] TEST_SANDBOX!pkg\BinaryAspect.class:9:
+        declare warning: "There should be n.."  [declare warning] TEST_SANDBOX!pkg\BinaryAspect.class:5:
   pack  [package] 
-    C.java  [java source file] TEST_SANDBOX\C.java:1::0
+    C.java  [java source file] TEST_SANDBOX\C.java:1:
       import declarations  [import reference] 
-      C  [class] TEST_SANDBOX\C.java:3::30
-        method1()  [method] TEST_SANDBOX\C.java:5::50
-          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6::93
+      C  [class] TEST_SANDBOX\C.java:3:
+        method1()  [method] TEST_SANDBOX\C.java:5:
+          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
 (targets=1) <pkg[BinaryAspect.class (binary)}BinaryAspect&before (advises) <pack{C.java[C~method1
diff --git a/tests/model/expected/pr145963_3.txt b/tests/model/expected/pr145963_3.txt
index d278a4ddf..e3cff1bbf 100644
--- a/tests/model/expected/pr145963_3.txt
+++ b/tests/model/expected/pr145963_3.txt
@@ -1,14 +1,14 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
-  C.java  [java source file] TEST_SANDBOX\C.java:1::0
+  C.java  [java source file] TEST_SANDBOX\C.java:1:
     import declarations  [import reference] 
-    C  [class] TEST_SANDBOX\C.java:3::17
-      method1()  [method] TEST_SANDBOX\C.java:5::37
-        field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6::80
-  AspectInDefaultPackage.class (binary)  [class] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:1::0
+    C  [class] TEST_SANDBOX\C.java:3:
+      method1()  [method] TEST_SANDBOX\C.java:5:
+        field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
+  AspectInDefaultPackage.class (binary)  [class] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:1:
     import declarations  [import reference] 
-    AspectInDefaultPackage  [aspect] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:1::0
-      declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:4::0
+    AspectInDefaultPackage  [aspect] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:1:
+      declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!AspectInDefaultPackage.class:4:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
 (targets=1) {C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) [AspectInDefaultPackage.class (binary)}AspectInDefaultPackage`declare warning
diff --git a/tests/model/expected/pr145963_4.txt b/tests/model/expected/pr145963_4.txt
index 08924e13f..04a5873e6 100644
--- a/tests/model/expected/pr145963_4.txt
+++ b/tests/model/expected/pr145963_4.txt
@@ -1,15 +1,15 @@
 === MODEL STATUS REPORT ========= After a batch build
 <root>  [java source file] 
   pack  [package] 
-    C.java  [java source file] TEST_SANDBOX\C.java:1::0
+    C.java  [java source file] TEST_SANDBOX\C.java:1:
       import declarations  [import reference] 
-      C  [class] TEST_SANDBOX\C.java:3::30
-        method1()  [method] TEST_SANDBOX\C.java:5::50
-          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6::93
-  A.class (binary)  [class] TEST_SANDBOX\simple.jar!A.class:1::0
+      C  [class] TEST_SANDBOX\C.java:3:
+        method1()  [method] TEST_SANDBOX\C.java:5:
+          field-get(java.io.PrintStream java.lang.System.out)  [code] TEST_SANDBOX\C.java:6:
+  A.class (binary)  [class] TEST_SANDBOX\simple.jar!A.class:1:
     import declarations  [import reference] 
-    A  [aspect] TEST_SANDBOX\simple.jar!A.class:1::0
-      declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!A.class:4::0
+    A  [aspect] TEST_SANDBOX\simple.jar!A.class:1:
+      declare warning: "There should be n.."  [declare warning] TEST_SANDBOX\simple.jar!A.class:4:
 === END OF MODEL REPORT =========
 === RELATIONSHIPS REPORT ========= After a batch build
 (targets=1) <pack{C.java[C~method1?field-get(java.io.PrintStream java.lang.System.out) (matches declare) [A.class (binary)}A`declare warning
diff --git a/tests/src/org/aspectj/systemtest/model/ModelTestCase.java b/tests/src/org/aspectj/systemtest/model/ModelTestCase.java
index 37f873839..6f39ebdec 100644
--- a/tests/src/org/aspectj/systemtest/model/ModelTestCase.java
+++ b/tests/src/org/aspectj/systemtest/model/ModelTestCase.java
@@ -76,7 +76,21 @@ public abstract class ModelTestCase extends XMLBasedAjcTestCase {
 		}
 
 		public String processFilelocation(String loc) {
-			if (loc.startsWith(sandboxDirectory)) return "TEST_SANDBOX"+loc.substring(sandboxDirectory.length());
+			if (loc.toLowerCase().startsWith(sandboxDirectory.toLowerCase())) {
+				String sub = loc.substring(sandboxDirectory.length());
+				int forwardSlash = sub.indexOf("/");
+				// replace all "/" with "\" - to ensure platform independence
+				if (forwardSlash != -1) {
+					sub = sub.replace('/','\\');
+				}
+				// don't report the column number since this is sometimes
+				// different on windows and linux
+				int column = sub.lastIndexOf(':');
+				if (column != -1) {
+					return "TEST_SANDBOX" + sub.substring(0,column);
+				}
+				return "TEST_SANDBOX"+sub;
+			}
 			return loc;
 		}