Author: sebb
Date: Tue Oct 23 11:52:45 2007
New Revision: 587604
URL: http://svn.apache.org/viewvc?rev=587604&view=rev
Log:
Updated tests for getDataEncoding() + WithDefault() and NoDefault()
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java?rev=587604&r1=587603&r2=587604&view=diff
==============================================================================
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/samplers/TestSampleResult.java
Tue Oct 23 11:52:45 2007
@@ -185,23 +185,37 @@
// check default
SampleResult res = new SampleResult();
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncoding());
+
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncodingWithDefault());
assertEquals("DataType should be blank","",res.getDataType());
+ assertNull(res.getDataEncodingNoDefault());
// check null changes nothing
res.setEncodingAndType(null);
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncoding());
+
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncodingWithDefault());
assertEquals("DataType should be blank","",res.getDataType());
+ assertNull(res.getDataEncodingNoDefault());
+
+ // check no charset
+ res.setEncodingAndType("text/html");
+
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncoding());
+
assertEquals(SampleResult.DEFAULT_ENCODING,res.getDataEncodingWithDefault());
+ assertEquals("text",res.getDataType());
+ assertNull(res.getDataEncodingNoDefault());
// Check unquoted charset
res.setEncodingAndType("text/html; charset=aBcd");
+ assertEquals("aBcd",res.getDataEncodingWithDefault());
+ assertEquals("aBcd",res.getDataEncodingNoDefault());
assertEquals("aBcd",res.getDataEncoding());
assertEquals("text",res.getDataType());
// Check quoted charset
- res.setEncodingAndType("text/html; charset=\"aBcd\"");
- assertEquals("aBcd",res.getDataEncoding());
- assertEquals("text",res.getDataType());
-
+ res.setEncodingAndType("text/html; charset=\"aBCd\"");
+ assertEquals("aBCd",res.getDataEncodingWithDefault());
+ assertEquals("aBCd",res.getDataEncodingNoDefault());
+ assertEquals("aBCd",res.getDataEncoding());
+ assertEquals("text",res.getDataType());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
