You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/11/20 20:34:10 UTC
svn commit: r1815851 - in /jmeter/trunk:
src/functions/org/apache/jmeter/functions/ChangeCase.java
test/src/org/apache/jmeter/functions/TestChangeCase.java
Author: pmouawad
Date: Mon Nov 20 20:34:10 2017
New Revision: 1815851
URL: http://svn.apache.org/viewvc?rev=1815851&view=rev
Log:
Bug 61759 - New __changeCase function
Handle first char Uppercase error
Bugzilla Id: 61759
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/ChangeCase.java
jmeter/trunk/test/src/org/apache/jmeter/functions/TestChangeCase.java
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/ChangeCase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/ChangeCase.java?rev=1815851&r1=1815850&r2=1815851&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/ChangeCase.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/ChangeCase.java Mon Nov 20 20:34:10 2017
@@ -132,7 +132,7 @@ public class ChangeCase extends Abstract
String[] tokens = NOT_ALPHANUMERIC_REGEX.split(str);
for (int i = 0; i < tokens.length; i++) {
if(i == 0) {
- builder.append(isFirstCapitalized ? tokens[0]:
+ builder.append(isFirstCapitalized ? decapitalize(tokens[0]):
StringUtils.capitalize(tokens[i]));
} else {
builder.append(StringUtils.capitalize(tokens[i]));
@@ -142,6 +142,18 @@ public class ChangeCase extends Abstract
}
/**
+ * @param string to decapitalize
+ */
+ private static String decapitalize(String string) {
+ if (string == null || string.length() == 0) {
+ return string;
+ }
+ char[] c = string.toCharArray();
+ c[0] = Character.toLowerCase(c[0]);
+ return new String(c);
+ }
+
+ /**
* ChangeCase Modes
*
* Modes for different cases
Modified: jmeter/trunk/test/src/org/apache/jmeter/functions/TestChangeCase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/functions/TestChangeCase.java?rev=1815851&r1=1815850&r2=1815851&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/functions/TestChangeCase.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/functions/TestChangeCase.java Mon Nov 20 20:34:10 2017
@@ -120,6 +120,15 @@ public class TestChangeCase extends JMet
assertEquals("abCDEF", returnValue);
}
+ @Test
+ public void testChangeCaseCamelCaseFirstLower2() throws Exception {
+ params.add(new CompoundVariable("Ab-CD eF"));
+ params.add(new CompoundVariable("camel_CASE_FIRST_LOWER"));
+ changeCase.setParameters(params);
+ String returnValue = changeCase.execute(result, null);
+ assertEquals("abCDEF", returnValue);
+ }
+
@Test(expected=InvalidVariableException.class)
public void testChangeCaseError() throws Exception {
changeCase.setParameters(params);