Changeset 6590


Ignore:
Timestamp:
06/29/10 09:48:31 (9 years ago)
Author:
bdezonia
Message:

Added some virtual testing methods

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/loci-plugins/test/loci/plugins/in/ImporterTest.java

    r6587 r6590  
    3737 
    3838// left off 
    39 //   comboConcatSplit bugs: IJ reorders dims cuz stacksize does not match ZxCxT. Curtis implemented default behavior: 
    40 //     if 2 dims match concat on third. if all three compat then concat along T (then Z then C). Fix tests to reflect 
    41 //      this behavior. 
    4239//   expand testing to use virtual stacks everywhere - partially done 
    4340//   expand compositeTestSubcases() to handle more pixTypes and indexed data 
     
    11741171   
    11751172  /** tests BF's options.setAutoscale() */ 
    1176   private void autoscaleTester(int pixType, boolean wantAutoscale) 
     1173  private void autoscaleTester(boolean virtual, int pixType, boolean wantAutoscale) 
    11771174  { 
    11781175    final int sizeZ = 2, sizeC = 3, sizeT = 4, sizeX = 51, sizeY = 16; 
     
    11831180    try { 
    11841181      ImporterOptions options = new ImporterOptions(); 
     1182      options.setVirtual(virtual); 
    11851183      options.setAutoscale(wantAutoscale); 
    11861184      options.setId(path); 
     
    18301828        outputStackOrderTester(virtual,FormatTools.UINT8, order,  82, 47, 2, 3, 4); 
    18311829  } 
    1832      
    1833   @Test 
    1834   public void testDatasetGroupFiles() 
     1830 
     1831  private void datasetGroupFilesTester(boolean virtual) 
    18351832  { 
    18361833    String path = FAKE_FILES[0]; 
     
    18401837    try { 
    18411838      ImporterOptions options = new ImporterOptions(); 
     1839      options.setVirtual(virtual); 
    18421840      options.setGroupFiles(true); 
    18431841      options.setId(path); 
     
    18561854    groupedFilesTest(imps[0], FAKE_FILES.length, FakePlaneCount); 
    18571855  } 
    1858  
    1859   @Test 
    1860   public void testDatasetOpenFilesIndividually() 
     1856   
     1857  @Test 
     1858  public void testDatasetGroupFiles() 
     1859  { 
     1860    for (boolean virtual : BooleanStates) 
     1861      datasetGroupFilesTester(virtual); 
     1862  } 
     1863 
     1864  private void datsetOpenFilesIndividuallyTester(boolean virtual) 
    18611865  { 
    18621866    // TODO - try to remove file dependency 
     
    19121916  } 
    19131917 
     1918  @Test 
     1919  public void testDatasetOpenFilesIndividually() 
     1920  { 
     1921    for (boolean virtual : BooleanStates) 
     1922      datsetOpenFilesIndividuallyTester(virtual); 
     1923  } 
     1924   
    19141925  @Test 
    19151926  public void testDatasetSwapDims() 
     
    19541965  } 
    19551966 
     1967  // TODO - make a virtual case when working 
    19561968  // TODO - waiting to hear how this case should behave before implementation 
    19571969  @Test 
     
    19902002  } 
    19912003   
     2004  // TODO - make a virtual case when working 
    19922005  // TODO - older unfinished implementation : set aside for now and working on testCompositeSubcases()  
    19932006  @Test 
     
    20192032  } 
    20202033   
     2034  // TODO - make a virtual case when working 
    20212035  // TODO - older unfinished implementation : set aside for now and working on testColorizeSubcases()  
    20222036  @Test 
     
    20262040  } 
    20272041   
     2042  // TODO - make a virtual case when working 
    20282043  // TODO - older unfinished implementation. Waiting to adapt the newest colorize testing code when it is working 
    20292044  @Test 
     
    20332048  } 
    20342049   
     2050  // TODO - make a virtual case when working 
    20352051  // TODO - older unfinished implementation. Waiting to adapt the newest colorize testing code when it is working 
    20362052  @Test 
     
    20642080  public void testColorAutoscale() 
    20652081  { 
    2066     for (int pixType : PixelTypes) 
     2082    for (boolean virtual : BooleanStates) 
    20672083    { 
    2068       for (boolean autoscale : BooleanStates) 
     2084      for (int pixType : PixelTypes) 
    20692085      { 
    2070         //System.out.println("testColorAutoscale(): pixType = "+FormatTools.getPixelTypeString(pixType)+" autoscale = "+autoscale); 
    2071         autoscaleTester(pixType,autoscale); 
     2086        for (boolean autoscale : BooleanStates) 
     2087        { 
     2088          //System.out.println("testColorAutoscale(): pixType = "+FormatTools.getPixelTypeString(pixType)+" autoscale = "+autoscale); 
     2089          autoscaleTester(virtual,pixType,autoscale); 
     2090        } 
    20722091      } 
    20732092    } 
Note: See TracChangeset for help on using the changeset viewer.