hps-java/src/test/java/org/lcsim/hps/conditions

diff -u -r1.2 -r1.3
--- ConditionsDriverTest.java	18 Oct 2013 06:29:59 -0000	1.2
+++ ConditionsDriverTest.java	18 Oct 2013 23:00:10 -0000	1.3
@@ -27,10 +27,18 @@

     /** Answer key for number of bad channels by run. */
     static Map<Integer,Integer> badChannelAnswerKey = new HashMap<Integer,Integer>();
     

-    /** Setup the bad channel answer key. */

+    /** Setup the bad channel answer key by run. */

     static {
        badChannelAnswerKey.put(1351, 441);

+       badChannelAnswerKey.put(1353, 473);
+       badChannelAnswerKey.put(1354, 474);
+       badChannelAnswerKey.put(1358, 344);
+       badChannelAnswerKey.put(1359, 468);
+       badChannelAnswerKey.put(1360, 468);

     }

+    
+    /** This is the number of bad channels in the QA set for all runs. */
+    static int BAD_CHANNELS_QA_ANSWER = 50;

 
     /**
      * Run the test.

@@ -76,10 +84,12 @@

                             ++badChannels;
                     }
                 }

-                System.out.println("found <" + badChannels + "> bad channels in run <" + currentRun + ">");

+                System.out.println("Run " + currentRun + " has " + badChannels + " SVT bad channels.");

                 Integer badChannelAnswer = badChannelAnswerKey.get(run);
                 if (badChannelAnswer != null) {
                     TestCase.assertEquals("Wrong number of bad channels found.", (int)badChannelAnswer, (int)badChannels);

+                } else {
+                    TestCase.assertEquals("Wrong number of bad channels found.", (int)BAD_CHANNELS_QA_ANSWER, (int)badChannels);

                 }
             }
         }