updated for correct privileged rules that import is not inside the scope of

privileged aspect so it can't see package-visible types

diff --git a/tests/new/privilegedAspects/fish/B.java b/tests/new/privilegedAspects/fish/B.java
index d56aef7588b1b1af9f961257248060a1426ea865..78bbb57dd83e4d4e70792d85da693121902f087d 100644 (file)
--- a/tests/new/privilegedAspects/fish/B.java
+++ b/tests/new/privilegedAspects/fish/B.java
@@ -1,5 +1,4 @@
 package fish;
-import main.Main;
 
 privileged aspect B {
     private static String privateStatic = "B's private";
@@ -7,8 +6,8 @@ privileged aspect B {
     //introduction PrivateClass {
     public void PrivateClass.fooB() {
         b--;
-        Main.doThang("B: " + b);
-        Main.doThang("B: " + b());
+        main.Main.doThang("B: " + b);
+        main.Main.doThang("B: " + b());
 
        System.out.println(privateStatic + "::" + FooC.privateStatic);
     }
@@ -17,8 +16,8 @@ privileged aspect B {
     
     before(PrivateClass obj): call(void PrivateClass.goo()) && target(obj) {
        obj.b--;
-       Main.doThang("B: " + obj.b);
-       Main.doThang("B: " + obj.b());
+       main.Main.doThang("B: " + obj.b);
+       main.Main.doThang("B: " + obj.b());
     }
 }
 

diff --git a/tests/new/privilegedAspects/fish/PrivateClass.java b/tests/new/privilegedAspects/fish/PrivateClass.java
index f0294103677ca2f30636783da21a95d03755f9f0..a5b0593a6fdff61697e3d885e66bf0cdfb66ff6f 100644 (file)
--- a/tests/new/privilegedAspects/fish/PrivateClass.java
+++ b/tests/new/privilegedAspects/fish/PrivateClass.java
@@ -1,5 +1,4 @@
 package fish;
-import main.Main;
 
 public class PrivateClass {
     private int a = 999;
@@ -18,14 +17,14 @@ privileged aspect A {
     
     public void PrivateClass.fooA() {
         a--;
-        Main.doThang("A: " + a);
-        Main.doThang("A: " + a());
+        main.Main.doThang("A: " + a);
+        main.Main.doThang("A: " + a());
     }
     
     before(PrivateClass obj): call(void PrivateClass.goo()) && target(obj) {
        obj.a--;
-       Main.doThang("A: " + obj.a);
-       Main.doThang("A: " + obj.a());
+       main.Main.doThang("A: " + obj.a);
+       main.Main.doThang("A: " + obj.a());
     }
 }
 

diff --git a/tests/new/privilegedAspects/fowl/C.java b/tests/new/privilegedAspects/fowl/C.java
index bc227f85faacd3491ba09bc933a160f40cf3dfc3..9b5ca99d2c58b4f234d17c3e51223ee5413956d3 100644 (file)
--- a/tests/new/privilegedAspects/fowl/C.java
+++ b/tests/new/privilegedAspects/fowl/C.java
@@ -1,18 +1,17 @@
 package fowl;
-import fish.PrivateClass;
-import main.Main;
+import fish.*;
 
 privileged aspect C {
     
-    public void PrivateClass.fooC() {
+    public void fish.PrivateClass.fooC() {
         c--;
-        Main.doThang("C: " + c);
-        Main.doThang("C: " + c());
+        main.Main.doThang("C: " + c);
+        main.Main.doThang("C: " + c());
     }
     
     before(PrivateClass obj): call(void PrivateClass.goo()) && target(obj) {
        obj.c--;
-       Main.doThang("C: " + obj.c);
-       Main.doThang("C: " + obj.c());
+       main.Main.doThang("C: " + obj.c);
+       main.Main.doThang("C: " + obj.c());
     }
 }

diff --git a/tests/new/privilegedAspects/fowl/D.java b/tests/new/privilegedAspects/fowl/D.java
index 4b36d2fe87d8e6388b9cae9e3eff0df5c8539340..b2bc9fd43fa31b3ea0b4bf5ea418e4369971df9a 100644 (file)
--- a/tests/new/privilegedAspects/fowl/D.java
+++ b/tests/new/privilegedAspects/fowl/D.java
@@ -1,17 +1,16 @@
 package fowl;
-import main.Main;
 
 privileged aspect D {
 
     public void fish.PrivateClass.fooD() {
         d--;
-        Main.doThang("D: " + d);
-        Main.doThang("D: " + d());
+        main.Main.doThang("D: " + d);
+        main.Main.doThang("D: " + d());
     }
     
     before(fish.PrivateClass obj): call(void fish.PrivateClass.goo()) && target(obj) {
        obj.d--;
-       Main.doThang("D: " + obj.d);
-       Main.doThang("D: " + obj.d());
+       main.Main.doThang("D: " + obj.d);
+       main.Main.doThang("D: " + obj.d());
     }
 }