You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/01/03 17:54:52 UTC

svn commit: r608562 - /jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/

Author: sebb
Date: Thu Jan  3 08:54:46 2008
New Revision: 608562

URL: http://svn.apache.org/viewvc?rev=608562&view=rev
Log:
Use common parameter validation

Modified:
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
    jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java Thu Jan  3 08:54:46 2008
@@ -42,7 +42,7 @@
 
 	private static final Logger log = LoggingManager.getLoggerForClass();
 
-	private static final long serialVersionUID = 2L;
+	private static final long serialVersionUID = 232L;
 	
 	private static final List desc = new LinkedList();
 
@@ -141,11 +141,9 @@
 	 */
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
 
-		values = parameters.toArray();
+		checkParameterCount(parameters, 1, 2);
 
-		if (values.length < 1 || values.length > 2) {
-			throw new InvalidVariableException("Expecting 1 or 2 parameters, but found " + values.length);//$NON-NLS-1$
-		}
+		values = parameters.toArray();
 
 		try {
 			bshInterpreter = new BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE), log);

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java Thu Jan  3 08:54:46 2008
@@ -50,12 +50,12 @@
  * 
  * __CSVRead(*ONE,1); etc
  * 
- * 
- * @version $Revision$ Last Updated: $Date$
  */
 public class CSVRead extends AbstractFunction implements Serializable {
 	private static final Logger log = LoggingManager.getLoggerForClass();
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final String KEY = "__CSVRead"; // Function name //$NON-NLS-1$
 
 	private static final List desc = new LinkedList();
@@ -156,9 +156,7 @@
 			}
 		}
 
-		if (values.length != 2) {
-			throw new InvalidVariableException("Wrong number of parameters; 2 != " + values.length);
-		}
+		checkParameterCount(parameters, 2);
 
 		/*
 		 * Need to reset the containers for repeated runs; about the only way

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java Thu Jan  3 08:54:46 2008
@@ -40,7 +40,7 @@
  */
 public class EvalFunction extends AbstractFunction implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 232L;
 
 	private static final List desc = new LinkedList();
 
@@ -71,14 +71,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java Thu Jan  3 08:54:46 2008
@@ -40,7 +40,7 @@
  */
 public class EvalVarFunction extends AbstractFunction implements Serializable {
 
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 232L;
 
 	private static final List desc = new LinkedList();
 
@@ -73,14 +73,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java Thu Jan  3 08:54:46 2008
@@ -36,6 +36,8 @@
  */
 public class IntSum extends AbstractFunction implements Serializable {
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final List desc = new LinkedList();
 
 	private static final String KEY = "__intSum"; //$NON-NLS-1$
@@ -94,12 +96,8 @@
 	 * @see Function#setParameters(Collection)
 	 */
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
+		checkMinParameterCount(parameters, 3);
 		values = parameters.toArray();
-
-		if (values.length < 3) {
-			throw new InvalidVariableException();
-		}
-
 	}
 
 	/**

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java Thu Jan  3 08:54:46 2008
@@ -31,7 +31,7 @@
 
 public class IterationCounter extends AbstractFunction implements Serializable {
 
-	private static final long serialVersionUID = 2L;
+	private static final long serialVersionUID = 232L;
 	
 	private static final List desc = new LinkedList();
 
@@ -113,12 +113,8 @@
 	 * @see org.apache.jmeter.functions.Function#setParameters(Collection)
 	 */
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, 1, 2);
 		variables = parameters.toArray();
-
-		if (variables.length < 1 || variables.length > 2) {
-			throw new InvalidVariableException("Expecting 1 or 2 parameters, but found " + variables.length);//$NON-NLS-1$
-		}
 	}
 
 	/*

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java Thu Jan  3 08:54:46 2008
@@ -40,7 +40,7 @@
 
 public class JavaScript extends AbstractFunction implements Serializable {
 
-	private static final long serialVersionUID = 2L;
+	private static final long serialVersionUID = 232L;
 	
 	private static final List desc = new LinkedList();
 
@@ -120,13 +120,8 @@
 	 * @see org.apache.jmeter.functions.Function#setParameters(Collection)
 	 */
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, 1, 2);
 		values = parameters.toArray();
