eclipse: testcode: redundant null check

diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
index 817ddc06699378ac1b3688fe8264af9e3f535b35..db36be452f6e56608e0abc1d693c6504f47e464b 100644 (file)
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/CoverageTestCase.java
@@ -625,7 +625,7 @@ public class CoverageTestCase extends AjdocTestCase {
                
                // get the html file for the enclosing class
         File htmlFileClass = new File(getAbsolutePathOutdir() + "/PkgVisibleClass.html");
-               if (htmlFileClass == null || !htmlFileClass.exists()) {
+               if (!htmlFileClass.exists()) {
                        fail("couldn't find " + htmlFileClass.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 f00a9b10f06749dcb7de3a9e3ecf8dd40e88d790..652d1a5e739a2216878e9395f88a83623f3a4bbf 100644 (file)
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/DeclareFormsTest.java
@@ -234,7 +234,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?");
                }
@@ -375,7 +375,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?");
                }

diff --git a/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java b/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java
index 2c61bc6e825a7431ad4ea76da07df7d72eb28a80..899782d8886382f4e0d1b018494ff379746b8918 100644 (file)
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/ITDTest.java
@@ -79,7 +79,7 @@ public class ITDTest extends AjdocTestCase {
 
                // Check the contents of C.html
                File htmlC = new File(getAbsolutePathOutdir() + "/pack/C.html");
-               if (htmlC == null || !htmlC.exists()) {
+               if (!htmlC.exists()) {
                        fail("couldn't find " + getAbsolutePathOutdir()
                                        + "/pack/C.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 6c5c47905f2cebaca624f86198913533493e5c60..b3544d56333eab8575269deb238f77f719f00df8 100644 (file)
--- a/ajdoc/testsrc/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java
+++ b/ajdoc/testsrc/org/aspectj/tools/ajdoc/PointcutVisibilityTest.java
@@ -33,7 +33,7 @@ public class PointcutVisibilityTest extends AjdocTestCase {
         // private one (since "public" 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
@@ -58,7 +58,7 @@ public class PointcutVisibilityTest extends AjdocTestCase {
         // private one (since "protected" 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