From: aclement Date: Wed, 26 Jul 2006 20:18:45 +0000 (+0000) Subject: doh! uses api that isnt there yet... X-Git-Tag: PRE_PIPELINE~10 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ccc044ffa26735e89eb697a393757e178991b72d;p=aspectj.git doh! uses api that isnt there yet... --- diff --git a/tests/src/org/aspectj/systemtest/ajc153/PipeliningTests.java b/tests/src/org/aspectj/systemtest/ajc153/PipeliningTests.java index 5da2dc836..f74a66c12 100644 --- a/tests/src/org/aspectj/systemtest/ajc153/PipeliningTests.java +++ b/tests/src/org/aspectj/systemtest/ajc153/PipeliningTests.java @@ -14,7 +14,7 @@ import java.io.File; import junit.framework.Test; -import org.aspectj.ajdt.internal.compiler.AjCompilerAdapter; +import org.aspectj.ajdt.internal.compiler.AjPipeliningCompilerAdapter; import org.aspectj.testing.XMLBasedAjcTestCase; /** @@ -47,28 +47,28 @@ public class PipeliningTests extends org.aspectj.testing.XMLBasedAjcTestCase { public void testAspectExtendsClass() { runTest("aspect extends class"); } // verifying the type sorting - public void testRecognizingAnnotationStyleAspects1() { - AjCompilerAdapter.pipelineTesting=true; + /*public void testRecognizingAnnotationStyleAspects1() { + AjPipeliningCompilerAdapter.pipelineTesting=true; runTest("recognizing annotation style aspects - 1"); - String filesContainingAspects = AjCompilerAdapter.getPipelineDebugOutput("filesContainingAspects"); + String filesContainingAspects = AjPipeliningCompilerAdapter.getPipelineDebugOutput("filesContainingAspects"); assertTrue("Should be one file containing aspects but it thinks there are "+filesContainingAspects,filesContainingAspects.equals("1")); - String weaveOrder = AjCompilerAdapter.getPipelineDebugOutput("weaveOrder"); + String weaveOrder = AjPipeliningCompilerAdapter.getPipelineDebugOutput("weaveOrder"); String expectedOrder="[AtAJAspect.java,ClassOne.java]"; assertTrue("Expected weaving order to be "+expectedOrder+" but was "+weaveOrder,weaveOrder.equals(expectedOrder)); - } + } public void testRecognizingAnnotationStyleAspects2() { - AjCompilerAdapter.pipelineTesting=true; + AjPipeliningCompilerAdapter.pipelineTesting=true; runTest("recognizing annotation style aspects - 2"); - String filesContainingAspects = AjCompilerAdapter.getPipelineDebugOutput("filesContainingAspects"); + String filesContainingAspects = AjPipeliningCompilerAdapter.getPipelineDebugOutput("filesContainingAspects"); assertTrue("Should be one file containing aspects but it thinks there are "+filesContainingAspects,filesContainingAspects.equals("1")); - String weaveOrder = AjCompilerAdapter.getPipelineDebugOutput("weaveOrder"); + String weaveOrder = AjPipeliningCompilerAdapter.getPipelineDebugOutput("weaveOrder"); String expectedOrder="[AtInnerAJAspect.java,ClassOne.java]"; assertTrue("Expected weaving order to be "+expectedOrder+" but was "+weaveOrder,weaveOrder.equals(expectedOrder)); - } + }*/ // verifying the new code for transforming Eclipse Annotations into AspectJ ones public void testAnnotationTransformation() { runTest("annotation transformation"); } @@ -76,7 +76,7 @@ public class PipeliningTests extends org.aspectj.testing.XMLBasedAjcTestCase { // -- protected void tearDown() throws Exception { super.tearDown(); - AjCompilerAdapter.pipelineTesting=false; + //AjPipeliningCompilerAdapter.pipelineTesting=false; } public static Test suite() { return XMLBasedAjcTestCase.loadSuite(PipeliningTests.class);