hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acmur...@apache.org
Subject svn commit: r1378789 - in /hadoop/common/branches/branch-1-win: CHANGES.branch-1-win.txt src/test/org/apache/hadoop/cli/TestCLI.java src/test/org/apache/hadoop/cli/testConf.xml
Date Thu, 30 Aug 2012 02:19:55 GMT
Author: acmurthy
Date: Thu Aug 30 02:19:54 2012
New Revision: 1378789

URL: http://svn.apache.org/viewvc?rev=1378789&view=rev
Log:
HADOOP-8657. Fix TestCLI to not hardcode file lenght since it's encoding/platform dependent.
Contributed by Bikas Saha.

Modified:
    hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
    hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/TestCLI.java
    hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/testConf.xml

Modified: hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt?rev=1378789&r1=1378788&r2=1378789&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt (original)
+++ hadoop/common/branches/branch-1-win/CHANGES.branch-1-win.txt Thu Aug 30 02:19:54 2012
@@ -1,4 +1,5 @@
 branch-hadoop-1-win - unreleased
+
   IMPROVEMENTS
 
     HADOOP-8223 Initial patch for branch-1-win (David Lao via Sanjay)
@@ -73,3 +74,7 @@ BUG FIXES
     HDFS-3763. TestNameNodeMXBean fails on Windows. (Brandon Li via suresh)
 
     HDFS-3766. Fix TestStorageRestore on Windows. (Brandon Li via suresh)
+
+    HADOOP-8657. Fix TestCLI to not hardcode file length since it's
+    encoding/platform dependent. (Bikas Saha via acmurthy) 
+

