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/03/04 15:01:54 UTC
svn commit: r1785497 - in /jmeter/trunk:
src/functions/org/apache/jmeter/functions/FileToString.java
test/src/org/apache/jmeter/functions/TestFileToString.java xdocs/changes.xml
Author: pmouawad
Date: Sat Mar 4 15:01:54 2017
New Revision: 1785497
URL: http://svn.apache.org/viewvc?rev=1785497&view=rev
Log:
Bug 60819 - Function __fileToString does not honor the documentation contract when file is not found
Add JUnit for function
Bugzilla Id: 60819
Added:
jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileToString.java (with props)
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java?rev=1785497&r1=1785496&r2=1785497&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java Sat Mar 4 15:01:54 2017
@@ -99,10 +99,14 @@ public class FileToString extends Abstra
String myValue = ERR_IND;
try {
- myValue = FileUtils.readFileToString(new File(fileName), encoding);
+ File file = new File(fileName);
+ if(file.exists() && file.canRead()) {
+ myValue = FileUtils.readFileToString(new File(fileName), encoding);
+ } else {
+ log.warn("Could not read open: "+fileName+" ");
+ }
} catch (IOException e) {
log.warn("Could not read file: "+fileName+" "+e.getMessage(), e);
- throw new JMeterStopThreadException("End of sequence", e);
}
if (myName.length() > 0) {
Added: jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileToString.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileToString.java?rev=1785497&view=auto
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileToString.java (added)
+++ jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileToString.java Sat Mar 4 15:01:54 2017
@@ -0,0 +1,100 @@
+/*
+ * 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.functions;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Collection;
+import java.util.LinkedList;
+
+import org.apache.jmeter.engine.util.CompoundVariable;
+import org.apache.jmeter.junit.JMeterTestCase;
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.threads.JMeterContext;
+import org.apache.jmeter.threads.JMeterContextService;
+import org.apache.jmeter.threads.JMeterVariables;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class TestFileToString extends JMeterTestCase {
+ protected AbstractFunction function;
+
+ private SampleResult result;
+
+ private Collection<CompoundVariable> params;
+
+ private JMeterVariables vars;
+
+ private JMeterContext jmctx;
+
+ @Before
+ public void setUp() {
+ function = new FileToString();
+ result = new SampleResult();
+ jmctx = JMeterContextService.getContext();
+ String data = "The quick brown fox";
+ result.setResponseData(data, null);
+ vars = new JMeterVariables();
+ jmctx.setVariables(vars);
+ jmctx.setPreviousResult(result);
+ params = new LinkedList<>();
+ }
+
+ @Test
+ public void testParameterCount() throws Exception {
+ checkInvalidParameterCounts(function, 1, 3);
+ }
+
+ @Test
+ public void testReadError() throws Exception {
+ params.add(new CompoundVariable("nofile"));
+ function.setParameters(params);
+ String returnValue = function.execute(result, null);
+ assertEquals("**ERR**", returnValue);
+ }
+
+ @Test
+ public void testRead() throws Exception {
+ params.add(new CompoundVariable("bin/jmeter.properties"));
+ function.setParameters(params);
+ String returnValue = function.execute(result, null);
+ Assert.assertTrue(returnValue.indexOf("language=")>0);
+ }
+
+ @Test
+ public void testReadWithEncoding() throws Exception {
+ params.add(new CompoundVariable("bin/jmeter.properties"));
+ params.add(new CompoundVariable("UTF-8"));
+ function.setParameters(params);
+ String returnValue = function.execute(result, null);
+ Assert.assertTrue(returnValue.indexOf("language=")>0);
+ }
+
+ @Test
+ public void testReadWithEncodingAndVar() throws Exception {
+ params.add(new CompoundVariable("bin/jmeter.properties"));
+ params.add(new CompoundVariable("UTF-8"));
+ params.add(new CompoundVariable("MY_FILE_AS_TEXT"));
+ function.setParameters(params);
+ String returnValue = function.execute(result, null);
+ Assert.assertTrue(returnValue.indexOf("language=")>0);
+ Assert.assertTrue(vars.get("MY_FILE_AS_TEXT").indexOf("language=")>0);
+ }
+}
\ No newline at end of file
Propchange: jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileToString.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/test/src/org/apache/jmeter/functions/TestFileToString.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1785497&r1=1785496&r2=1785497&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Mar 4 15:01:54 2017
@@ -313,6 +313,7 @@ This affects configuration and 3rd party
<h3>Functions</h3>
<ul>
+ <li><bug>60819</bug>Function __fileToString does not honor the documentation contract when file is not found</li>
</ul>
<h3>I18N</h3>