Changeset 7372


Ignore:
Timestamp:
12/09/10 07:47:10 (9 years ago)
Author:
callan
Message:

Include series in any failures. (See  omero:#3627)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/test-suite/src/loci/tests/testng/OmeroOpenBytesTest.java

    r7371 r7372  
    114114      catch (Exception e) { 
    115115        throw new RuntimeException(String.format( 
    116             "openBytes(i:%d, buf.length:%d, x:%d, y:%d, w:%d, h:%d) " + 
     116            "openBytes(series:%d i:%d, buf.length:%d, x:%d, y:%d, w:%d, h:%d) " + 
    117117            "[sizeX: %d sizeY:%d bpp:%d] threw exception!", 
    118118            i, buf.length, posX, posY, width, height, sizeX, sizeY, bpp), e); 
     
    158158          catch (Exception e) { 
    159159            throw new RuntimeException(String.format( 
    160                 "openBytes(i:%d, buf.length:%d, x:%d, y:%d, w:%d, h:%d) " + 
    161                 "[sizeX: %d sizeY:%d bpp:%d] threw exception!", 
    162                 i, buf.length, posX, posY, width, height, sizeX, sizeY, bpp), e); 
     160                "openBytes(series:%d i:%d, buf.length:%d, x:%d, y:%d, w:%d, " + 
     161                "h:%d) [sizeX: %d sizeY:%d bpp:%d] threw exception!", 
     162                series, i, buf.length, posX, posY, width, height, sizeX, sizeY, 
     163                bpp), e); 
    163164          } 
    164165          // Compare hash digests 
     
    166167          bufDigest = TestTools.md5(buf, 0, actualBufSize); 
    167168          if (!planeDigest.equals(bufDigest)) { 
    168             fail(String.format("MD5:%d offset:%d len:%d %s != %s", 
    169                 i, offset, actualBufSize, planeDigest, bufDigest)); 
     169            fail(String.format("MD5:%s;%d offset:%d len:%d %s != %s", 
     170                series, i, offset, actualBufSize, planeDigest, bufDigest)); 
    170171          } 
    171172          // Update offsets, etc. 
     
    230231        halfPlaneDigest = TestTools.md5(topHalfPlane, 0, topHalfSize); 
    231232        if (!planeDigest.equals(halfPlaneDigest)) { 
    232           fail(String.format("First half MD5:%d %s != %s", 
    233               i, planeDigest, halfPlaneDigest)); 
     233          fail(String.format("First half MD5:%d;%d %s != %s", 
     234              series, i, planeDigest, halfPlaneDigest)); 
    234235        } 
    235236        // Check the digest for the second half of the plane against a full 
     
    240241        halfPlaneDigest = TestTools.md5(bottomHalfPlane, 0, bottomHalfSize); 
    241242        if (!planeDigest.equals(halfPlaneDigest)) { 
    242           fail(String.format("Second half MD5:%d %s != %s", 
    243               i, planeDigest, halfPlaneDigest)); 
     243          fail(String.format("Second half MD5:%d;%d %s != %s", 
     244              series, i, planeDigest, halfPlaneDigest)); 
    244245        } 
    245246      } 
Note: See TracChangeset for help on using the changeset viewer.