Wait longer for thread stop on timeout. Report now robust to unevaluated test results.

Author: jthywiss

BevoTest/src/edu/utexas/cs/bevotest/BevoTest.java

@@ -386,8 +386,9 @@ public Void run() {
                  */
                 testThreadGroup.stop();
             }
-            if (hasActiveUserThreads(testThreadGroup)) {
-                /* Give the stop a little time to propagate */
+            /* Give the stop time to propagate */
+            final long maxWait2 = System.currentTimeMillis() + 500L;
+            while (hasActiveUserThreads(testThreadGroup) && System.currentTimeMillis() < maxWait2) {
                 Thread.sleep(10L);
             }
             if (!testThreadGroup.isDestroyed()) {

BevoTest/src/edu/utexas/cs/bevotest/PlaintextTestReporter.java

@@ -167,9 +167,15 @@ public int[] get(final Object key) {
                         testedClasses.put(tic, describeClass(result.getTestItemClass(), true));
                     }
                     final int[] evals = testedClassEvals.get(tic);
-                    evals[result.getEvaluation().ordinal()]++;
+                    if (result.getEvaluation() != null) {
+                        evals[result.getEvaluation().ordinal()]++;
+                    }
+                }
+                if (result.getEvaluation() != null) {
+                    overallEvals[result.getEvaluation().ordinal()]++;
+                } else {
+                    System.err.println("BevoTest: WARNING: Test result without evaluation not counted. Test case description: "+result.getTestCase().getDescription());
                 }
-                overallEvals[result.getEvaluation().ordinal()]++;
             }
         }
         out.append("TEST SUMMARY").append(newLine);
@@ -320,7 +326,7 @@ public void reportEntry(final TestExecutionResult<?, ?> entry, final Appendable
             if (entry.getStatus() == Status.COMPLETE_NORMAL) {
                 out.append("   Test procedure run time: ").append(String.valueOf(entry.getRunTime())).append(" ms").append(newLine);
             }
-            out.append("   Evaluation:              ").append(entry.getEvaluation().toString()).append(newLine);
+            out.append("   Evaluation:              ").append(entry.getEvaluation()!=null?entry.getEvaluation().toString():"[unevaluated]").append(newLine);
         }
     }