Author: pmouawad
Date: Thu Feb 2 22:10:45 2017
New Revision: 1781476
URL: http://svn.apache.org/viewvc?rev=1781476&view=rev
Log:
Bug 54525 Search Feature : Enhance it with ability to replace
Bugzilla Id: 54525
Added:
jmeter/trunk/test/src/org/apache/jmeter/testelement/TestHeaderManager.java
(with props)
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java?rev=1781476&r1=1781475&r2=1781476&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java
Thu Feb 2 22:10:45 2017
@@ -29,7 +29,9 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.config.ConfigTestElement;
+import org.apache.jmeter.gui.Replaceable;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -40,7 +42,7 @@ import org.apache.jorphan.util.JOrphanUt
* with a request.
*
*/
-public class HeaderManager extends ConfigTestElement implements Serializable {
+public class HeaderManager extends ConfigTestElement implements Serializable,
Replaceable {
private static final long serialVersionUID = 240L;
@@ -280,4 +282,26 @@ public class HeaderManager extends Confi
return merged;
}
+
+ @Override
+ public int replace(String regex, String replaceBy, boolean caseSensitive)
throws Exception {
+ final CollectionProperty hdrs = getHeaders();
+ int totalReplaced = 0;
+ for (int i = 0; i < hdrs.size(); i++) {
+ final JMeterProperty hdr = hdrs.get(i);
+ Header head = (Header) hdr.getObjectValue();
+ String value = head.getValue();
+ if(!StringUtils.isEmpty(value)) {
+ Object[] result = JOrphanUtils.replaceAllWithRegex(value,
regex, replaceBy, caseSensitive);
+ // check if there is anything to replace
+ int nbReplaced = ((Integer)result[1]).intValue();
+ if (nbReplaced>0) {
+ String replacedText = (String) result[0];
+ head.setValue(replacedText);
+ totalReplaced += nbReplaced;
+ }
+ }
+ }
+ return totalReplaced;
+ }
}
Added:
jmeter/trunk/test/src/org/apache/jmeter/testelement/TestHeaderManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/testelement/TestHeaderManager.java?rev=1781476&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/testelement/TestHeaderManager.java
(added)
+++ jmeter/trunk/test/src/org/apache/jmeter/testelement/TestHeaderManager.java
Thu Feb 2 22:10:45 2017
@@ -0,0 +1,82 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.testelement;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.jmeter.junit.JMeterTestCase;
+import org.apache.jmeter.protocol.http.control.Header;
+import org.apache.jmeter.protocol.http.control.HeaderManager;
+import org.junit.Test;
+
+public class TestHeaderManager extends JMeterTestCase {
+ @Test
+ public void testReplace() throws Exception {
+ HeaderManager headerManager = new HeaderManager();
+ headerManager.add(new Header("Referer",
"https://jmeter.apache.org/changes.html";));
+ headerManager.add(new Header("JSESSIONID",
"AZAZDZDAFEFZEVZEZEVZEVZEVZZ"));
+
+ int numberOfReplacements = headerManager.replace("jmeter.apache.org",
"${host}", true);
+
+ assertEquals(1, numberOfReplacements);
+ assertEquals("Referer", headerManager.getHeader(0).getName());
+ assertEquals("JSESSIONID", headerManager.getHeader(1).getName());
+ assertEquals("https://${host}/changes.html";,
headerManager.getHeader(0).getValue());
+ assertEquals("AZAZDZDAFEFZEVZEZEVZEVZEVZZ",
headerManager.getHeader(1).getValue());
+
+ headerManager = new HeaderManager();
+ headerManager.add(new Header("Referer",
"https://JMeter.apache.org/changes.html";));
+ headerManager.add(new Header("JSESSIONID",
"AZAZDZDAFEFZEVZEZEVZEVZEVZZ"));
+
+ numberOfReplacements = headerManager.replace("jmeter.apache.org",
"${host}", false);
+
+ assertEquals(1, numberOfReplacements);
+ assertEquals("Referer", headerManager.getHeader(0).getName());
+ assertEquals("JSESSIONID", headerManager.getHeader(1).getName());
+ assertEquals("https://${host}/changes.html";,
headerManager.getHeader(0).getValue());
+ assertEquals("AZAZDZDAFEFZEVZEZEVZEVZEVZZ",
headerManager.getHeader(1).getValue());
+ }
+
+ @Test
+ public void testReplaceNoMatch() throws Exception {
+ HeaderManager headerManager = new HeaderManager();
+ headerManager.add(new Header("Referer",
"https://jmeter.apache.org/changes.html";));
+ headerManager.add(new Header("JSESSIONID",
"AZAZDZDAFEFZEVZEZEVZEVZEVZZ"));
+
+ int numberOfReplacements = headerManager.replace("JMeter.apache.org",
"${host}", true);
+
+ assertEquals(0, numberOfReplacements);
+ assertEquals("Referer", headerManager.getHeader(0).getName());
+ assertEquals("JSESSIONID", headerManager.getHeader(1).getName());
+ assertEquals("https://jmeter.apache.org/changes.html";,
headerManager.getHeader(0).getValue());
+ assertEquals("AZAZDZDAFEFZEVZEZEVZEVZEVZZ",
headerManager.getHeader(1).getValue());
+
+ headerManager = new HeaderManager();
+ headerManager.add(new Header("Referer",
"https://jmeter.apache.org/changes.html";));
+ headerManager.add(new Header("JSESSIONID",
"AZAZDZDAFEFZEVZEZEVZEVZEVZZ"));
+
+ numberOfReplacements = headerManager.replace("JMeterx.apache.org",
"${host}", false);
+
+ assertEquals(0, numberOfReplacements);
+ assertEquals("Referer", headerManager.getHeader(0).getName());
+ assertEquals("JSESSIONID", headerManager.getHeader(1).getName());
+ assertEquals("https://jmeter.apache.org/changes.html";,
headerManager.getHeader(0).getValue());
+ assertEquals("AZAZDZDAFEFZEVZEZEVZEVZEVZZ",
headerManager.getHeader(1).getValue());
+ }
+}
Propchange:
jmeter/trunk/test/src/org/apache/jmeter/testelement/TestHeaderManager.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
