Fixing more review comments.

Author: krmahadevan

src/main/java/org/testng/TestNG.java

@@ -143,12 +143,9 @@ public class TestNG {
   private final Map<Class<? extends IReporter>, IReporter> m_reporters = Maps.newHashMap();
   private final Map<Class<? extends IDataProviderListener>, IDataProviderListener> m_dataProviderListeners = Maps.newHashMap();
 
-  protected static final int HAS_NO_TEST = 8;
 
   public static final Integer DEFAULT_VERBOSE = 1;
 
-  private boolean m_hasTests= false;
-
   // Command line suite parameters
   private int m_threadCount = -1;
   private XmlSuite.ParallelMode m_parallelMode = null;
@@ -210,10 +207,10 @@ private void init(boolean useDefaultListeners) {
   }
 
   public int getStatus() {
-    if (m_hasTests) {
-      return exitCode.getExitCode();
+    if (!exitCodeListener.hasTests()) {
+      return ExitCode.HAS_NO_TEST;
     }
-    return HAS_NO_TEST;
+    return exitCode.getExitCode();
   }
 
   /**
@@ -1154,10 +1151,9 @@ public void run() {
     }
 
     runExecutionListeners(false /* finish */);
-    m_hasTests = this.exitCodeListener.hasTests();
     exitCode = this.exitCodeListener.getStatus();
 
-    if(!m_hasTests) {
+    if(!exitCodeListener.hasTests()) {
       if (TestRunner.getVerbose() > 1) {
         System.err.println("[TestNG] No tests found. Nothing was run");
         usage();
@@ -1243,7 +1239,6 @@ private void generateReports(List<ISuite> suiteRunners) {
    */
   public List<ISuite> runSuitesLocally() {
     if (m_suites.isEmpty()) {
-      this.m_hasTests = false;
       error("No test suite found. Nothing to run");
       usage();
       return Collections.emptyList();
@@ -2005,7 +2000,6 @@ public void onTestStart(ITestResult result) {
     }
 
     private void setHasRunTests() {
-      m_mainRunner.m_hasTests= true;
     }
 
     /**

src/main/java/org/testng/TestNGAntTask.java

@@ -722,10 +722,10 @@ private void ppp(String string) {
   protected void actOnResult(int exitValue, boolean wasKilled) {
     if(exitValue == -1) {
       executeHaltTarget(exitValue);
-      throw new BuildException("an error occured when running TestNG tests");
+      throw new BuildException("an error occurred when running TestNG tests");
     }
 
-    if((exitValue & TestNG.HAS_NO_TEST) == TestNG.HAS_NO_TEST) {
+    if((exitValue & ExitCode.HAS_NO_TEST) == ExitCode.HAS_NO_TEST) {
       if(m_haltOnFailure) {
         executeHaltTarget(exitValue);
         throw new BuildException("No tests were run");

src/main/java/org/testng/internal/ExitCode.java

@@ -21,26 +21,32 @@
  */
 public class ExitCode {
 
+    public static final int HAS_NO_TEST = 8;
+    private static final int FAILED_WITHIN_SUCCESS = 4;
+    private static final int SKIPPED = 2;
+    private static final int FAILED = 1;
+    private static final int SIZE = 3;
+
     private final BitSet exitCodeBits;
 
     ExitCode() {
-        this(new BitSet(3));
+        this(new BitSet(SIZE));
     }
 
     public static boolean hasFailureWithinSuccessPercentage(int returnCode) {
-        return (returnCode >= 4 && returnCode <= 7);
+        return (returnCode & FAILED_WITHIN_SUCCESS) == FAILED_WITHIN_SUCCESS;
     }
 
     public static boolean hasSkipped(int returnCode) {
-        return (returnCode == 2 || returnCode == 3 || returnCode == 6 || returnCode == 7);
+        return (returnCode & SKIPPED) == SKIPPED;
     }
 
     public static boolean hasFailure(int returnCode) {
-        return (returnCode == 1 || returnCode == 3);
+        return (returnCode & FAILED) == FAILED;
     }
 
     public static ExitCode newExitCodeRepresentingFailure() {
-        BitSet bitSet = new BitSet(3);
+        BitSet bitSet = new BitSet(SIZE);
         bitSet.set(0, true);
         bitSet.set(1, false);
         bitSet.set(2, false);

src/main/java/org/testng/internal/ExitCodeListener.java

@@ -12,7 +12,7 @@
 
 public class ExitCodeListener implements ITestListener, IReporter {
     private boolean hasTests = false;
-    private ExitCode status = new ExitCode();
+    private final ExitCode status = new ExitCode();
 
     public ExitCode getStatus() {
         return status;