From 8d74e6f01acd609c61db17449767808451566fe4 Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Wed, 5 Jul 2006 12:46:40 +0000
Subject: [PATCH] moved tests to 153

---
 tests/{bugs152 => bugs153}/pr145693/Event.java           | 0
 tests/{bugs152 => bugs153}/pr145693/Monitor.aj           | 1 +
 tests/{bugs152 => bugs153}/pr145693/Sample.java          | 4 +++-
 tests/src/org/aspectj/systemtest/ajc152/Ajc152Tests.java | 1 -
 tests/src/org/aspectj/systemtest/ajc152/ajc152.xml       | 7 +------
 5 files changed, 5 insertions(+), 8 deletions(-)
 rename tests/{bugs152 => bugs153}/pr145693/Event.java (100%)
 rename tests/{bugs152 => bugs153}/pr145693/Monitor.aj (88%)
 rename tests/{bugs152 => bugs153}/pr145693/Sample.java (57%)

diff --git a/tests/bugs152/pr145693/Event.java b/tests/bugs153/pr145693/Event.java
similarity index 100%
rename from tests/bugs152/pr145693/Event.java
rename to tests/bugs153/pr145693/Event.java
diff --git a/tests/bugs152/pr145693/Monitor.aj b/tests/bugs153/pr145693/Monitor.aj
similarity index 88%
rename from tests/bugs152/pr145693/Monitor.aj
rename to tests/bugs153/pr145693/Monitor.aj
index 51b37855a..7e1f6ed61 100644
--- a/tests/bugs152/pr145693/Monitor.aj
+++ b/tests/bugs153/pr145693/Monitor.aj
@@ -7,6 +7,7 @@ public aspect Monitor {
     before(Event event): 
     		set(* currentView) && 
     		inHandleEvent(event) {
+System.err.println("advice running");
 	}
     
 }
diff --git a/tests/bugs152/pr145693/Sample.java b/tests/bugs153/pr145693/Sample.java
similarity index 57%
rename from tests/bugs152/pr145693/Sample.java
rename to tests/bugs153/pr145693/Sample.java
index 50f9cb334..8f27ff78d 100644
--- a/tests/bugs152/pr145693/Sample.java
+++ b/tests/bugs153/pr145693/Sample.java
@@ -1,8 +1,10 @@
 public class Sample {
 
-    private static Object currentView;
+//    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 87f10c52b..69ca72beb 100644
--- 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 6fed5f9db..bdd47d991 100644
--- 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"/>
-- 
2.39.5