This is an automated email from the ASF dual-hosted git repository.
vladimirsitnikov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new 8b25820e67 Fixed Typo in error message #6335 Issue
8b25820e67 is described below
commit 8b25820e672b7719a7f2c92e00dfd196ec5e340c
Author: Jitesh Kumar Raghav <[email protected]>
AuthorDate: Thu Sep 12 14:03:41 2024 +0530
Fixed Typo in error message #6335 Issue
---
bin/testfiles/JDBC_TESTS.csv | 2 +-
bin/testfiles/JDBC_TESTS.jmx | 10 +++++-----
bin/testfiles/JDBC_TESTS.xml | 2 +-
.../apache/jmeter/protocol/jdbc/config/DataSourceElement.java | 2 +-
.../jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java | 2 +-
.../org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java | 2 +-
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/bin/testfiles/JDBC_TESTS.csv b/bin/testfiles/JDBC_TESTS.csv
index a2a5485897..ba56666ef6 100644
--- a/bin/testfiles/JDBC_TESTS.csv
+++ b/bin/testfiles/JDBC_TESTS.csv
@@ -23,7 +23,7 @@ JDBC_SELECT_LIMIT_RESULTSET_1,200,OK,TG-OK
1-1,text,true,1,1,1,0
JDBC_SELECT_LIMIT_RESULTSET_2,200,OK,TG-OK 1-1,text,true,1,1,1,0
JDBC_SELECT_LIMIT_RESULTSET_3,200,OK,TG-OK 1-1,text,true,1,1,1,0
JDBC_SELECT_LIMIT_RESULTSET_4,200,OK,TG-OK 1-1,text,true,1,1,1,0
-JDBC_NoConfig,000,java.lang.IllegalArgumentException: Name for DataSoure must
not be empty in JDBC_NoConfig,TG-Errors 2-1,text,true,1,1,1,0
+JDBC_NoConfig,000,java.lang.IllegalArgumentException: Name for DataSource must
not be empty in JDBC_NoConfig,TG-Errors 2-1,text,true,1,1,1,0
JDBC_Wrong_Sql,42581 -5581,java.sql.SQLSyntaxErrorException: unexpected token:
WHERE,TG-Errors 2-1,text,true,1,1,1,0
JDBC_With_Failing_PreProcessor,200,OK,TG-Errors 2-1,text,true,1,1,1,0
JDBC_With_Failing_PostProcessor,200,OK,TG-Errors 2-1,text,true,1,1,1,0
diff --git a/bin/testfiles/JDBC_TESTS.jmx b/bin/testfiles/JDBC_TESTS.jmx
index c59e13ef39..ff1705a823 100644
--- a/bin/testfiles/JDBC_TESTS.jmx
+++ b/bin/testfiles/JDBC_TESTS.jmx
@@ -67,7 +67,7 @@ def user = 'SA'
def password = ''
def driver = 'org.hsqldb.jdbcDriver'
def sql = Sql.newInstance(url, user, password, driver)
-def row = sql.firstRow('select count(*) from
INFORMATION_SCHEMA.system_sessions')
+def row = sql.firstRow('select count(*) from
INFORMATION_SCHEMA.system_sessions')
def sessionNum = row[0]
try {
@@ -164,7 +164,7 @@ sql.close()
title VARCHAR(50) NOT NULL,
author VARCHAR(20) NOT NULL,
submission_date DATE,
- PRIMARY KEY (id)
+ PRIMARY KEY (id)
);
</stringProp>
@@ -196,7 +196,7 @@ sql.close()
BEGIN ATOMIC
DECLARE result CURSOR FOR SELECT * FROM USERS WHERE ID = IDENTITY();
INSERT INTO USERS VALUES (DEFAULT, title, author, CURRENT_DATE);
- OPEN result;
+ OPEN result;
END ;</stringProp>
<stringProp name="queryArguments"></stringProp>
<stringProp name="queryArgumentsTypes"></stringProp>
@@ -225,7 +225,7 @@ sql.close()
MODIFIES SQL DATA DYNAMIC RESULT SETS 1
BEGIN ATOMIC
DECLARE result CURSOR FOR SELECT * FROM USERS order by id FOR READ ONLY;
- OPEN result;
+ OPEN result;
END ;</stringProp>
<stringProp name="queryArguments"></stringProp>
<stringProp name="queryArgumentsTypes"></stringProp>
@@ -1284,7 +1284,7 @@ if (list.size()==3) {
<hashTree>
<ResponseAssertion guiclass="AssertionGui"
testclass="ResponseAssertion" testname="Response Assertion" enabled="true">
<collectionProp name="Asserion.test_strings">
- <stringProp name="-1643270117">Name for DataSoure must not be
empty in JDBC_NoConfig</stringProp>
+ <stringProp name="-1643270117">Name for DataSource must not be
empty in JDBC_NoConfig</stringProp>
</collectionProp>
<stringProp
name="Assertion.test_field">Assertion.response_message</stringProp>
<boolProp name="Assertion.assume_success">true</boolProp>
diff --git a/bin/testfiles/JDBC_TESTS.xml b/bin/testfiles/JDBC_TESTS.xml
index bf938f4909..4b9b302150 100644
--- a/bin/testfiles/JDBC_TESTS.xml
+++ b/bin/testfiles/JDBC_TESTS.xml
@@ -340,7 +340,7 @@
<error>false</error>
</assertionResult>
</sample>
-<sample s="true" lb="JDBC_NoConfig" rc="000"
rm="java.lang.IllegalArgumentException: Name for DataSoure must not be empty in
JDBC_NoConfig" tn="TG-Errors 2-1" dt="text" sc="1" ec="0" ng="1" na="1">
+<sample s="true" lb="JDBC_NoConfig" rc="000"
rm="java.lang.IllegalArgumentException: Name for DataSource must not be empty
in JDBC_NoConfig" tn="TG-Errors 2-1" dt="text" sc="1" ec="0" ng="1" na="1">
<assertionResult>
<name>Response Assertion</name>
<failure>false</failure>
diff --git
a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
index 703c5143cb..ed6a7cfc73 100644
---
a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
+++
b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
@@ -116,7 +116,7 @@ public class DataSourceElement extends AbstractTestElement
JMeterVariables variables = getThreadContext().getVariables();
String poolName = getDataSource();
if (JOrphanUtils.isBlank(poolName)) {
- throw new IllegalArgumentException("Name for DataSoure must not be
empty in " + getName());
+ throw new IllegalArgumentException("Name for DataSource must not
be empty in " + getName());
} else if (variables.getObject(poolName) != null) {
log.error("JDBC data source already defined for: {}", poolName);
} else {
diff --git
a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
index c8de760343..53dfb4072a 100644
---
a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
+++
b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
@@ -41,7 +41,7 @@ public abstract class AbstractJDBCProcessor extends
AbstractJDBCTestElement {
*/
protected void process() {
if (JOrphanUtils.isBlank(getDataSource())) {
- throw new IllegalArgumentException("Name for DataSoure must not be
empty in " + getName());
+ throw new IllegalArgumentException("Name for DataSource must not
be empty in " + getName());
}
try (Connection conn =
DataSourceElement.getConnection(getDataSource())){
execute(conn);
diff --git
a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
index 7c23db03a8..81bdae0649 100644
---
a/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
+++
b/src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
@@ -74,7 +74,7 @@ public class JDBCSampler extends AbstractJDBCTestElement
implements Sampler, Tes
try {
String dataSource = getDataSource();
if (JOrphanUtils.isBlank(dataSource)) {
- throw new IllegalArgumentException("Name for DataSoure must
not be empty in " + getName());
+ throw new IllegalArgumentException("Name for DataSource must
not be empty in " + getName());
}
try {
