Author: sebb
Date: Fri Oct 29 00:23:10 2010
New Revision: 1028560
URL: http://svn.apache.org/viewvc?rev=1028560&view=rev
Log:
Add findTestPath util method
Don't try to change user.dir - it does not work.
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java?rev=1028560&r1=1028559&r2=1028560&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTestCase.java
Fri Oct 29 00:23:10 2010
@@ -63,17 +63,13 @@ public abstract class JMeterTestCase ext
File f = new File(file);
if (!f.canRead()) {
System.out.println("Can't find " + file + " - trying bin
directory");
- file = "bin/" + file;// JMeterUtils assumes Unix-style
- // separators
- // Also need to set working directory so test files can be
found
- System.setProperty("user.dir", System.getProperty("user.dir")
+ File.separatorChar + "bin");
- System.out.println("Setting user.dir=" +
System.getProperty("user.dir"));
+ file = "bin/" + file;// JMeterUtils assumes Unix-style
separators
filePrefix = "bin/";
} else {
filePrefix = "";
}
// Used to be done in initializeProperties
- String home=new File(System.getProperty("user.dir")).getParent();
+ String home=new
File(System.getProperty("user.dir"),filePrefix).getParent();
System.out.println("Setting JMeterHome: "+home);
JMeterUtils.setJMeterHome(home);
JMeterUtils jmu = new JMeterUtils();
@@ -117,11 +113,20 @@ public abstract class JMeterTestCase ext
protected static File findTestFile(String file) {
File f = new File(file);
if (filePrefix.length() > 0 && !f.isAbsolute()) {
- f = new File(filePrefix + file);// Add the offset
+ f = new File(filePrefix, file);// Add the offset
}
return f;
}
+ // Helper method to find a test path
+ protected static String findTestPath(String file) {
+ File f = new File(file);
+ if (filePrefix.length() > 0 && !f.isAbsolute()) {
+ return filePrefix + file;// Add the offset
+ }
+ return file;
+ }
+
protected static final Logger testLog = LoggingManager.getLoggerForClass();
protected void checkInvalidParameterCounts(AbstractFunction func, int
minimum)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
