svn commit: r1064915 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java

[se...@apache.org]

Author: sebb
Date: Fri Jan 28 22:35:17 2011
New Revision: 1064915

URL: http://svn.apache.org/viewvc?rev=1064915&view=rev
Log:
Tests for new methods

Modified:
    jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java

Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java?rev=1064915&r1=1064914&r2=1064915&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java (original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java Fri Jan 28 22:35:17 2011
@@ -22,6 +22,7 @@
      
 package org.apache.jmeter.services;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.apache.jmeter.junit.JMeterTestCase;
@@ -39,9 +40,13 @@ public class TestFileServer extends JMet
     }
 
     @Override
+    public void setUp() throws IOException {
+        FS.resetBase();        
+    }
+
+    @Override
     public void tearDown() throws IOException{
         FS.closeFiles();
-        FS.resetBase();
     }
     
     public void testopen() throws Exception {
@@ -96,6 +101,19 @@ public class TestFileServer extends JMet
         FS.closeFile(infile);
         FS.setBasedir("y");
         FS.closeFiles();
-        FS.setBasedir(System.getProperty("user.dir"));
+    }
+    
+    public void testRelative() throws Exception {
+        final String base = FileServer.getDefaultBase();
+        final File basefile = new File(base);
+        FS.setBaseForScript(basefile);
+        assertEquals(".",FS.getBaseDirRelative().toString());
+        FS.setBaseForScript(basefile.getParentFile());
+        assertEquals(".",FS.getBaseDirRelative().toString());
+        FS.setBaseForScript(new File(basefile.getParentFile(),"abcd/defg.jmx"));
+        assertEquals(".",FS.getBaseDirRelative().toString());
+        File file = new File(basefile,"abcd/defg.jmx");
+        FS.setBaseForScript(file);
+        assertEquals("abcd",FS.getBaseDirRelative().toString());
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org