commit b6ed7d347a3a25dc6fa42c33a9f96c159b36bb6d
author DRC <dcommander@users.sourceforge.net> Thu Mar 31 20:58:03 2011 +0000
committer DRC <dcommander@users.sourceforge.net> Thu Mar 31 20:58:03 2011 +0000
tree 49e54fb51c77f968048a4579702daa618066a7f5
parent 04def09ea9c8d6934a0f99ebb13d61fc77927c86

Use a different naming convention, to avoid conflict with jpegut


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@548 632fc199-4ca6-4c93-a231-07263d6284db

java/TJUnitTest.java

diff --git a/java/TJUnitTest.java b/java/TJUnitTest.java
index ac43a97..0252c20 100644
--- a/java/TJUnitTest.java
+++ b/java/TJUnitTest.java
@@ -788,51 +788,55 @@
 
   public static void main(String argv[]) {
     try {
+      String testName = "javatest";
       boolean doyuv = false;
       for(int i = 0; i < argv.length; i++) {
         if(argv[i].equalsIgnoreCase("-yuv")) doyuv = true;
         if(argv[i].substring(0, 1).equalsIgnoreCase("-h")
           || argv[i].equalsIgnoreCase("-?"))
           usage();
-        if(argv[i].equalsIgnoreCase("-bi")) bi = true;
+        if(argv[i].equalsIgnoreCase("-bi")) {
+          bi = true;
+          testName = "javabitest";
+        }
       }
       if(doyuv) yuv = YUVENCODE;
-      doTest(35, 39, bi ? _3byteFormatsBI : _3byteFormats, TJ.SAMP_444, "test");
-      doTest(39, 41, bi ? _4byteFormatsBI : _4byteFormats, TJ.SAMP_444, "test");
+      doTest(35, 39, bi ? _3byteFormatsBI : _3byteFormats, TJ.SAMP_444, testName);
+      doTest(39, 41, bi ? _4byteFormatsBI : _4byteFormats, TJ.SAMP_444, testName);
       if(doyuv) {
         doTest(41, 35, bi ? _3byteFormatsBI : _3byteFormats, TJ.SAMP_422,
-          "test");
+          testName);
         doTest(35, 39, bi ? _4byteFormatsBI : _4byteFormats, TJ.SAMP_422,
-          "test");
+          testName);
         doTest(39, 41, bi ? _3byteFormatsBI : _3byteFormats, TJ.SAMP_420,
-          "test");
+          testName);
         doTest(41, 35, bi ? _4byteFormatsBI : _4byteFormats, TJ.SAMP_420,
-          "test");
+          testName);
         doTest(35, 39, bi ? _3byteFormatsBI : _3byteFormats, TJ.SAMP_440,
-          "test");
+          testName);
         doTest(39, 41, bi ? _4byteFormatsBI : _4byteFormats, TJ.SAMP_440,
-          "test");
+          testName);
       }
-      doTest(35, 39, onlyGray, TJ.SAMP_GRAY, "test");
+      doTest(35, 39, onlyGray, TJ.SAMP_GRAY, testName);
       doTest(39, 41, bi ? _3byteFormatsBI : _3byteFormats, TJ.SAMP_GRAY,
-        "test");
+        testName);
       doTest(41, 35, bi ? _4byteFormatsBI : _4byteFormats, TJ.SAMP_GRAY,
-        "test");
+        testName);
       if(!doyuv && !bi) doTest1();
       if(doyuv && !bi) {
         yuv = YUVDECODE;
-        doTest(48, 48, onlyRGB, TJ.SAMP_444, "test");
-        doTest(35, 39, onlyRGB, TJ.SAMP_444, "test");
-        doTest(48, 48, onlyRGB, TJ.SAMP_422, "test");
-        doTest(39, 41, onlyRGB, TJ.SAMP_422, "test");
-        doTest(48, 48, onlyRGB, TJ.SAMP_420, "test");
-        doTest(41, 35, onlyRGB, TJ.SAMP_420, "test");
-        doTest(48, 48, onlyRGB, TJ.SAMP_440, "test");
-        doTest(35, 39, onlyRGB, TJ.SAMP_440, "test");
-        doTest(48, 48, onlyRGB, TJ.SAMP_GRAY, "test");
-        doTest(35, 39, onlyRGB, TJ.SAMP_GRAY, "test");
-        doTest(48, 48, onlyGray, TJ.SAMP_GRAY, "test");
-        doTest(39, 41, onlyGray, TJ.SAMP_GRAY, "test");
+        doTest(48, 48, onlyRGB, TJ.SAMP_444, "javatest_yuv0");
+        doTest(35, 39, onlyRGB, TJ.SAMP_444, "javatest_yuv1");
+        doTest(48, 48, onlyRGB, TJ.SAMP_422, "javatest_yuv0");
+        doTest(39, 41, onlyRGB, TJ.SAMP_422, "javatest_yuv1");
+        doTest(48, 48, onlyRGB, TJ.SAMP_420, "javatest_yuv0");
+        doTest(41, 35, onlyRGB, TJ.SAMP_420, "javatest_yuv1");
+        doTest(48, 48, onlyRGB, TJ.SAMP_440, "javatest_yuv0");
+        doTest(35, 39, onlyRGB, TJ.SAMP_440, "javatest_yuv1");
+        doTest(48, 48, onlyRGB, TJ.SAMP_GRAY, "javatest_yuv0");
+        doTest(35, 39, onlyRGB, TJ.SAMP_GRAY, "javatest_yuv1");
+        doTest(48, 48, onlyGray, TJ.SAMP_GRAY, "javatest_yuv0");
+        doTest(39, 41, onlyGray, TJ.SAMP_GRAY, "javatest_yuv1");
       }
     }
     catch(Exception e) {