Author: sebb Date: Sat Mar 3 18:17:52 2007 New Revision: 514330 URL: http://svn.apache.org/viewvc?view=rev&rev=514330 Log: Remove deprecated JMeterUtils.split()
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java?view=diff&rev=514330&r1=514329&r2=514330 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/JMeterUtils.java Sat Mar 3 18:17:52 2007 @@ -810,52 +810,6 @@ return button; } - /** - * Takes a String and a tokenizer character, and returns a new array of - * strings of the string split by the tokenizer character. - * - * @param splittee - * String to be split - * @param splitChar - * Character to split the string on - * @param def - * Default value to place between two split chars that have - * nothing between them - * @return Array of all the tokens. - * @deprecated - * Use rewritten version in JOrphanUtils (handles leading/trailing delimiters better) - * TODO: remove in version 2.2 - * - */ - public static String[] split(String splittee, String splitChar, String def) { - if (splittee == null || splitChar == null) { - return new String[0]; - } - int spot; - // Replace ## with #def# (where #=splitChar) - if (def.length() > 0 ) {// Prevent infinite loop - while ((spot = splittee.indexOf(splitChar + splitChar)) != -1) { - splittee = splittee.substring(0, spot + splitChar.length()) + def - + splittee.substring(spot + 1 * splitChar.length(), splittee.length()); - } - } - Vector returns = new Vector(); - int start = 0; - int length = splittee.length(); - spot = 0; - while (start < length && (spot = splittee.indexOf(splitChar, start)) > -1) { - if (spot > 0) { - returns.addElement(splittee.substring(start, spot)); - } - start = spot + splitChar.length(); - } - if (start < length) { - returns.add(splittee.substring(start)); - } - String[] values = new String[returns.size()]; - returns.copyInto(values); - return values; - } /** * Report an error through a dialog box. Modified: jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java?view=diff&rev=514330&r1=514329&r2=514330 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java (original) +++ jakarta/jmeter/branches/rel-2-2/test/src/org/apache/jmeter/util/TestJMeterUtils.java Sat Mar 3 18:17:52 2007 @@ -33,51 +33,5 @@ public TestJMeterUtils(String arg0) { super(arg0); } - - - public void testSplit1() { - String in = "a,bc,,"; // Test ignore trailing split characters - String out[] = JMeterUtils.split(in, ",","?");// with default - assertEquals(3, out.length); - assertEquals("a", out[0]); - assertEquals("bc", out[1]); - assertEquals("?", out[2]); - } - - public void testSplit1a() { - String in = "a,bc,,"; // Test ignore trailing split characters - String out[] = JMeterUtils.split(in, ",",""); // with no default - assertEquals(3, out.length); - assertEquals("a", out[0]); - assertEquals("bc", out[1]); - assertEquals("", out[2]); - } - - public void testSplit2() { - String in = ",,a,bc"; // Test leading split characters with default - String out[] = JMeterUtils.split(in, ",","?"); - assertEquals(3, out.length); - assertEquals("?", out[0]); - assertEquals("a", out[1]); - assertEquals("bc", out[2]); - } - - public void testSplit3() { - String in = ",,a,bc"; // Test leading split characters no default - String out[] = JMeterUtils.split(in, ",",""); - assertEquals(3, out.length); - assertEquals("", out[0]); - assertEquals("a", out[1]); - assertEquals("bc", out[2]); - } - - public void testSplit4() { - String in = ",,,a,bc"; // Test leading split characters no default - String out[] = JMeterUtils.split(in, ",",""); - assertEquals(4, out.length); - assertEquals("", out[0]); - assertEquals("", out[1]); - assertEquals("a", out[2]); - assertEquals("bc", out[3]); - } + //TODO add some tests now that split() has been removed } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]