Changeset 6851
- Timestamp:
- 08/27/10 14:04:58 (9 years ago)
- Location:
- branches/junit-test-suite/components/test-suite/src/loci/tests/junit
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/junit-test-suite/components/test-suite/src/loci/tests/junit/ConfigurationTree.java
r6850 r6851 212 212 } 213 213 214 /** Returns whether or not the current file was actually configured. */ 215 public boolean isConfigured() { 216 return pos != null; 217 } 218 214 219 /** Sets the active series. */ 215 220 public void setSeries(int series) { -
branches/junit-test-suite/components/test-suite/src/loci/tests/junit/FormatReaderTest.java
r6850 r6851 43 43 import loci.common.services.ServiceException; 44 44 import loci.common.services.ServiceFactory; 45 import loci.formats.ChannelFiller; 46 import loci.formats.ChannelSeparator; 45 47 import loci.formats.FileStitcher; 46 48 import loci.formats.FormatException; … … 48 50 import loci.formats.IFormatReader; 49 51 import loci.formats.ImageReader; 52 import loci.formats.MinMaxCalculator; 50 53 import loci.formats.ReaderWrapper; 51 54 import loci.formats.gui.AWTImageTools; … … 62 65 import org.junit.runners.Parameterized; 63 66 67 import org.slf4j.Logger; 68 import org.slf4j.LoggerFactory; 69 64 70 import static org.junit.Assert.*; 65 71 import static org.junit.Assume.*; … … 73 79 private static final String BASE_DIR_PROP = "junit.directory"; 74 80 private static final String MULTIPLIER_PROP = "junit.multiplier"; 81 private static final Logger LOGGER = 82 LoggerFactory.getLogger(FormatReaderTest.class); 75 83 76 84 // -- Static fields -- … … 107 115 } 108 116 catch (DependencyException e) { 109 // TODO : log this117 LOGGER.warn("", e); 110 118 } 111 119 } … … 122 130 IFormatReader bufferedImageReader = new BufferedImageReader(); 123 131 for (Object file : files) { 124 // TODO : we could add many more wrapper combinations here125 132 rtn.add(new Object[] {fileReader, file}); 126 133 rtn.add(new Object[] {bufferedImageReader, file}); … … 141 148 } 142 149 catch (ServiceException e) { 143 // TODO : log this150 LOGGER.warn("", e); 144 151 } 145 152 reader.setMetadataStore(store); … … 154 161 public void testSeriesCount() { 155 162 assumeTrue(config.isTestable()); 156 assumeTrue(reader.getCurrentFile().equals(file)); 157 assertEquals("Series counts do not match", 163 assertTrue(file, config.isConfigured()); 164 assumeTrue(reader.getCurrentFile().equals(file)); 165 assertEquals(file + ": series counts do not match", 158 166 config.getSeriesCount(), reader.getSeriesCount()); 159 167 } … … 162 170 public void testCoreMetadata() { 163 171 assumeTrue(config.isTestable()); 172 assertTrue(file, config.isConfigured()); 164 173 assumeTrue(reader.getCurrentFile().equals(file)); 165 174 for (int series=0; series<reader.getSeriesCount(); series++) { 166 String message = "Series #" + series;175 String message = file + ": series #" + series; 167 176 config.setSeries(series); 168 177 reader.setSeries(series); … … 191 200 public void testSaneUsedFiles() { 192 201 assumeTrue(config.isTestable()); 202 assertTrue(file, config.isConfigured()); 193 203 assumeTrue(reader.getCurrentFile().equals(file)); 194 204 195 205 String[] base = reader.getUsedFiles(); 196 206 if (base.length == 1) { 197 assertEquals( base[0], file);207 assertEquals(file, base[0], file); 198 208 return; 199 209 } … … 201 211 Arrays.sort(base); 202 212 203 // TODO : this should match the arbitrary wrapper chain 204 IFormatReader r = new ImageReader(); 213 // copy the current IFormatReader 214 215 IFormatReader r = null; 216 if (reader instanceof FileStitcher) { 217 ReaderWrapper wrapper = 218 (ReaderWrapper) ((FileStitcher) reader).getReader(); 219 try { 220 r = new FileStitcher(wrapper.duplicate(null)); 221 } 222 catch (Exception e) { 223 fail(file + ": " + e.getMessage()); 224 } 225 } 226 if (reader instanceof ImageReader) { 227 r = new ImageReader(); 228 } 229 if (reader instanceof ReaderWrapper) { 230 try { 231 r = ((ReaderWrapper) reader).duplicate(null); 232 } 233 catch (Exception e) { 234 fail(file + ": " + e.getMessage()); 235 } 236 } 205 237 206 238 for (String f : base) { … … 211 243 String[] comp = r.getUsedFiles(); 212 244 Arrays.sort(comp); 213 assertArrayEquals(f , comp, base);245 assertArrayEquals(file + ": " + f, comp, base); 214 246 r.close(); 215 247 } … … 217 249 catch (IOException e) { exc = e; } 218 250 if (exc != null) { 219 fail(f + " (" + exc.getMessage() + ")");251 fail(file + ": " + f + " (" + exc.getMessage() + ")"); 220 252 } 221 253 } … … 225 257 public void testOMEXMLConsistency() { 226 258 assumeTrue(config.isTestable()); 259 assertTrue(file, config.isConfigured()); 227 260 assumeTrue(reader.getCurrentFile().equals(file)); 228 261 … … 234 267 235 268 String type = FormatTools.getPixelTypeString(reader.getPixelType()); 236 String message = "Series " + i;269 String message = file + ": series " + i; 237 270 238 271 assertEquals(message, … … 260 293 } 261 294 catch (FormatException e) { 262 // TODO : log this295 LOGGER.warn("", e); 263 296 } 264 297 catch (IOException e) { 265 // TODO : log this298 LOGGER.warn("", e); 266 299 } 267 300 } … … 281 314 public void testPixelsHashes() { 282 315 assumeTrue(config.isTestable()); 316 assertTrue(file, config.isConfigured()); 283 317 assumeTrue(reader.getCurrentFile().equals(file)); 284 318 … … 291 325 String expectedMD5 = config.getMD5(); 292 326 293 assertEquals( "Series " + i, md5, expectedMD5);327 assertEquals(file + ": series " + i, md5, expectedMD5); 294 328 } 295 329 catch (FormatException e) { 296 fail( "Series " + i + " (" + e.getMessage() + ")");330 fail(file + ": series " + i + " (" + e.getMessage() + ")"); 297 331 } 298 332 catch (IOException e) { 299 fail( "Series " + i + " (" + e.getMessage() + ")");333 fail(file + ": series " + i + " (" + e.getMessage() + ")"); 300 334 } 301 335 } … … 305 339 public void testBufferedImageDimensions() { 306 340 assumeTrue(config.isTestable()); 341 assertTrue(file, config.isConfigured()); 307 342 assumeTrue(reader.getCurrentFile().equals(file)); 308 343 assumeTrue(reader instanceof BufferedImageReader); … … 322 357 b = ((BufferedImageReader) reader).openImage(image); 323 358 } 324 catch (FormatException e) { 325 fail("Series " + i + " Plane " + image + " (" + e.getMessage() + ")"); 326 } 327 catch (IOException e) { 328 fail("Series " + i + " Plane " + image + " (" + e.getMessage() + ")"); 329 } 330 331 assertEquals(x, b.getWidth()); 332 assertEquals(y, b.getHeight()); 333 assertEquals(c, b.getRaster().getNumBands()); 334 assertEquals(type, AWTImageTools.getPixelType(b)); 359 catch (Exception e) { 360 fail(file + ": series " + i + " Plane " + image + 361 " (" + e.getMessage() + ")"); 362 } 363 364 assertEquals(file, x, b.getWidth()); 365 assertEquals(file, y, b.getHeight()); 366 assertEquals(file, c, b.getRaster().getNumBands()); 367 assertEquals(file, type, AWTImageTools.getPixelType(b)); 335 368 } 336 369 } … … 340 373 public void testByteArrayDimensions() { 341 374 assumeTrue(config.isTestable()); 375 assertTrue(file, config.isConfigured()); 342 376 assumeTrue(reader.getCurrentFile().equals(file)); 343 377 assumeTrue(!(reader instanceof BufferedImageReader)); … … 358 392 b = reader.openBytes(image); 359 393 } 360 catch (FormatException e) { 361 fail("Series " + i + " Plane " + image + " (" + e.getMessage() + ")"); 362 } 363 catch (IOException e) { 364 fail("Series " + i + " Plane " + image + " (" + e.getMessage() + ")"); 365 } 366 assertEquals( 367 "Series " + i + ", Plane " + image, b.length, expectedByteCount); 394 catch (Exception e) { 395 fail(file + ": series " + i + " Plane " + image + 396 " (" + e.getMessage() + ")"); 397 } 398 assertEquals(file + ": series " + i + ", Plane " + image, 399 b.length, expectedByteCount); 368 400 } 369 401 } … … 373 405 public void testThumbnailBufferedImageDimensions() { 374 406 assumeTrue(config.isTestable()); 407 assertTrue(file, config.isConfigured()); 375 408 assumeTrue(reader.getCurrentFile().equals(file)); 376 409 assumeTrue(reader instanceof BufferedImageReader); … … 388 421 b = ((BufferedImageReader) reader).openThumbImage(0); 389 422 } 390 catch (FormatException e) { 391 fail("Series " + i + " (" + e.getMessage() + ")"); 392 } 393 catch (IOException e) { 394 fail("Series " + i + " (" + e.getMessage() + ")"); 395 } 396 String message = "Series " + i; 423 catch (Exception e) { 424 fail(file + ": series " + i + " (" + e.getMessage() + ")"); 425 } 426 String message = file + ": series " + i; 397 427 assertEquals(message, x, b.getWidth()); 398 428 assertEquals(message, y, b.getHeight()); … … 410 440 public void testThumbnailByteArrayDimensions() { 411 441 assumeTrue(config.isTestable()); 442 assertTrue(file, config.isConfigured()); 412 443 assumeTrue(reader.getCurrentFile().equals(file)); 413 444 assumeTrue(!(reader instanceof BufferedImageReader)); … … 425 456 b = reader.openThumbBytes(0); 426 457 } 427 catch (FormatException e) { 428 fail("Series " + i + " (" + e.getMessage() + ")"); 429 } 430 catch (IOException e) { 431 fail("Series " + i + " (" + e.getMessage() + ")"); 432 } 433 assertEquals("Series " + i, b.length, expected); 458 catch (Exception e) { 459 fail(file + ": series " + i + " (" + e.getMessage() + ")"); 460 } 461 assertEquals(file + ": series " + i, b.length, expected); 434 462 } 435 463 } … … 440 468 public void testImageCount() { 441 469 assumeTrue(config.isTestable()); 470 assertTrue(file, config.isConfigured()); 442 471 assumeTrue(reader.getCurrentFile().equals(file)); 443 472 … … 448 477 int c = reader.getEffectiveSizeC(); 449 478 int t = reader.getSizeT(); 450 assertEquals( "Series " + i, imageCount, z * c * t);479 assertEquals(file + ": series " + i, imageCount, z * c * t); 451 480 } 452 481 } … … 455 484 public void testSaneOMEXML() { 456 485 assumeTrue(config.isTestable()); 486 assertTrue(file, config.isConfigured()); 457 487 assumeTrue(reader.getCurrentFile().equals(file)); 458 488 … … 470 500 int samplesPerPixel = meta.getChannelSamplesPerPixel(i, 0).getValue(); 471 501 472 String message = "Series " + i;502 String message = file + ": series " + i; 473 503 assertEquals(message, sizeC, nChannels * samplesPerPixel); 474 504 … … 488 518 public void testValidOMEXML() { 489 519 assumeTrue(config.isTestable()); 520 assertTrue(file, config.isConfigured()); 490 521 assumeTrue(reader.getCurrentFile().equals(file)); 491 522 … … 495 526 try { 496 527 String xml = omexmlService.getOMEXML(meta); 497 assertTrue( omexmlService.validateOMEXML(xml));528 assertTrue(file, omexmlService.validateOMEXML(xml)); 498 529 } 499 530 catch (ServiceException e) { 500 fail( e.getMessage());531 fail(file + ": " + e.getMessage()); 501 532 } 502 533 } … … 510 541 public void testPerformance() { 511 542 assumeTrue(config.isTestable()); 543 assertTrue(file, config.isConfigured()); 512 544 assumeTrue(reader.getCurrentFile().equals(file)); 513 545 … … 515 547 double properTime = config.getTimePerPlane(); 516 548 517 assertTrue( "Missing memory configuration", properMem > 0);518 assertTrue( "Missing timing configuration", properTime > 0);549 assertTrue(file + ": missing memory configuration", properMem > 0); 550 assertTrue(file + ": missing timing configuration", properTime > 0); 519 551 520 552 Runtime r = Runtime.getRuntime(); … … 533 565 } 534 566 catch (Exception e) { 535 fail( "Series " + i + ", plane " + j + ": " + e.getMessage());567 fail(file + ": series " + i + ", plane " + j + ": " + e.getMessage()); 536 568 } 537 569 } … … 543 575 int actualMem = (int) ((m2 - m1) >> 20); 544 576 545 assertTrue( actualTime - timeMultiplier * properTime <= 20.0);546 assertTrue( actualMem <= properMem);577 assertTrue(file, actualTime - timeMultiplier * properTime <= 50.0); 578 assertTrue(file, actualMem <= properMem); 547 579 } 548 580 … … 552 584 public void testIsThisType() { 553 585 assumeTrue(config.isTestable()); 586 assertTrue(file, config.isConfigured()); 554 587 assumeTrue(reader.getCurrentFile().equals(file)); 555 588 … … 563 596 } 564 597 catch (Exception e) { 565 fail( e.getMessage());598 fail(file + ": " + e.getMessage()); 566 599 } 567 600 } … … 590 623 591 624 String checkName = TestTools.shortClassName(check); 592 assertEquals(checkName, result, baseName.equals(checkName)); 625 assertEquals(file + ": " + checkName, 626 result, baseName.equals(checkName)); 593 627 } 594 628 }
Note: See TracChangeset
for help on using the changeset viewer.