-
-		if (values.length < 1 || values.length > 2) {
-			throw new InvalidVariableException("Expecting 1 or 2 parameters, but found " + values.length);//$NON-NLS-1$
-		}
-
 	}
 
 	/*

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java Thu Jan  3 08:54:46 2008
@@ -37,10 +37,7 @@
  */
 public class JexlFunction extends AbstractFunction implements Serializable
 {
-    /**
-     * <code>serialVersionUID</code>
-     */
-    private static final long serialVersionUID = 3546359539474968625L;
+    private static final long serialVersionUID = 232L;
 
     private static Logger log = LoggingManager.getLoggerForClass();
 
@@ -100,11 +97,8 @@
     public synchronized void setParameters(Collection parameters)
             throws InvalidVariableException
     {
+		checkParameterCount(parameters, 1);
         values = parameters.toArray();
-        if (values.length != 1)
-        {
-            throw new InvalidVariableException("it only accepts one parameter");
-        }
     }
 
 }

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java Thu Jan  3 08:54:46 2008
@@ -51,6 +51,8 @@
 public class LogFunction extends AbstractFunction implements Serializable {
 	private static Logger log = LoggingManager.getLoggerForClass();
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final List desc = new LinkedList();
 
 	private static final String KEY = "__log"; //$NON-NLS-1$
@@ -161,14 +163,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java Thu Jan  3 08:54:46 2008
@@ -49,6 +49,8 @@
 public class LogFunction2 extends AbstractFunction implements Serializable {
 	private static Logger log = LoggingManager.getLoggerForClass();
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final List desc = new LinkedList();
 
 	private static final String KEY = "__logn"; //$NON-NLS-1$
@@ -99,14 +101,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java Thu Jan  3 08:54:46 2008
@@ -35,6 +35,8 @@
  */
 public class LongSum extends AbstractFunction implements Serializable {
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final List desc = new LinkedList();
 
 	private static final String KEY = "__longSum"; //$NON-NLS-1$
@@ -93,12 +95,8 @@
 	 * @see Function#setParameters(Collection)
 	 */
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
+		checkMinParameterCount(parameters, 3);
 		values = parameters.toArray();
-
-		if (values.length < 3) {
-			throw new InvalidVariableException();
-		}
-
 	}
 
 	/**

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java Thu Jan  3 08:54:46 2008
@@ -44,7 +44,7 @@
  */
 public class Property extends AbstractFunction implements Serializable {
 
-	private static final long serialVersionUID = 2L;
+	private static final long serialVersionUID = 232L;
 	
 	private static final List desc = new LinkedList();
 
@@ -88,14 +88,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java Thu Jan  3 08:54:46 2008
@@ -50,6 +50,8 @@
  */
 public class Property2 extends AbstractFunction implements Serializable {
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final List desc = new LinkedList();
 
 	private static final String KEY = "__P"; //$NON-NLS-1$
@@ -88,14 +90,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java Thu Jan  3 08:54:46 2008
@@ -36,7 +36,7 @@
  */
 public class Random extends AbstractFunction implements Serializable {
 
-	private static final long serialVersionUID = 2L;
+	private static final long serialVersionUID = 232L;
 	
 	private static final List desc = new LinkedList();
 
@@ -91,11 +91,8 @@
 	 * @see Function#setParameters(Collection)
 	 */
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
+		checkParameterCount(parameters, 2, 3);
 		Object[] values = parameters.toArray();
-
-		if (values.length < 2 || values.length > 3) {
-			throw new InvalidVariableException("Expecting 2 or 3 parameters, but found " + values.length);//$NON-NLS-1$
-		}
 
 		minimum = (CompoundVariable) values[0];
 		maximum = (CompoundVariable) values[1];

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java Thu Jan  3 08:54:46 2008
@@ -45,7 +45,7 @@
 public class RegexFunction extends AbstractFunction implements Serializable {
 	private static final Logger log = LoggingManager.getLoggerForClass();
 
-	private static final long serialVersionUID = 1L;
+	private static final long serialVersionUID = 232L;
 	
 	public static final String ALL = "ALL"; //$NON-NLS-1$
 
@@ -217,14 +217,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count " //$NON-NLS-1$
-					+ values.length + " not between " //$NON-NLS-1$
-					+ MIN_PARAMETER_COUNT + " & " //$NON-NLS-1$
-					+ MAX_PARAMETER_COUNT);
-		}
 	}
 
 	private Object[] generateTemplate(String rawTemplate) {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java Thu Jan  3 08:54:46 2008
@@ -43,6 +43,8 @@
  */
 public class SetProperty extends AbstractFunction implements Serializable {
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final List desc = new LinkedList();
 
 	private static final String KEY = "__setProperty"; //$NON-NLS-1$
@@ -86,14 +88,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java Thu Jan  3 08:54:46 2008
@@ -41,11 +41,12 @@
  * 
  * Returns: - the input string
  * 
- * @version $Revision$ Updated: $Date$
  */
 public class SplitFunction extends AbstractFunction implements Serializable {
 	private static Logger log = LoggingManager.getLoggerForClass();
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final List desc = new LinkedList();
 
 	private static final String KEY = "__split";// $NON-NLS-1$
@@ -99,14 +100,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java Thu Jan  3 08:54:46 2008
@@ -63,7 +63,7 @@
 public class StringFromFile extends AbstractFunction implements Serializable, TestListener {
 	private static final Logger log = LoggingManager.getLoggerForClass();
 
-	private static final long serialVersionUID = 2L;
+	private static final long serialVersionUID = 232L;
 	
 	private static final List desc = new LinkedList();
 
@@ -306,12 +306,8 @@
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
 
 		log.debug(this + "::StringFromFile.setParameters()");//$NON-NLS-1$
-
+		checkParameterCount(parameters, MIN_PARAM_COUNT, MAX_PARAM_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length > MAX_PARAM_COUNT) || (values.length < MIN_PARAM_COUNT)) {
-			throw new InvalidVariableException("Wrong number of parameters");//$NON-NLS-1$
-		}
 
 		StringBuffer sb = new StringBuffer(40);
 		sb.append("setParameters(");//$NON-NLS-1$

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java Thu Jan  3 08:54:46 2008
@@ -41,6 +41,8 @@
  */
 public class Variable extends AbstractFunction implements Serializable {
 
+	private static final long serialVersionUID = 232L;
+	
 	private static final List desc = new LinkedList();
 
 	private static final String KEY = "__V"; //$NON-NLS-1$
@@ -71,14 +73,8 @@
 	}
 
 	public synchronized void setParameters(Collection parameters) throws InvalidVariableException {
-
+		checkParameterCount(parameters, MIN_PARAMETER_COUNT, MAX_PARAMETER_COUNT);
 		values = parameters.toArray();
-
-		if ((values.length < MIN_PARAMETER_COUNT) || (values.length > MAX_PARAMETER_COUNT)) {
-			throw new InvalidVariableException("Parameter Count not between " + MIN_PARAMETER_COUNT + " & "
-					+ MAX_PARAMETER_COUNT);
-		}
-
 	}
 
 	public String getReferenceKey() {

Modified: jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java?rev=608562&r1=608561&r2=608562&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java (original)
+++ jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java Thu Jan  3 08:54:46 2008
@@ -48,6 +48,8 @@
 public class XPath extends AbstractFunction implements Serializable {
 	private static final Logger log = LoggingManager.getLoggerForClass();
 
+	private static final long serialVersionUID = 232L;
+	
 	// static {
 	// LoggingManager.setPriority("DEBUG","jmeter");
 	// LoggingManager.setTarget(new java.io.PrintWriter(System.out));
@@ -121,9 +123,7 @@
 			}
 		}
 
-		if (values.length != 2) {
-			throw new InvalidVariableException("Wrong number of parameters; 2 != " + values.length);
-		}
+		checkParameterCount(parameters, 2);
 
 		/*
 		 * Need to reset the containers for repeated runs; about the only way



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org