Skip to content

Commit

Permalink
Merge branch 'apache:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@dgetzlaf
dgetzlaf authored Sep 27, 2024
2 parents c0dd06c + 90f6998 commit 2dd1d4d
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion bin/testfiles/JDBC_TESTS.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 5 additions & 5 deletions bin/testfiles/JDBC_TESTS.jmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion bin/testfiles/JDBC_TESTS.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions bin/testfiles/ResponseDecompression.jmx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,8 @@
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
<stringProp name="HTTPSampler.path">/</stringProp>
<stringProp name="HTTPSampler.method">GET</stringProp>
<boolProp name="HTTPSampler.follow_redirects">true</boolProp>
<boolProp name="HTTPSampler.auto_redirects">false</boolProp>
<boolProp name="HTTPSampler.follow_redirects">false</boolProp>
<boolProp name="HTTPSampler.auto_redirects">true</boolProp>
<boolProp name="HTTPSampler.use_keepalive">true</boolProp>
<boolProp name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
<stringProp name="HTTPSampler.embedded_url_re"></stringProp>
Expand Down
4 changes: 2 additions & 2 deletions src/core/src/main/java/org/apache/jmeter/JMeter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1040,7 +1040,7 @@ void runNonGui(String testFile, String logFile, boolean remoteStart, String remo
testListener.setStartedRemoteEngines(engines);
distributedRunner.start();
}
startUdpDdaemon(engines);
startUdpDaemon(engines);
} catch (ConfigurationException e) {
throw e;
} catch (Exception e) {
Expand Down Expand Up @@ -1379,7 +1379,7 @@ public static boolean isNonGUI(){
return "true".equals(System.getProperty(JMeter.JMETER_NON_GUI)); //$NON-NLS-1$
}

private static void startUdpDdaemon(final List<? extends JMeterEngine> engines) {
private static void startUdpDaemon(final List<? extends JMeterEngine> engines) {
int port = JMeterUtils.getPropDefault("jmeterengine.nongui.port", UDP_PORT_DEFAULT); // $NON-NLS-1$
int maxPort = JMeterUtils.getPropDefault("jmeterengine.nongui.maxport", 4455); // $NON-NLS-1$
if (port > 1000){
Expand Down
2 changes: 1 addition & 1 deletion ...protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ public void testStarted() {
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 {
Expand Down
2 changes: 1 addition & 1 deletion ...l/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/processor/AbstractJDBCProcessor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/protocol/jdbc/src/main/java/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public SampleResult sample(Entry e) {
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 {
Expand Down

0 comments on commit 2dd1d4d

Please sign in to comment.