Changeset 4843


Ignore:
Timestamp:
Mar 25, 2009, 1:12:39 PM (13 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/test/TestBioAsssaySetExporter.java

    r4802 r4843  
    529529          if (mergeReporters)
    530530          {
    531             String[] cols = {"\\d+","New reporter","[123456]","[14]\\.0","","","","0\\.5","[14]\\.0","","","","0\\.5"};
     531            String[] cols = {"\\d+","New reporter","[123456]","[14](\\.0)?","","","","0\\.5","[14](\\.0)?","","","","0\\.5"};
    532532            rows.add(cols);
    533533            rows.add(cols);
     
    535535          else
    536536          {
    537             String[] cols1 = {"\\d+","New reporter","[1234]","1\\.0","[01]","[01]","0","0\\.5","1\\.0","[01]","[01]","0","0\\.5"};
    538             String[] cols2 = {"\\d+","New reporter","[56]","(10\\.0)|","2|","0|","-50|","0\\.5|","(10\\.0)|","2|","0|","-50|","0\\.5|"};
     537            String[] cols1 = {"\\d+","New reporter","[1234]","1(\\.0)?","[01]","[01]","0","0\\.5","1(\\.0)?","[01]","[01]","0","0\\.5"};
     538            String[] cols2 = {"\\d+","New reporter","[56]","(10(\\.0)?)|","2|","0|","-50|","0\\.5|","(10(\\.0)?)|","2|","0|","-50|","0\\.5|"};
    539539            rows.add(cols1);
    540540            rows.add(cols1);
     
    549549          if (mergeReporters)
    550550          {
    551             String[] cols = {"\\d+","New reporter","[123456]","[14]\\.0","","","","0\\.5"};
     551            String[] cols = {"\\d+","New reporter","[123456]","[14](\\.0)?","","","","0\\.5"};
    552552            rows.add(cols);
    553553            rows.add(cols);
     
    555555          else
    556556          {
    557             String[] cols = {"\\d+","New reporter","[123456]","10?\\.0","[012]","[01]","(0)|(-50)","0\\.5"};
     557            String[] cols = {"\\d+","New reporter","[123456]","10?(\\.0)?","[012]","[01]","(0)|(-50)","0\\.5"};
    558558            rows.add(cols);
    559559            rows.add(cols);
Note: See TracChangeset for help on using the changeset viewer.