svn commit: r1235572 - in /jmeter/trunk: bin/testfiles/GuiTest231_original.jmx bin/testfiles/GuiTest_original.jmx test/src/org/apache/jmeter/save/TestSaveService.java

[se...@apache.org]

Author: sebb
Date: Wed Jan 25 00:31:15 2012
New Revision: 1235572

URL: http://svn.apache.org/viewvc?rev=1235572&view=rev
Log:
Add a basic test to check that old JMX files can still be read
TODO: add more test data files from earlier releases

Added:
    jmeter/trunk/bin/testfiles/GuiTest231_original.jmx
      - copied unchanged from r1196286, jmeter/trunk/bin/testfiles/GuiTest231.jmx
    jmeter/trunk/bin/testfiles/GuiTest_original.jmx
      - copied unchanged from r1196286, jmeter/trunk/bin/testfiles/GuiTest.jmx
Modified:
    jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java

Modified: jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java?rev=1235572&r1=1235571&r2=1235572&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/save/TestSaveService.java Wed Jan 25 00:31:15 2012
@@ -30,6 +30,8 @@ import org.apache.jmeter.util.JMeterUtil
 import org.apache.jorphan.collections.HashTree;
 
 public class TestSaveService extends JMeterTestCase {
+    
+    // testLoadAndSave test files
     private static final String[] FILES = new String[] {
         "AssertionTestPlan.jmx",
         "AuthManagerTestPlan.jmx",
@@ -46,6 +48,12 @@ public class TestSaveService extends JMe
         "GuiTest231.jmx",
         };
 
+    // Test files for testLoad; output will generally be different in size
+    private static final String[] FILES_LOAD_ONLY = new String[] {
+        "GuiTest_original.jmx", 
+        "GuiTest231_original.jmx",
+        };
+
     private static final boolean saveOut = JMeterUtils.getPropDefault("testsaveservice.saveout", false);
 
     public TestSaveService(String name) {
@@ -122,6 +130,16 @@ public class TestSaveService extends JMe
         }
     }
     
+    public void testLoad() throws Exception {
+        for (int i = 0; i < FILES_LOAD_ONLY.length; i++) {
+            InputStream in = new FileInputStream(findTestFile("testfiles/" + FILES_LOAD_ONLY[i]));
+            HashTree tree =SaveService.loadTree(in);
+            assertNotNull(tree);
+            in.close();
+        }
+
+    }
+
     public void testClasses(){
         assertTrue("One or more classes not found - see log file",SaveService.checkClasses());
     }