From a36fdb2e631cedbc42ef1ad00a712900dc1d38c1 Mon Sep 17 00:00:00 2001 From: aclement Date: Thu, 8 Oct 2009 21:29:00 +0000 Subject: [PATCH] 288064: innerclass attribute usage --- tests/bugs167/pr288064/Aspect.java | 7 ++++ tests/bugs167/pr288064/Main.java | 8 ++++ tests/bugs167/pr288064/Outer.java | 8 ++++ tests/bugs167/pr288064/aop.xml | 5 +++ .../org/aspectj/systemtest/AllTests16.java | 2 + .../systemtest/ajc166/AllTestsAspectJ166.java | 2 +- .../systemtest/ajc167/Ajc167Tests.java | 39 +++++++++++++++++++ .../systemtest/ajc167/AllTestsAspectJ167.java | 25 ++++++++++++ .../org/aspectj/systemtest/ajc167/ajc167.xml | 26 +++++++++++++ 9 files changed, 121 insertions(+), 1 deletion(-) create mode 100644 tests/bugs167/pr288064/Aspect.java create mode 100644 tests/bugs167/pr288064/Main.java create mode 100644 tests/bugs167/pr288064/Outer.java create mode 100644 tests/bugs167/pr288064/aop.xml create mode 100644 tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java create mode 100644 tests/src/org/aspectj/systemtest/ajc167/AllTestsAspectJ167.java create mode 100644 tests/src/org/aspectj/systemtest/ajc167/ajc167.xml diff --git a/tests/bugs167/pr288064/Aspect.java b/tests/bugs167/pr288064/Aspect.java new file mode 100644 index 000000000..4e1f1a06a --- /dev/null +++ b/tests/bugs167/pr288064/Aspect.java @@ -0,0 +1,7 @@ +package test; +aspect Aspect { + before() : call(void test..*(..)) { + System.out.println("advice"); + } +} + diff --git a/tests/bugs167/pr288064/Main.java b/tests/bugs167/pr288064/Main.java new file mode 100644 index 000000000..f5d301000 --- /dev/null +++ b/tests/bugs167/pr288064/Main.java @@ -0,0 +1,8 @@ +package test; +public class Main { + public static void main(String[] args){ + Outer.Inner$1 inner = new Outer.Inner$1(); + inner.innerMethod(1); + } +} + diff --git a/tests/bugs167/pr288064/Outer.java b/tests/bugs167/pr288064/Outer.java new file mode 100644 index 000000000..8f58206ba --- /dev/null +++ b/tests/bugs167/pr288064/Outer.java @@ -0,0 +1,8 @@ +package test; +public class Outer { + public static class Inner$1 { + void innerMethod(T arg){ + System.out.println("method"); + } + } +} diff --git a/tests/bugs167/pr288064/aop.xml b/tests/bugs167/pr288064/aop.xml new file mode 100644 index 000000000..4787e0883 --- /dev/null +++ b/tests/bugs167/pr288064/aop.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/tests/src/org/aspectj/systemtest/AllTests16.java b/tests/src/org/aspectj/systemtest/AllTests16.java index c2f968b1c..56a84c49c 100644 --- a/tests/src/org/aspectj/systemtest/AllTests16.java +++ b/tests/src/org/aspectj/systemtest/AllTests16.java @@ -13,6 +13,7 @@ import org.aspectj.systemtest.ajc163.AllTestsAspectJ163; import org.aspectj.systemtest.ajc164.AllTestsAspectJ164; import org.aspectj.systemtest.ajc165.AllTestsAspectJ165; import org.aspectj.systemtest.ajc166.AllTestsAspectJ166; +import org.aspectj.systemtest.ajc167.AllTestsAspectJ167; public class AllTests16 { @@ -27,6 +28,7 @@ public class AllTests16 { suite.addTest(AllTestsAspectJ164.suite()); suite.addTest(AllTestsAspectJ165.suite()); suite.addTest(AllTestsAspectJ166.suite()); + suite.addTest(AllTestsAspectJ167.suite()); suite.addTest(AllTests15.suite()); // $JUnit-END$ return suite; diff --git a/tests/src/org/aspectj/systemtest/ajc166/AllTestsAspectJ166.java b/tests/src/org/aspectj/systemtest/ajc166/AllTestsAspectJ166.java index 417b6ec3d..d15a59c0f 100644 --- a/tests/src/org/aspectj/systemtest/ajc166/AllTestsAspectJ166.java +++ b/tests/src/org/aspectj/systemtest/ajc166/AllTestsAspectJ166.java @@ -16,7 +16,7 @@ import junit.framework.TestSuite; public class AllTestsAspectJ166 { public static Test suite() { - TestSuite suite = new TestSuite("AspectJ 1.6.5 tests"); + TestSuite suite = new TestSuite("AspectJ 1.6.6 tests"); // $JUnit-BEGIN$ suite.addTest(Ajc166Tests.suite()); // $JUnit-END$ diff --git a/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java new file mode 100644 index 000000000..54c81d216 --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc167/Ajc167Tests.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2008 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andy Clement - initial API and implementation + *******************************************************************************/ +package org.aspectj.systemtest.ajc167; + +import java.io.File; + +import junit.framework.Test; + +import org.aspectj.testing.XMLBasedAjcTestCase; + +public class Ajc167Tests extends org.aspectj.testing.XMLBasedAjcTestCase { + + public void testScalaOuterClassNames_pr288064() { + runTest("outer class names - scala"); + } + + public void testScalaOuterClassNames_pr288064_ltw() { + runTest("outer class names - scala - ltw"); + } + + // --- + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Ajc167Tests.class); + } + + protected File getSpecFile() { + return new File("../tests/src/org/aspectj/systemtest/ajc167/ajc167.xml"); + } + +} \ No newline at end of file diff --git a/tests/src/org/aspectj/systemtest/ajc167/AllTestsAspectJ167.java b/tests/src/org/aspectj/systemtest/ajc167/AllTestsAspectJ167.java new file mode 100644 index 000000000..e8f887009 --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc167/AllTestsAspectJ167.java @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2008 Contributors + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Andy Clement - initial API and implementation + *******************************************************************************/ +package org.aspectj.systemtest.ajc167; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AllTestsAspectJ167 { + + public static Test suite() { + TestSuite suite = new TestSuite("AspectJ 1.6.7 tests"); + // $JUnit-BEGIN$ + suite.addTest(Ajc167Tests.suite()); + // $JUnit-END$ + return suite; + } +} diff --git a/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml b/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml new file mode 100644 index 000000000..e4469113d --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc167/ajc167.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- 2.39.5