Changeset 4843

Timestamp:

Mar 25, 2009, 1:12:39 PM (15 years ago)

Author:

Nicklas Nordborg

Message:

References #1243: Fix TestBioAssaySetExporter? and include it in TestAll?

Fixes regular expressions so that they work with out without decimals for integers.

File:

• trunk/src/test/TestBioAsssaySetExporter.java (modified) (4 diffs)

trunk/src/test/TestBioAsssaySetExporter.java

@@ -529 +529 @@
           if (mergeReporters)
           {
-            String[] cols = {"\\d+","New reporter","[123456]","[14]\\.0","","","","0\\.5","[14]\\.0","","","","0\\.5"};
+            String[] cols = {"\\d+","New reporter","[123456]","[14](\\.0)?","","","","0\\.5","[14](\\.0)?","","","","0\\.5"};
             rows.add(cols);
             rows.add(cols);
@@ -535 +535 @@
           else
           {
-            String[] cols1 = {"\\d+","New reporter","[1234]","1\\.0","[01]","[01]","0","0\\.5","1\\.0","[01]","[01]","0","0\\.5"};
-            String[] cols2 = {"\\d+","New reporter","[56]","(10\\.0)|","2|","0|","-50|","0\\.5|","(10\\.0)|","2|","0|","-50|","0\\.5|"};
+            String[] cols1 = {"\\d+","New reporter","[1234]","1(\\.0)?","[01]","[01]","0","0\\.5","1(\\.0)?","[01]","[01]","0","0\\.5"};
+            String[] cols2 = {"\\d+","New reporter","[56]","(10(\\.0)?)|","2|","0|","-50|","0\\.5|","(10(\\.0)?)|","2|","0|","-50|","0\\.5|"};
             rows.add(cols1);
             rows.add(cols1);
@@ -549 +549 @@
           if (mergeReporters) 
           {
-            String[] cols = {"\\d+","New reporter","[123456]","[14]\\.0","","","","0\\.5"};
+            String[] cols = {"\\d+","New reporter","[123456]","[14](\\.0)?","","","","0\\.5"};
             rows.add(cols);
             rows.add(cols);
@@ -555 +555 @@
           else 
           {
-            String[] cols = {"\\d+","New reporter","[123456]","10?\\.0","[012]","[01]","(0)|(-50)","0\\.5"};
+            String[] cols = {"\\d+","New reporter","[123456]","10?(\\.0)?","[012]","[01]","(0)|(-50)","0\\.5"};
             rows.add(cols);
             rows.add(cols);