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:27:23 UTC
svn commit: r1815849 - 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:27:23 2017
New Revision: 1815849
URL: http://svn.apache.org/viewvc?rev=1815849&view=rev
Log:
Bug 61759 - New __changeCase function
Handle empty mode
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=1815849&r1=1815848&r2=1815849&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:27:23 2017
@@ -69,10 +69,13 @@ public class ChangeCase extends Abstract
@Override
public String execute(SampleResult previousResult, Sampler currentSampler) throws InvalidVariableException {
String originalString = values[0].execute();
- String mode = ChangeCaseMode.UPPER.getName(); // default
+ String mode = null; // default
if (values.length > 1) {
mode = values[1].execute();
}
+ if(StringUtils.isEmpty(mode)){
+ mode = ChangeCaseMode.UPPER.getName(); // default
+ }
String targetString = changeCase(originalString, mode);
addVariableValue(targetString, values, 2);
return targetString;
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=1815849&r1=1815848&r2=1815849&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:27:23 2017
@@ -125,6 +125,15 @@ public class TestChangeCase extends JMet
changeCase.setParameters(params);
changeCase.execute(result, null);
}
+
+ @Test
+ public void testEmptyMode() throws Exception {
+ params.add(new CompoundVariable("ab-CD eF"));
+ params.add(new CompoundVariable(""));
+ changeCase.setParameters(params);
+ String returnValue = changeCase.execute(result, null);
+ assertEquals("AB-CD EF", returnValue);
+ }
@Test
public void testChangeCaseWrongModeIgnore() throws Exception {