Author: sebb Date: Mon Feb 1 23:12:51 2010 New Revision: 905443 URL: http://svn.apache.org/viewvc?rev=905443&view=rev Log: More useful toString() behaviour
Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java?rev=905443&r1=905442&r2=905443&view=diff ============================================================================== --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArgs.java Mon Feb 1 23:12:51 2010 @@ -142,9 +142,9 @@ PropertyIterator iter = getHTTPFileArgsCollection().iterator(); while (iter.hasNext()) { HTTPFileArg file = (HTTPFileArg) iter.next().getObjectValue(); - str.append(file.getPath()); + str.append(file.toString()); if (iter.hasNext()) { - str.append("&"); //$NON-NLS-1$ + str.append("\n"); //$NON-NLS-1$ } } return str.toString(); Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java?rev=905443&r1=905442&r2=905443&view=diff ============================================================================== --- jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java (original) +++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/util/TestHTTPFileArgs.java Mon Feb 1 23:12:51 2010 @@ -113,6 +113,9 @@ files.addHTTPFileArg("file1"); files.addHTTPFileArg("file2"); files.addHTTPFileArg("file3"); - assertEquals("file1&file2&file3", files.toString()); + assertEquals("path:'file1'|param:''|mimetype:''\n" + +"path:'file2'|param:''|mimetype:''\n" + +"path:'file3'|param:''|mimetype:''", + files.toString()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org