diff options
Diffstat (limited to 'ajdoc')
4 files changed, 56 insertions, 44 deletions
diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java index d75f8cb64..afe288a3b 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/AjdocTestCase.java @@ -160,8 +160,14 @@ public class AjdocTestCase extends TestCase { if (inputFiles.length == 0) { fail("need to pass some files into ajdoc"); } - if (!sourceLevel.equals("1.3") && !sourceLevel.equals("1.4") && !sourceLevel.equals("1.5")) { - fail("need to pass ajdoc '1.3', '1.4', or '1.5' as the source level"); + if (!sourceLevel.equals("1.3") && + !sourceLevel.equals("1.4") && + !sourceLevel.equals("1.5") && + !sourceLevel.equals("1.6") && + !sourceLevel.equals("1.7") && + !sourceLevel.equals("1.8") && + !sourceLevel.equals("1.9")) { + fail("need to pass ajdoc '1.3' > '1.9' as the source level"); } String[] args = new String[6 + inputFiles.length + ajOptions.length]; args[0] = "-source"; @@ -186,8 +192,14 @@ public class AjdocTestCase extends TestCase { if (!visibility.equals("public") && !visibility.equals("protected") && !visibility.equals("private")) { fail("need to pass 'public','protected' or 'private' visibility to ajdoc"); } - if (!sourceLevel.equals("1.3") && !sourceLevel.equals("1.4") && !sourceLevel.equals("1.5")) { - fail("need to pass ajdoc '1.3', '1.4', or '1.5' as the source level"); + if (!sourceLevel.equals("1.3") && + !sourceLevel.equals("1.4") && + !sourceLevel.equals("1.5") && + !sourceLevel.equals("1.6") && + !sourceLevel.equals("1.7") && + !sourceLevel.equals("1.8") && + !sourceLevel.equals("1.9")) { + fail("need to pass ajdoc '1.3' > '1.9' as the source level"); } if (inputFiles.length == 0) { fail("need to pass some files into ajdoc"); diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java index 647b71b22..163774864 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java @@ -69,7 +69,7 @@ public class BugTests extends AjdocTestCase { initialiseProject("pr148906"); File[] files = {new File(getAbsoluteProjectDir() + "/C.java")}; String[] ajOptions = {new String("-aspectpath"), new String(getAbsoluteProjectDir() + File.separator + "simple.jar")}; - runAjdoc(files,"1.5",ajOptions); + runAjdoc(files,"1.6",ajOptions); assertFalse("expected clean build of project but found that build aborted",Main.hasAborted()); File html = new File(getAbsolutePathOutdir() + File.separator + "C.html"); if (!html.exists()) { @@ -90,7 +90,7 @@ public class BugTests extends AjdocTestCase { initialiseProject("pr148906"); File[] files = {new File(getAbsoluteProjectDir() + "/C.java")}; String[] ajOptions = {new String("-outxml"),new String("-aspectpath"), new String(getAbsoluteProjectDir() + File.separator + "simple.jar")}; - runAjdoc(files,"1.5",ajOptions); + runAjdoc(files,"1.6",ajOptions); assertFalse("expected clean build of project but found that build aborted",Main.hasAborted()); File html = new File(getAbsolutePathOutdir() + File.separator + "C.html"); if (!html.exists()) { diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java index 144b4e478..70aa02b22 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java @@ -55,7 +55,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testCoveragePublicMode() throws Exception { File[] files = {file3,file9}; - runAjdoc("public","1.4",files); + runAjdoc("public","1.6",files); // have passed the "public" modifier as well as // one public and one package visible class. There @@ -87,7 +87,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAJdocHasAspectTitle() throws Exception { File[] files = {new File(getAbsoluteProjectDir() + "/pkg/A.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/A.html"); if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath()+ " - were there compilation errors?"); @@ -101,7 +101,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAJdocHasClassTitle() throws Exception { File[] files = {new File(getAbsoluteProjectDir() + "/pkg/C.java")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/C.html"); if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath()+ " - were there compilation errors?"); @@ -117,7 +117,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testInnerAspect() throws Exception { File[] files = {file1, file2}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/ClassA.InnerAspect.html"); if (!htmlFile.exists()) { @@ -205,7 +205,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdviceNamingCoverage() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdviceNamingCoverage.html"); if (!htmlFile.exists()) { @@ -237,7 +237,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisesRelationshipCoverage() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdvisesRelationshipCoverage.html"); if (!htmlFile.exists()) { @@ -290,7 +290,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByMethodExecution() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -321,7 +321,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByConstructorExecution() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -352,7 +352,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByMethodCall() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -383,7 +383,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByConstructorCall() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -414,7 +414,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByGet() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -445,7 +445,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedBySet() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -494,7 +494,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByInitialization() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -522,7 +522,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByStaticInitialization() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -543,7 +543,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByHandler() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); if (!htmlFile.exists()) { @@ -581,7 +581,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testTwoBeforeAdvice() throws Exception { File[] files = {new File(getAbsoluteProjectDir() + "/pkg/A2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/C2.html"); if (!htmlFile.exists()) { @@ -627,7 +627,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testNoSpuriousAdvisedByRels() throws Exception { File[] files = {file4}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdvisesRelationshipCoverage.html"); if (!htmlFile.exists()) { @@ -646,7 +646,7 @@ public class CoverageTestCase extends AjdocTestCase { public void testCoverage() { File[] files = {aspect1,file0,file1,file2,file3,file4,file5,file6, file7,file8,file9,file10}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); } /** @@ -656,7 +656,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testNestedAspect() throws Exception { File[] files = {file9}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/PkgVisibleClass.NestedAspect.html"); if (!htmlFile.exists()) { @@ -738,7 +738,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testNestedAspectWithSimilarName() throws Exception { File[] files = {new File(getAbsoluteProjectDir() + "/pkg/ClassWithNestedAspect.java")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.NestedAspect.html"); if (!htmlFile.exists()) { @@ -819,7 +819,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdviceInNestedAspect() throws Exception { File[] files = {new File(getAbsoluteProjectDir() + "/pkg/ClassWithNestedAspect.java")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.NestedAspect.html"); if (!htmlFile.exists()) { @@ -850,7 +850,7 @@ public class CoverageTestCase extends AjdocTestCase { */ public void testAdvisedByInNestedAspect() throws Exception { File[] files = {new File(getAbsoluteProjectDir() + "/pkg/ClassWithNestedAspect.java")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.html"); if (!htmlFile.exists()) { diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java index fbb711bdc..130a43a9e 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java @@ -39,7 +39,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testCoverage() { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage.java")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); } /** @@ -49,7 +49,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testDeclareStatments() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html"); if (!htmlFile.exists()) { @@ -84,7 +84,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testDeclareWarning() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html"); if (!htmlFile.exists()) { @@ -116,7 +116,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testMatchesDeclareCall() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Main2.html"); if (!htmlFile.exists()) { @@ -149,7 +149,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testMatchesDeclareExecution() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point2.html"); if (!htmlFile.exists()) { @@ -180,7 +180,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testDeclareParents() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html"); if (!htmlFile.exists()) { @@ -211,7 +211,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testAspectDeclarations() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point2.html"); if (!htmlFile.exists()) { @@ -234,7 +234,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testDeclareSoft() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html"); if (!htmlFile.exists()) { @@ -265,7 +265,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testSoftenedBy() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareCoverage2.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Main2.html"); if (!htmlFile.exists()) { @@ -304,7 +304,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testDeclareAnnotation() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtType.aj")}; - runAjdoc("private","1.5",files); + runAjdoc("private","1.6",files); // Aspect AnnotationTest should contain within it's declare // detail and summary the declare annotation statement. @@ -350,7 +350,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testMethodAnnotatedBy() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtMethod.aj")}; - runAjdoc("private","1.5",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); if (!htmlFile.exists()) { @@ -383,7 +383,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testConstructorAnnotatedBy() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtConstructor.aj")}; - runAjdoc("private","1.5",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); if (!htmlFile.exists()) { @@ -417,7 +417,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testFieldAnnotatedBy() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtField.aj")}; - runAjdoc("private","1.5",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); if (!htmlFile.exists()) { @@ -451,7 +451,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testTypeAnnotatedBy() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareAtType.aj")}; - runAjdoc("private","1.5",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); if (!htmlFile.exists()) { @@ -474,7 +474,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testMatchesDeclareAndAdvisedBy() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "A.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); if (!htmlFile.exists()) { @@ -520,7 +520,7 @@ public class DeclareFormsTest extends AjdocTestCase { public void testTwoDeclareParents() throws Exception { initialiseProject("declareForms"); File[] files = {new File(getAbsoluteProjectDir() + File.separatorChar + "DeclareParents.aj")}; - runAjdoc("private","1.4",files); + runAjdoc("private","1.6",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareParents.html"); if (!htmlFile.exists()) { |