Author: sebb
Date: Fri Oct 29 01:09:49 2010
New Revision: 1028573
URL: http://svn.apache.org/viewvc?rev=1028573&view=rev
Log:
Fix test cases to work in Eclipse
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileRowColContainer.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestAuthManager.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/services/TestFileServer.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java?rev=1028573&r1=1028572&r2=1028573&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/assertions/XMLSchemaAssertionTest.java
Fri Oct 29 01:09:49 2010
@@ -82,7 +82,7 @@ public class XMLSchemaAssertionTest exte
public void testAssertionOK() throws Exception {
result.setResponseData(readFile("testfiles/XMLSchematest.xml"));
- assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
+ assertion.setXsdFileName(findTestPath("testfiles/XMLSchema-pass.xsd"));
AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
testLog.debug("isError() " + res.isError() + " isFailure() " +
res.isFailure());
testLog.debug("failure " + res.getFailureMessage());
@@ -159,7 +159,7 @@ public class XMLSchemaAssertionTest exte
ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml");
baos.write("extra".getBytes()); // TODO - charset?
result.setResponseData(baos.toByteArray());
- assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
+ assertion.setXsdFileName(findTestPath("testfiles/XMLSchema-pass.xsd"));
AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
testLog.debug("isError() " + res.isError() + " isFailure() " +
res.isFailure());
testLog.debug("failure " + res.getFailureMessage());
@@ -172,7 +172,7 @@ public class XMLSchemaAssertionTest exte
ByteArrayOutputStream baos = readBA("testfiles/XMLSchematest.xml");
baos.write(" \t\n".getBytes()); // TODO - charset?
result.setResponseData(baos.toByteArray());
- assertion.setXsdFileName("testfiles/XMLSchema-pass.xsd");
+ assertion.setXsdFileName(findTestPath("testfiles/XMLSchema-pass.xsd"));
AssertionResult res = assertion.getResult(jmctx.getPreviousResult());
testLog.debug("xisError() " + res.isError() + " isFailure() " +
res.isFailure());
testLog.debug("failure " + res.getFailureMessage());
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java?rev=1028573&r1=1028572&r2=1028573&view=diff
==============================================================================
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/config/TestCVSDataSet.java
Fri Oct 29 01:09:49 2010
@@ -62,7 +62,7 @@ public class TestCVSDataSet extends JMet
assertNull(threadVars.get("c"));
csv = new CSVDataSet();
- csv.setFilename("testfiles/testempty.csv");
+ csv.setFilename(findTestPath("testfiles/testempty.csv"));
csv.setVariableNames("a,b,c");
csv.setDelimiter(",");
@@ -96,7 +96,7 @@ public class TestCVSDataSet extends JMet
// Test CSV file with a header line
public void testHeaderOpen(){
CSVDataSet csv = new CSVDataSet();
- csv.setFilename("testfiles/testheader.csv");
+ csv.setFilename(findTestPath("testfiles/testheader.csv"));
csv.setDelimiter("|");
assertNull(csv.getVariableNames());
csv.iterationStart(null);
@@ -116,7 +116,7 @@ public class TestCVSDataSet extends JMet
// Test CSV file with a header line and recycle is true
public void testHeaderOpenAndRecycle(){
CSVDataSet csv = new CSVDataSet();
- csv.setFilename("testfiles/testheader.csv");
+ csv.setFilename(findTestPath("testfiles/testheader.csv"));
csv.setDelimiter("|");
csv.setRecycle(true);
assertNull(csv.getVariableNames()); // read 1st line
@@ -134,7 +134,7 @@ public class TestCVSDataSet extends JMet
private CSVDataSet initCSV(){
CSVDataSet csv = new CSVDataSet();
- csv.setFilename("testfiles/test.csv");
+ csv.setFilename(findTestPath("testfiles/test.csv"));
csv.setVariableNames("a,b,c");
csv.setDelimiter(",");
return csv;
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileRowColContainer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileRowColContainer.java?rev=1028573&r1=1028572&r2=1028573&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileRowColContainer.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileRowColContainer.java
Fri Oct 29 01:09:49 2010
@@ -32,7 +32,7 @@ public class TestFileRowColContainer ext
public void testNull() throws Exception {
try {
- new FileRowColContainer("testfiles/xyzxyz");
+ new FileRowColContainer(findTestPath("testfiles/xyzxyz"));
fail("Should not find the file");
} catch (FileNotFoundException e) {
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java?rev=1028573&r1=1028572&r2=1028573&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/monitor/model/TestObjectFactory.java
Fri Oct 29 01:09:49 2010
@@ -20,10 +20,9 @@ import java.io.File;
import java.util.List;
import org.apache.commons.io.FileUtils;
+import org.apache.jmeter.junit.JMeterTestCase;
-import junit.framework.TestCase;
-
-public class TestObjectFactory extends TestCase {
+public class TestObjectFactory extends JMeterTestCase {
private ObjectFactory of;
@@ -45,13 +44,13 @@ public class TestObjectFactory extends T
}
public void testFileData() throws Exception {
- byte[] bytes= FileUtils.readFileToByteArray(new
File("testfiles/monitorStatus.xml"));
+ byte[] bytes=
FileUtils.readFileToByteArray(findTestFile("testfiles/monitorStatus.xml"));
status = of.parseBytes(bytes);
checkResult();
}
public void testStringData() throws Exception {
- String content = FileUtils.readFileToString(new
File("testfiles/monitorStatus.xml"));
+ String content =
FileUtils.readFileToString(findTestFile("testfiles/monitorStatus.xml"));
status = of.parseString(content);
checkResult();
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestAuthManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestAuthManager.java?rev=1028573&r1=1028572&r2=1028573&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestAuthManager.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestAuthManager.java
Fri Oct 29 01:09:49 2010
@@ -40,7 +40,7 @@ public class TestAuthManager extends JMe
AuthManager am = new AuthManager();
CollectionProperty ao = am.getAuthObjects();
assertEquals(0, ao.size());
- am.addFile("testfiles/TestAuth.txt");
+ am.addFile(findTestPath("testfiles/TestAuth.txt"));
assertEquals(9, ao.size());
Authorization at;
at = am.getAuthForURL(new URL("http://a.b.c/";));
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java?rev=1028573&r1=1028572&r2=1028573&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java
Fri Oct 29 01:09:49 2010
@@ -366,7 +366,7 @@ public class TestCookieManager extends J
public void testLoad() throws Exception{
assertEquals(0,man.getCookieCount());
- man.addFile("testfiles/cookies.txt");
+ man.addFile(findTestPath("testfiles/cookies.txt"));
assertEquals(3,man.getCookieCount());
int num = 0;
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=1028573&r1=1028572&r2=1028573&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 Oct 29 01:09:49 2010
@@ -58,7 +58,7 @@ public class TestFileServer extends JMet
assertFalse("Should not have any files open",FS.filesOpen());
FS.closeFile("xxx"); // Unrecognised files are ignored
assertFalse("Should not have any files open",FS.filesOpen());
- String infile="testfiles/test.csv";
+ String infile=findTestPath("testfiles/test.csv");
FS.reserveFile(infile); // Does not open file
assertFalse("Should not have any files open",FS.filesOpen());
assertEquals("a1,b1,c1,d1",FS.readLine(infile));
@@ -84,8 +84,7 @@ public class TestFileServer extends JMet
fail("Expected IOException");
} catch (IOException ignored){
}
- String base=FS.getBaseDir();
- infile=base+"/testfiles/test.csv";
+ infile=findTestPath("/testfiles/test.csv");
FS.reserveFile(infile); // Does not open file
assertFalse("Should not have any files open",FS.filesOpen());
assertEquals("a1,b1,c1,d1",FS.readLine(infile));
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java?rev=1028573&r1=1028572&r2=1028573&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java
Fri Oct 29 01:09:49 2010
@@ -17,6 +17,8 @@
*/
package org.apache.jmeter.testelement;
+import java.io.File;
+
import javax.swing.JComponent;
import org.apache.jmeter.report.DataSet;
@@ -40,9 +42,9 @@ public class BarChartTest extends JMeter
public void testGenerateBarChart() {
log.info("jtl version=" +
JMeterUtils.getProperty("file_format.testlog"));
// String sampleLog =
"C:/eclipse3/workspace/jmeter-21/bin/testfiles/sample_log1.jtl";
- String sampleLog = "testfiles/sample_log1.jtl";
- String sampleLog2 = "testfiles/sample_log1b.jtl";
- String sampleLog3 = "testfiles/sample_log1c.jtl";
+ String sampleLog = findTestPath("testfiles/sample_log1.jtl");
+ String sampleLog2 = findTestPath("testfiles/sample_log1b.jtl");
+ String sampleLog3 = findTestPath("testfiles/sample_log1c.jtl");
JTLData input = new JTLData();
JTLData input2 = new JTLData();
JTLData input3 = new JTLData();
@@ -77,7 +79,9 @@ public class BarChartTest extends JMeter
String filename = bchart.getTitle();
filename = filename.replace(' ','_');
if (!"true".equalsIgnoreCase(System.getProperty("java.awt.headless"))){
- serv.saveJComponent("./testfiles/" +
filename,SaveGraphicsService.PNG,gr);
+ String outName = findTestPath("./testfiles/" + filename);
+ serv.saveJComponent(outName,SaveGraphicsService.PNG,gr);
+ assertTrue("Should have created the file",new
File(outName+".png").exists());
}
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java?rev=1028573&r1=1028572&r2=1028573&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java
Fri Oct 29 01:09:49 2010
@@ -17,6 +17,8 @@
*/
package org.apache.jmeter.testelement;
+import java.io.File;
+
import javax.swing.JComponent;
import org.apache.jmeter.report.DataSet;
@@ -40,9 +42,9 @@ public class LineGraphTest extends JMete
public void testGenerateLineChart() {
log.info("jtl version=" +
JMeterUtils.getProperty("file_format.testlog"));
// String sampleLog =
"C:/eclipse3/workspace/jmeter-21/bin/testfiles/sample_log1.jtl";
- String sampleLog = "testfiles/sample_log1.jtl";
- String sampleLog2 = "testfiles/sample_log1b.jtl";
- String sampleLog3 = "testfiles/sample_log1c.jtl";
+ String sampleLog = findTestPath("testfiles/sample_log1.jtl");
+ String sampleLog2 = findTestPath("testfiles/sample_log1b.jtl");
+ String sampleLog3 = findTestPath("testfiles/sample_log1c.jtl");
JTLData input = new JTLData();
JTLData input2 = new JTLData();
JTLData input3 = new JTLData();
@@ -77,7 +79,9 @@ public class LineGraphTest extends JMete
String filename = lgraph.getTitle();
filename = filename.replace(' ','_');
if (!"true".equalsIgnoreCase(System.getProperty("java.awt.headless"))){
- serv.saveJComponent("./testfiles/" +
filename,SaveGraphicsService.PNG,gr);
+ String outPfx = findTestPath("./testfiles/" + filename);
+ serv.saveJComponent(outPfx,SaveGraphicsService.PNG,gr);
+ assertTrue("Should have created file",new
File(outPfx+".png").exists());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
