sebb 2003/12/15 09:42:06
Modified: src/protocol/http/org/apache/jmeter/protocol/http/parser
HTMLParser.java
Log:
findFile moved to JMeterTestCase
Revision Changes Path
1.13 +3 -15
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
Index: HTMLParser.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HTMLParser.java 14 Dec 2003 01:44:02 -0000 1.12
+++ HTMLParser.java 15 Dec 2003 17:42:06 -0000 1.13
@@ -394,7 +394,7 @@
throws Exception
{
log.info("file "+file);
- File f= findFile(file);
+ File f= findTestFile(file);
byte[] buffer= new byte[(int)f.length()];
int len= new FileInputStream(f).read(buffer);
assertEquals(len, buffer.length);
@@ -420,7 +420,7 @@
if (file != null && file.length() > 0){
BufferedReader br =
new BufferedReader(
- new FileReader(findFile(file)));
+ new FileReader(findTestFile(file)));
String line = br.readLine();
while (line != null){
al.add(line);
@@ -429,18 +429,6 @@
br.close();
}
return al;
- }
- // Helper method to find a file
- private static File findFile(String file)
- {
- File f= new File(file);
- if (!f.exists() && !f.isAbsolute()) // Try adding user.dir
- {
- //System.out.println(f.getPath()+" E="+f.exists()+"
A="+f.isAbsolute());
- f=f.getAbsoluteFile();
- //System.out.println(f.getPath()+" E="+f.exists()+"
A="+f.isAbsolute());
- }
- return f;
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
