From b4592485d2358cffe07e9fab6578e8764734dd44 Mon Sep 17 00:00:00 2001 From: Andy Clement Date: Wed, 30 Apr 2014 15:17:14 -0700 Subject: Fix 433744: default methods and itds --- org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip | Bin 4376888 -> 4376894 bytes org.eclipse.jdt.core/jdtcore-for-aspectj.jar | Bin 8107822 -> 8120142 bytes tests/bugs181/433744/AnIterator.java | 18 ++++++++++ tests/src/org/aspectj/systemtest/AllTests18.java | 4 ++- .../org/aspectj/systemtest/ajc181/Ajc181Tests.java | 39 +++++++++++++++++++++ .../systemtest/ajc181/AllTestsAspectJ181.java | 25 +++++++++++++ tests/src/org/aspectj/systemtest/ajc181/ajc181.xml | 9 +++++ 7 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 tests/bugs181/433744/AnIterator.java create mode 100644 tests/src/org/aspectj/systemtest/ajc181/Ajc181Tests.java create mode 100644 tests/src/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java create mode 100644 tests/src/org/aspectj/systemtest/ajc181/ajc181.xml diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip index c834a0d0e..f8c826649 100644 Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar index 0cb7ece85..afddbe647 100644 Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ diff --git a/tests/bugs181/433744/AnIterator.java b/tests/bugs181/433744/AnIterator.java new file mode 100644 index 000000000..8dcf48463 --- /dev/null +++ b/tests/bugs181/433744/AnIterator.java @@ -0,0 +1,18 @@ +import java.util.Iterator; + +public class AnIterator implements Iterator { + @Override + public boolean hasNext() { + return false; + } + + @Override + public Object next() { + throw new IllegalStateException(); + } + + @Override + public void remove() { + throw new UnsupportedOperationException(); + } +} diff --git a/tests/src/org/aspectj/systemtest/AllTests18.java b/tests/src/org/aspectj/systemtest/AllTests18.java index 95b438048..ac1d9d6b5 100644 --- a/tests/src/org/aspectj/systemtest/AllTests18.java +++ b/tests/src/org/aspectj/systemtest/AllTests18.java @@ -14,12 +14,14 @@ import junit.framework.Test; import junit.framework.TestSuite; import org.aspectj.systemtest.ajc180.AllTestsAspectJ180; +import org.aspectj.systemtest.ajc181.AllTestsAspectJ181; public class AllTests18 { public static Test suite() { TestSuite suite = new TestSuite("AspectJ System Test Suite - 1.8"); - // $JUnit-BEGIN$ + // $JUnit-BEGIN$ + suite.addTest(AllTestsAspectJ181.suite()); suite.addTest(AllTestsAspectJ180.suite()); suite.addTest(AllTests17.suite()); suite.addTest(AllTests16.suite()); diff --git a/tests/src/org/aspectj/systemtest/ajc181/Ajc181Tests.java b/tests/src/org/aspectj/systemtest/ajc181/Ajc181Tests.java new file mode 100644 index 000000000..c4737e945 --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc181/Ajc181Tests.java @@ -0,0 +1,39 @@ +/******************************************************************************* + * Copyright (c) 2014 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.ajc181; + +import java.io.File; + +import junit.framework.Test; + +import org.aspectj.testing.XMLBasedAjcTestCase; + +/** + * @author Andy Clement + */ +public class Ajc181Tests extends org.aspectj.testing.XMLBasedAjcTestCase { + + public void testDefaultMethods_433744() { + runTest("default methods"); + } + + // --- + + public static Test suite() { + return XMLBasedAjcTestCase.loadSuite(Ajc181Tests.class); + } + + @Override + protected File getSpecFile() { + return new File("../tests/src/org/aspectj/systemtest/ajc181/ajc181.xml"); + } + +} diff --git a/tests/src/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java b/tests/src/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java new file mode 100644 index 000000000..f06fccc32 --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc181/AllTestsAspectJ181.java @@ -0,0 +1,25 @@ +/******************************************************************************* + * Copyright (c) 2014 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.ajc181; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AllTestsAspectJ181 { + + public static Test suite() { + TestSuite suite = new TestSuite("AspectJ 1.8.1 tests"); + // $JUnit-BEGIN$ + suite.addTest(Ajc181Tests.suite()); + // $JUnit-END$ + return suite; + } +} diff --git a/tests/src/org/aspectj/systemtest/ajc181/ajc181.xml b/tests/src/org/aspectj/systemtest/ajc181/ajc181.xml new file mode 100644 index 000000000..67646093b --- /dev/null +++ b/tests/src/org/aspectj/systemtest/ajc181/ajc181.xml @@ -0,0 +1,9 @@ + + + + + + + + + -- cgit v1.2.3