Changeset 3894


Ignore:
Timestamp:
04/08/08 13:24:38 (12 years ago)
Author:
curtis
Message:
  • Allow Bio-Rad reader to flag PIC files from NRRD datasets.
  • Detect discrepancy in used files count in sane used files test.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/tests/testng/FormatReaderTest.java

    r3887 r3894  
    3838import java.util.*; 
    3939import loci.formats.*; 
    40 import loci.formats.in.TiffReader; 
     40import loci.formats.in.*; 
    4141import loci.formats.meta.MetadataRetrieve; 
    4242import loci.formats.meta.MetadataStore; 
     
    562562          r.setId(base[i]); 
    563563          String[] comp = r.getUsedFiles(); 
    564           Arrays.sort(comp); 
     564          if (comp.length != base.length) { 
     565            success = false; 
     566            msg = base[i]; 
     567          } 
     568          if (success) Arrays.sort(comp); 
    565569          for (int j=0; j<comp.length && success; j++) { 
    566570            if (!comp[j].equals(base[j])) { 
     
    667671            // TIFF reader is allowed to redundantly green-light files 
    668672            if (result && readers[j] instanceof TiffReader) continue; 
     673 
     674            // Bio-Rad reader is allowed to redundantly 
     675            // green-light PIC files from NRRD datasets 
     676            if (result && r instanceof NRRDReader && 
     677              readers[j] instanceof BioRadReader) 
     678            { 
     679              String low = used[i].toLowerCase(); 
     680              boolean isPic = low.endsWith(".pic") || low.endsWith(".pic.gz"); 
     681              if (isPic) continue; 
     682            } 
    669683 
    670684            boolean expected = r == readers[j]; 
Note: See TracChangeset for help on using the changeset viewer.