aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraclement <aclement>2004-08-13 15:16:15 +0000
committeraclement <aclement>2004-08-13 15:16:15 +0000
commit0057fdbbfed77b761fc9d7bc6185d1d8a5587292 (patch)
treef54ba45479ed29ab1bd9451a43a21ce526104cce
parentfcdafdbddb66f4ce4046016132addd763353881c (diff)
downloadaspectj-0057fdbbfed77b761fc9d7bc6185d1d8a5587292.tar.gz
aspectj-0057fdbbfed77b761fc9d7bc6185d1d8a5587292.zip
Tests slightly reworked by matthew due to enhancement 71339
-rw-r--r--tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java10
-rw-r--r--tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml23
-rw-r--r--tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java4
-rw-r--r--tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml6
4 files changed, 22 insertions, 21 deletions
diff --git a/tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java b/tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java
index 84054333a..e38baa1da 100644
--- a/tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc120/Ajc120Tests.java
@@ -237,8 +237,16 @@ public class Ajc120Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
}
public void test054(){
- runTest("error message for constructor-execution pcd");
+ runTest("error message for constructor-execution pcd");
}
+ public void test055(){
+ runTest("weaving using an empty jar in -injars");
+ }
+
+ public void test056(){
+ runTest("weaving using an empty jar in -aspectpath");
+ }
+
}
diff --git a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
index 51f70134b..dbdddd93e 100644
--- a/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
+++ b/tests/src/org/aspectj/systemtest/ajc120/ajc120-tests.xml
@@ -396,16 +396,6 @@
<message kind="error" line="5"/>
</compile>
</ajc-test>
-
- <!-- this test unreliable - can't always delete sandbox afterwards, need to get
- to the bottom of why...
- <ajc-test dir="bugs" pr="43714"
- title="weaving from an input jar into that same jar.." >
- <compile files="notAJar.jar" outjar="notAJar.jar">
- <message kind="error" line="0"/>
- </compile>
- </ajc-test>
- -->
<ajc-test dir="bugs"
title="Private members introduced via an interface are visible to the class"
@@ -476,3 +466,16 @@
</compile>
</ajc-test>
+ <ajc-test dir="bugs" pr="43714"
+ title="weaving using an empty jar in -injars" >
+ <compile files="notAJar.jar" outjar="outJar.jar">
+ <message kind="error" line="0"/>
+ </compile>
+ </ajc-test>
+
+ <ajc-test dir="bugs" pr="43714"
+ title="weaving using an empty jar in -aspectpath" >
+ <compile files="WeaveLocal.java" aspectpath="notAJar.jar" outjar="outJar.jar" >
+ </compile>
+ </ajc-test>
+ \ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java b/tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java
index 779bedec9..032b7ead8 100644
--- a/tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java
+++ b/tests/src/org/aspectj/systemtest/aspectpath/AspectPathTests.java
@@ -108,9 +108,5 @@ public class AspectPathTests extends org.aspectj.testing.XMLBasedAjcTestCase {
runTest("Introduced abstract method on interface not implemented by subtype (aspectpath)");
}
- public void test022(){
- runTest("weaving from an aspectpath jar into that same jar..");
- }
-
}
diff --git a/tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml b/tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
index 9be3b32d3..bb5bd265f 100644
--- a/tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
+++ b/tests/src/org/aspectj/systemtest/aspectpath/aspectpath-tests.xml
@@ -188,11 +188,5 @@
aspectpath="interface/jars/AandB.jar" />
<run class="C"/>
</ajc-test>
-
- <ajc-test dir="bugs" pr="43714"
- title="weaving from an aspectpath jar into that same jar.." >
- <compile files="WeaveLocal.java" aspectpath="notAJar.jar" outjar="notAJar.jar" >
- </compile>
- </ajc-test>