You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2015/09/26 16:41:49 UTC
svn commit: r1705470 - in /jmeter/trunk: bin/
src/components/org/apache/jmeter/assertions/
src/components/org/apache/jmeter/assertions/gui/
test/src/org/apache/commons/cli/avalon/
test/src/org/apache/jmeter/assertions/
Author: fschumacher
Date: Sat Sep 26 14:41:49 2015
New Revision: 1705470
URL: http://svn.apache.org/viewvc?rev=1705470&view=rev
Log:
Fix some mis-spellings. Patch provided by Graham Russell.
Bugzilla Id: 57110
Modified:
jmeter/trunk/bin/jmeter
jmeter/trunk/bin/jmeter.sh
jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java
Modified: jmeter/trunk/bin/jmeter
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Sat Sep 26 14:41:49 2015
@@ -27,7 +27,7 @@
# Minimal version to run JMeter
MINIMAL_VERSION=1.7.0
-# Check if Java is present and the minimal version requierement
+# Check if Java is present and the minimal version requirement
_java=`type java | awk '{ print $ NF }'`
CURRENT_VERSION=`"$_java" -version 2>&1 | awk -F'"' '/version/ {print $2}'`
minimal_version=`echo $MINIMAL_VERSION | awk -F'.' '{ print $2 }'`
@@ -85,7 +85,7 @@ PRGDIR=`dirname "$PRG"`
# Life length: for the life of the JVM.
# This is the base heap size -- you may increase or decrease it to fit your
-# system's memory availablity:
+# system's memory availability:
HEAP="-Xms512m -Xmx512m"
# There's an awful lot of per-sample objects allocated during test run, so we
Modified: jmeter/trunk/bin/jmeter.sh
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.sh?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.sh (original)
+++ jmeter/trunk/bin/jmeter.sh Sat Sep 26 14:41:49 2015
@@ -30,7 +30,7 @@
# Minimal version to run JMeter
MINIMAL_VERSION=1.7.0
-# Check if Java is present and the minimal version requierement
+# Check if Java is present and the minimal version requirement
_java=`type java | awk '{ print $ NF }'`
CURRENT_VERSION=`"$_java" -version 2>&1 | awk -F'"' '/version/ {print $2}'`
minimal_version=`echo $MINIMAL_VERSION | awk -F'.' '{ print $2 }'`
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/DurationAssertion.java Sat Sep 26 14:41:49 2015
@@ -33,11 +33,11 @@ import org.apache.jmeter.util.JMeterUtil
public class DurationAssertion extends AbstractScopedAssertion implements Serializable, Assertion {
private static final long serialVersionUID = 240L;
- /** Key for storing assertion-informations in the jmx-file. */
+ /** Key for storing assertion-information in the jmx-file. */
public static final String DURATION_KEY = "DurationAssertion.duration"; // $NON-NLS-1$
/**
- * Returns the result of the Assertion. Here it checks wether the Sample
+ * Returns the result of the Assertion. Here it checks whether the Sample
* took to long to be considered successful. If so an AssertionResult
* containing a FailureMessage will be returned. Otherwise the returned
* AssertionResult will reflect the success of the Sample.
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java Sat Sep 26 14:41:49 2015
@@ -221,7 +221,7 @@ public class HTMLAssertion extends Abstr
/**
* Gets the doctype
*
- * @return the documemt type
+ * @return the document type
*/
public String getDoctype() {
return getPropertyAsString(DOCTYPE_KEY);
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/MD5HexAssertion.java Sat Sep 26 14:41:49 2015
@@ -44,7 +44,7 @@ public class MD5HexAssertion extends Abs
private static final Logger log = LoggingManager.getLoggerForClass();
- /** Key for storing assertion-informations in the jmx-file. */
+ /** Key for storing assertion-information in the jmx-file. */
private static final String MD5HEX_KEY = "MD5HexAssertion.size";
/*
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java Sat Sep 26 14:41:49 2015
@@ -72,8 +72,8 @@ public class SMIMEAssertionTestElement e
return getPropertyAsString(ISSUER_DN_KEY);
}
- public void setIssuerDn(String issuertDn) {
- setProperty(ISSUER_DN_KEY, issuertDn);
+ public void setIssuerDn(String issuerDn) {
+ setProperty(ISSUER_DN_KEY, issuerDn);
}
public boolean isSignerCheckByFile() {
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java Sat Sep 26 14:41:49 2015
@@ -36,7 +36,7 @@ public class SizeAssertion extends Abstr
private static final long serialVersionUID = 241L;
- // * Static int to signify the type of logical comparitor to assert
+ // Static int to signify the type of logical comparator to assert
public static final int EQUAL = 1;
public static final int NOTEQUAL = 2;
@@ -49,7 +49,7 @@ public class SizeAssertion extends Abstr
public static final int LESSTHANEQUAL = 6;
- /** Key for storing assertion-informations in the jmx-file. */
+ /** Key for storing assertion-information in the jmx-file. */
private static final String SIZE_KEY = "SizeAssertion.size"; // $NON-NLS-1$
private static final String OPERATOR_KEY = "SizeAssertion.operator"; // $NON-NLS-1$
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLAssertion.java Sat Sep 26 14:41:49 2015
@@ -48,7 +48,7 @@ public class XMLAssertion extends Abstra
};
/**
- * Returns the result of the Assertion. Here it checks wether the Sample
+ * Returns the result of the Assertion. Here it checks whether the Sample
* took to long to be considered successful. If so an AssertionResult
* containing a FailureMessage will be returned. Otherwise the returned
* AssertionResult will reflect the success of the Sample.
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java Sat Sep 26 14:41:49 2015
@@ -195,7 +195,7 @@ public class XPathAssertion extends Abst
}
/**
- * Is this whitepsace ignored.
+ * Is this whitespace ignored.
*
* @return boolean
*/
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java Sat Sep 26 14:41:49 2015
@@ -220,7 +220,7 @@ public class HTMLAssertionGui extends Ab
docTypePanel.add(docTypeBox);
assertionPanel.add(docTypePanel);
- // format (HMTL, XHTML, XML)
+ // format (HTML, XHTML, XML)
VerticalPanel formatPanel = new VerticalPanel();
formatPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(), "Format"));
htmlRadioButton = new JRadioButton("HTML", true); //$NON-NLS-1$
@@ -318,7 +318,7 @@ public class HTMLAssertionGui extends Ab
}
/**
- * This method is called from erros-only checkbox
+ * This method is called from errors-only checkbox
*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
Modified: jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java (original)
+++ jmeter/trunk/test/src/org/apache/commons/cli/avalon/ClutilTestCase.java Sat Sep 26 14:41:49 2015
@@ -37,7 +37,7 @@ public final class ClutilTestCase extend
"-Dstupid=idiot", "are", "--all", "--all", "here" };
private static final String[] ARGLIST4 = new String[] {
- // incompatable (blee/all)
+ // incompatible (blee/all)
"-Dstupid", "idiot", "are", "--all", "--blee", "here" };
private static final String[] ARGLIST5 = new String[] { "-f", "myfile.txt" };
@@ -188,7 +188,7 @@ public final class ClutilTestCase extend
public void testOptionalArgLongEquals() {
final CLOptionDescriptor[] options = new CLOptionDescriptor[] { ALL, TAINT };
- // Check that optional args work woth long options
+ // Check that optional args work with long options
final String[] args = new String[] { "--taint=param", "-a" };
final CLArgsParser parser = new CLArgsParser(args, options);
Modified: jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java?rev=1705470&r1=1705469&r2=1705470&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/assertions/SizeAssertionTest.java Sat Sep 26 14:41:49 2015
@@ -158,7 +158,7 @@ public class SizeAssertionTest extends J
}
private void assertFailed() throws Exception{
- assertNotNull("Failure nessage should not be null",result.getFailureMessage());
+ assertNotNull("Failure message should not be null",result.getFailureMessage());
//System.out.println(result.getFailureMessage());
assertFalse("Should not be: Response was null","Response was null".equals(result.getFailureMessage()));
assertFalse(result.isError());