Modified: hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/TestCLI.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/TestCLI.java?rev=1378789&r1=1378788&r2=1378789&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/TestCLI.java (original)
+++ hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/TestCLI.java Thu Aug
30 02:19:54 2012
@@ -86,10 +86,19 @@ public class TestCLI extends TestCase {
   private static String clitestDataDir = null;
   private static String username = null;
   
+  
+  // These members represent actual disk file size for files with the same name  
+  private static String data15FileSize = null;
+  private static String data30FileSize = null;
+  private static String data60FileSize = null;
+  private static String data120FileSize = null;
+  private static String dataTotalSize = null;
+  private static String dataTotal2xSize = null;
+
   /**
    * Read the test config file - testConfig.xml
    */
-  private void readTestConfigFile(String namenode) {
+  private void readTestConfigFile() {
     
     if (testsFromConfigFile == null) {
       boolean success = false;
@@ -103,6 +112,18 @@ public class TestCLI extends TestCase {
           for (ComparatorData cd: testData.getComparatorData()) {
             cd.setExpectedOutput(cd.getExpectedOutput()
                 .replaceAll("NAMENODE", namenode));
+            cd.setExpectedOutput(cd.getExpectedOutput()
+                    .replaceAll("DATAFILE15_SIZE", data15FileSize));
+            cd.setExpectedOutput(cd.getExpectedOutput()
+                    .replaceAll("DATAFILE30_SIZE", data30FileSize));
+            cd.setExpectedOutput(cd.getExpectedOutput()
+                    .replaceAll("DATAFILE60_SIZE", data60FileSize));
+            cd.setExpectedOutput(cd.getExpectedOutput()
+                    .replaceAll("DATAFILE120_SIZE", data120FileSize));
+            cd.setExpectedOutput(cd.getExpectedOutput()
+                .replaceAll("DATAFILE_TOTAL_SIZE", dataTotalSize));          
+            cd.setExpectedOutput(cd.getExpectedOutput()
+                .replaceAll("DATAFILE_TOTAL_2xSIZE", dataTotal2xSize));
           }
         }
       } catch (Exception e) {
@@ -124,6 +145,31 @@ public class TestCLI extends TestCase {
                   HadoopPolicyProvider.class, PolicyProvider.class);
     conf.setBoolean(ServiceAuthorizationManager.SERVICE_AUTHORIZATION_CONFIG, 
                     true);
+    long totalSize = 0;
+    long fileSize = 0;
+    
+    /*
+     * Different OS/character encodings can change the real length of a file on
+     * disk. A better alternative would be to write the files during test setup
+     * and use their lengths instead of committing the files and using their
+     * length. For now, we are using the real length of the checked in files
+     * because these changes are being made in branch-1-win and we dont want to
+     * re-organize code in a branch.
+     */
+    fileSize = new File(TEST_CACHE_DATA_DIR + File.separator + "data15bytes").length();
+    totalSize += fileSize;
+    data15FileSize = Long.toString(fileSize);
+    fileSize = new File(TEST_CACHE_DATA_DIR + File.separator + "data30bytes").length();
+    totalSize += fileSize;
+    data30FileSize = Long.toString(fileSize);
+    fileSize = new File(TEST_CACHE_DATA_DIR + File.separator + "data60bytes").length();
+    totalSize += fileSize;
+    data60FileSize = Long.toString(fileSize);
+    fileSize = new File(TEST_CACHE_DATA_DIR + File.separator + "data120bytes").length();
+    totalSize += fileSize;
+    data120FileSize = Long.toString(fileSize);
+    dataTotalSize = Long.toString(totalSize);
+    dataTotal2xSize = Long.toString(totalSize*2);
 
     dfsCluster = new MiniDFSCluster(conf, 1, true, null);
     namenode = conf.get("fs.default.name", "file:///");
@@ -143,7 +189,7 @@ public class TestCLI extends TestCase {
     jobtracker = mrCluster.createJobConf().get("mapred.job.tracker", "local");
 
     // Read the testConfig.xml file
-    readTestConfigFile(namenode);
+    readTestConfigFile();
 
     success = true;
 
@@ -178,6 +224,12 @@ public class TestCLI extends TestCase {
     expCmd = expCmd.replaceAll("JOBTRACKER", jobtracker);
     expCmd = expCmd.replaceAll("CLITEST_DATA", clitestDataDir);
     expCmd = expCmd.replaceAll("USERNAME", username);
+    expCmd = expCmd.replaceAll("DATAFILE15_SIZE", data15FileSize);
+    expCmd = expCmd.replaceAll("DATAFILE30_SIZE", data30FileSize);
+    expCmd = expCmd.replaceAll("DATAFILE60_SIZE", data60FileSize);
+    expCmd = expCmd.replaceAll("DATAFILE120_SIZE", data120FileSize);
+    expCmd = expCmd.replaceAll("DATAFILE_TOTAL_SIZE", dataTotalSize);
+    expCmd = expCmd.replaceAll("DATAFILE_TOTAL_2xSIZE", dataTotal2xSize);
     
     return expCmd;
   }

Modified: hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/testConf.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/testConf.xml?rev=1378789&r1=1378788&r2=1378789&view=diff
==============================================================================
--- hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/testConf.xml (original)
+++ hadoop/common/branches/branch-1-win/src/test/org/apache/hadoop/cli/testConf.xml Thu Aug
30 02:19:54 2012
@@ -506,7 +506,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -527,7 +527,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -551,19 +551,19 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data60bytes</expected-output>
+          <expected-output>DATAFILE60_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data120bytes</expected-output>
+          <expected-output>DATAFILE120_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -585,7 +585,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/dir0/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/dir0/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -607,7 +607,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -632,19 +632,19 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/dir0/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/dir0/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/dir0/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*NAMENODE/dir0/data60bytes</expected-output>
+          <expected-output>DATAFILE60_SIZE( |\t)*NAMENODE/dir0/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*NAMENODE/dir0/data120bytes</expected-output>
+          <expected-output>DATAFILE120_SIZE( |\t)*NAMENODE/dir0/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -677,7 +677,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^NAMENODE/dir0( |\t)*450</expected-output>
+          <expected-output>^NAMENODE/dir0( |\t)*DATAFILE_TOTAL_2xSIZE</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -709,7 +709,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^NAMENODE/user/[a-zA-Z0-9]*/dir0( |\t)*450</expected-output>
+          <expected-output>^NAMENODE/user/[a-zA-Z0-9]*/dir0( |\t)*DATAFILE_TOTAL_2xSIZE</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -747,7 +747,7 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^NAMENODE/dir0( |\t)*450</expected-output>
+          <expected-output>^NAMENODE/dir0( |\t)*DATAFILE_TOTAL_2xSIZE</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1638,7 +1638,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1659,7 +1659,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1676,19 +1676,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/dir0/dir1/data/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/dir0/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*NAMENODE/dir0/dir1/data/data60bytes</expected-output>
+          <expected-output>DATAFILE60_SIZE( |\t)*NAMENODE/dir0/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*NAMENODE/dir0/dir1/data/data120bytes</expected-output>
+          <expected-output>DATAFILE120_SIZE( |\t)*NAMENODE/dir0/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1705,19 +1705,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data60bytes</expected-output>
+          <expected-output>DATAFILE60_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data120bytes</expected-output>
+          <expected-output>DATAFILE120_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1739,11 +1739,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/dir0/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/dir0/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1765,11 +1765,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1894,7 +1894,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1915,7 +1915,7 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/data15bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1932,19 +1932,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/dir0/dir1/data/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/dir0/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*NAMENODE/dir0/dir1/data/data60bytes</expected-output>
+          <expected-output>DATAFILE60_SIZE( |\t)*NAMENODE/dir0/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*NAMENODE/dir0/dir1/data/data120bytes</expected-output>
+          <expected-output>DATAFILE120_SIZE( |\t)*NAMENODE/dir0/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1961,19 +1961,19 @@
       <comparators>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data30bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^60( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data60bytes</expected-output>
+          <expected-output>DATAFILE60_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data60bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^120( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data120bytes</expected-output>
+          <expected-output>DATAFILE120_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/dir1/data/data120bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -1995,11 +1995,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/dir0/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/dir0/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2021,11 +2021,11 @@
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^15( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data15bytes</expected-output>
+          <expected-output>^DATAFILE15_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data15bytes</expected-output>
         </comparator>
         <comparator>
           <type>RegexpComparator</type>
-          <expected-output>^30( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data30bytes</expected-output>
+          <expected-output>DATAFILE30_SIZE( |\t)*NAMENODE/user/[a-zA-Z0-9]*/dir0/data30bytes</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2795,7 +2795,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>data60bytes-60</expected-output>
+          <expected-output>data60bytes-DATAFILE60_SIZE</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2812,7 +2812,7 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>data60bytes-60</expected-output>
+          <expected-output>data60bytes-DATAFILE60_SIZE</expected-output>
         </comparator>
       </comparators>
     </test>
@@ -2868,19 +2868,19 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>"data15bytes-15"</expected-output>
+          <expected-output>"data15bytes-DATAFILE15_SIZE"</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>"data30bytes-30"</expected-output>
+          <expected-output>"data30bytes-DATAFILE30_SIZE"</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>"data60bytes-60"</expected-output>
+          <expected-output>"data60bytes-DATAFILE60_SIZE"</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>"data120bytes-120"</expected-output>
+          <expected-output>"data120bytes-DATAFILE120_SIZE"</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>
@@ -2905,19 +2905,19 @@
       <comparators>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>"data15bytes-15"</expected-output>
+          <expected-output>"data15bytes-DATAFILE15_SIZE"</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>"data30bytes-30"</expected-output>
+          <expected-output>"data30bytes-DATAFILE30_SIZE"</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>"data60bytes-60"</expected-output>
+          <expected-output>"data60bytes-DATAFILE60_SIZE"</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>
-          <expected-output>"data120bytes-120"</expected-output>
+          <expected-output>"data120bytes-DATAFILE120_SIZE"</expected-output>
         </comparator>
         <comparator>
           <type>TokenComparator</type>



Mime
View raw message