From 1de0ef98b813eb8a4f539d9eb94909fda84598ce Mon Sep 17 00:00:00 2001 From: aclement Date: Fri, 22 Aug 2008 17:10:00 +0000 Subject: [PATCH] removed unnecessary code --- .../org/aspectj/tools/ajdoc/BugTests.java | 8 ++-- .../aspectj/tools/ajdoc/CoverageTestCase.java | 44 +++++++++---------- .../aspectj/tools/ajdoc/DeclareFormsTest.java | 26 +++++------ .../ajdoc/FullyQualifiedArgumentTest.java | 2 +- .../org/aspectj/tools/ajdoc/ITDTest.java | 2 +- .../tools/ajdoc/PointcutVisibilityTest.java | 2 +- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java index c36852c6d..a1fdc0498 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/BugTests.java @@ -22,7 +22,7 @@ public class BugTests extends AjdocTestCase { runAjdoc(files); assertFalse("expected clean build of project but found that build aborted",Main.hasAborted()); File html = new File(getAbsolutePathOutdir() + File.separator + "C.html"); - if (html == null || !html.exists()) { + if (!html.exists()) { fail("couldn't find " + getAbsolutePathOutdir() + File.separator + "C.html - were there javadoc/compilation errors?"); } assertFalse("expected all decorating tags to be removed but found that they" + @@ -72,7 +72,7 @@ public class BugTests extends AjdocTestCase { runAjdoc(files,"1.5",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 == null || !html.exists()) { + if (!html.exists()) { fail("couldn't find " + getAbsolutePathOutdir() + File.separator + "C.html - were there javadoc/compilation errors?"); } assertTrue("expected to find 'Advised by' in the html output but did " + @@ -93,7 +93,7 @@ public class BugTests extends AjdocTestCase { runAjdoc(files,"1.5",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 == null || !html.exists()) { + if (!html.exists()) { fail("couldn't find " + getAbsolutePathOutdir() + File.separator + "C.html - were there javadoc/compilation errors?"); } assertTrue("expected to find 'Advised by' in the html output but did " + @@ -103,7 +103,7 @@ public class BugTests extends AjdocTestCase { + "META-INF" + File.separator + "aop-ajc.xml"); assertTrue("couldn't find " + getAbsolutePathOutdir() + File.separator + "META-INF" + File.separator + "aop-ajc.xml" , - aopFile != null && aopFile.exists()); + aopFile.exists()); } /** diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java index 40e3f5707..817ddc066 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java @@ -64,7 +64,7 @@ public class CoverageTestCase extends AjdocTestCase { " the 'public' flag to ajdoc",htmlFile.exists()); htmlFile = new File(getAbsolutePathOutdir() + "/foo/PlainJava.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -88,7 +88,7 @@ public class CoverageTestCase extends AjdocTestCase { File[] files = {new File(getAbsoluteProjectDir() + "/pkg/A.aj")}; runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/A.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath()+ " - were there compilation errors?"); } assertTrue(htmlFile.getAbsolutePath() + " should have Aspect A as it's title", @@ -102,7 +102,7 @@ public class CoverageTestCase extends AjdocTestCase { File[] files = {new File(getAbsoluteProjectDir() + "/pkg/C.java")}; runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/C.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath()+ " - were there compilation errors?"); } assertTrue(htmlFile.getAbsolutePath() + " should have Class C as it's title", @@ -119,7 +119,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/ClassA.InnerAspect.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -137,7 +137,7 @@ public class CoverageTestCase extends AjdocTestCase { // get the html file for the enclosing class File htmlFileClass = new File(getAbsolutePathOutdir() + "/foo/ClassA.html"); - if (htmlFileClass == null || !htmlFileClass.exists()) { + if (!htmlFileClass.exists()) { fail("couldn't find " + htmlFileClass.getAbsolutePath() + " - were there compilation errors?"); } @@ -163,7 +163,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdviceNamingCoverage.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -195,7 +195,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdvisesRelationshipCoverage.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -248,7 +248,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -279,7 +279,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -310,7 +310,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -341,7 +341,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -372,7 +372,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -403,7 +403,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -452,7 +452,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -480,7 +480,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -501,7 +501,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -532,7 +532,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/C2.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -578,7 +578,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/AdvisesRelationshipCoverage.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -607,7 +607,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/PkgVisibleClass.NestedAspect.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -653,7 +653,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.NestedAspect.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -699,7 +699,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.NestedAspect.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -730,7 +730,7 @@ public class CoverageTestCase extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/pkg/ClassWithNestedAspect.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java index cbdce2b26..f00a9b10f 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java @@ -50,7 +50,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -85,7 +85,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -117,7 +117,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Main2.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -149,7 +149,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point2.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -180,7 +180,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareCoverage2.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -211,7 +211,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Point2.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -265,7 +265,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Main2.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -299,7 +299,7 @@ public class DeclareFormsTest extends AjdocTestCase { // detail and summary the declare annotation statement. // Check for this.... File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareAtType.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -342,7 +342,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.5",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -409,7 +409,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.5",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -443,7 +443,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.5",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -466,7 +466,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/C.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } @@ -512,7 +512,7 @@ public class DeclareFormsTest extends AjdocTestCase { runAjdoc("private","1.4",files); File htmlFile = new File(getAbsolutePathOutdir() + "/foo/DeclareParents.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java index 875ba367c..2d97a82bf 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/FullyQualifiedArgumentTest.java @@ -27,7 +27,7 @@ public class FullyQualifiedArgumentTest extends AjdocTestCase { // check the contents of A.html File htmlA = new File(getAbsolutePathOutdir() + "/pack/A.html"); - if (htmlA == null || !htmlA.exists()) { + if (!htmlA.exists()) { fail("couldn't find " + getAbsolutePathOutdir() + "/pack/A.html - were there compilation errors?"); } diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java index 849718e04..2c61bc6e8 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java @@ -26,7 +26,7 @@ public class ITDTest extends AjdocTestCase { }; runAjdoc("private",files); File htmlA = new File(getAbsolutePathOutdir() + "/pack/A.html"); - if (htmlA == null || !htmlA.exists()) { + if (!htmlA.exists()) { fail("couldn't find " + getAbsolutePathOutdir() + "/pack/A.html - were there compilation errors?"); } diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java index dbd7442ff..6c5c47905 100644 --- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java +++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java @@ -83,7 +83,7 @@ public class PointcutVisibilityTest extends AjdocTestCase { // (since "private" was an argument) // Check that this is the case...... File htmlFile = new File(getAbsolutePathOutdir() + "/foo/Pointcuts.html"); - if (htmlFile == null || !htmlFile.exists()) { + if (!htmlFile.exists()) { fail("couldn't find " + htmlFile.getAbsolutePath() + " - were there compilation errors?"); } // check the contents of the pointcut summary -- 2.39.5