moved tests to 153

diff --git a/tests/bugs152/pr145693/Event.java b/tests/bugs152/pr145693/Event.java
deleted file mode 100644 (file)
index e2a8b62..0000000
--- a/tests/bugs152/pr145693/Event.java
+++ /dev/null
@@ -1 +0,0 @@
-public class Event {}

diff --git a/tests/bugs152/pr145693/Monitor.aj b/tests/bugs152/pr145693/Monitor.aj
deleted file mode 100644 (file)
index 51b3785..0000000
--- a/tests/bugs152/pr145693/Monitor.aj
+++ /dev/null
@@ -1,12 +0,0 @@
-public aspect Monitor {
-    public pointcut handleEvent(Event event):
-        execution(* handleEvent(Event, ..)) && args(event);
-    
-    public pointcut inHandleEvent(Event event): cflow(handleEvent(event));
-
-    before(Event event): 
-               set(* currentView) && 
-               inHandleEvent(event) {
-       }
-    
-}

diff --git a/tests/bugs152/pr145693/Sample.java b/tests/bugs152/pr145693/Sample.java
deleted file mode 100644 (file)
index 50f9cb3..0000000
--- a/tests/bugs152/pr145693/Sample.java
+++ /dev/null
@@ -1,9 +0,0 @@
-public class Sample {
-
-    private static Object currentView;
-
-    public static void main(String args[]) {
-        currentView = "test";
-    }
-
-}

diff --git a/tests/bugs153/pr145693/Event.java b/tests/bugs153/pr145693/Event.java
new file mode 100644 (file)
index 0000000..e2a8b62
--- /dev/null
+++ b/tests/bugs153/pr145693/Event.java
@@ -0,0 +1 @@
+public class Event {}

diff --git a/tests/bugs153/pr145693/Monitor.aj b/tests/bugs153/pr145693/Monitor.aj
new file mode 100644 (file)
index 0000000..7e1f6ed
--- /dev/null
+++ b/tests/bugs153/pr145693/Monitor.aj
@@ -0,0 +1,13 @@
+public aspect Monitor {
+    public pointcut handleEvent(Event event):
+        execution(* handleEvent(Event, ..)) && args(event);
+    
+    public pointcut inHandleEvent(Event event): cflow(handleEvent(event));
+
+    before(Event event): 
+               set(* currentView) && 
+               inHandleEvent(event) {
+System.err.println("advice running");
+       }
+    
+}

diff --git a/tests/bugs153/pr145693/Sample.java b/tests/bugs153/pr145693/Sample.java
new file mode 100644 (file)
index 0000000..8f27ff7
--- /dev/null
+++ b/tests/bugs153/pr145693/Sample.java
@@ -0,0 +1,11 @@
+public class Sample {
+
+//    private 
+static Object currentView;
+
+    public static void main(String args[]) {
+System.err.println("method running");
+        currentView = "test";
+    }
+
+}

diff --git a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
index 87f10c52bdb7382fb35b77cc374a657a36fdecf9..69ca72beb82b7c2953eb3f7032bc708af3eb4aee 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java
@@ -33,7 +33,6 @@ public class Ajc152Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
 //  public void testSuperITDExplosion_pr134425() { runTest("super ITDs");}
 //  public void testMisbehavingDeclareAnnotation_pr135865() { runTest("misbehaving declare annotation");}
 //  public void testMisbehavingDeclareAnnotation_pr135865_2() { runTest("misbehaving declare annotation - 2");}
-//  public void testverifyErrNoTypeCflowField_pr145693() {runTest("verifyErrNoTypeCflowField");}
 //  public void testBrokenIfArgsCflowAtAj_pr145018() { runTest("ataj crashing with cflow, if and args");}
 //  public void testItdCallingGenericMethod_pr145391() { runTest("itd calling generic method");}
 //  public void testItdCallingGenericMethod_pr145391_2() { runTest("itd calling generic method - 2");}

diff --git a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
index 6fed5f9dba67c85f94a5818daa5ef410639437e3..bdd47d991458a6856b8267b702bbf2f548e8ba50 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
+++ b/tests/src/org/aspectj/systemtest/ajc152/ajc152.xml
@@ -91,12 +91,7 @@
       </run>
     </ajc-test>    
     
-    <ajc-test dir="bugs152/pr145693" title="verifyErrNoTypeCflowField">
-      <compile files="Event.java" outjar="cpath.jar"/>
-      <compile files="Monitor.aj" outjar="apath.jar" classpath="cpath.jar"/>
-      <compile files="Sample.java" options="-Xlint:ignore" aspectpath="apath.jar" outjar="run.jar"/>
-      <run class="Sample" classpath="run.jar,apath.jar"/>
-    </ajc-test>    
+
 
        <ajc-test dir="bugs152/pr145391" title="itd calling generic method">
      <compile files="GenericType.java" options="-1.5"/>