diff --git a/bin/testfiles/FTP_TESTS.csv b/bin/testfiles/FTP_TESTS.csv index 6d10746777e..007233199b2 100644 --- a/bin/testfiles/FTP_TESTS.csv +++ b/bin/testfiles/FTP_TESTS.csv @@ -1,5 +1,5 @@ label,responseCode,responseMessage,threadName,dataType,success,grpThreads,allThreads,SampleCount,ErrorCount -BSS_startFtpServer,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 +BSS_startFtpServer,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 FTP Request-get-binary,200,OK,TG-FTP 1-1,,true,1,1,1,0 FTP Request-get-text,200,OK,TG-FTP 1-1,text,true,1,1,1,0 FTP Request-put-text,200,OK,TG-FTP 1-1,,true,1,1,1,0 diff --git a/bin/testfiles/FTP_TESTS.jmx b/bin/testfiles/FTP_TESTS.jmx index 371a7d09c33..10eb2007b46 100644 --- a/bin/testfiles/FTP_TESTS.jmx +++ b/bin/testfiles/FTP_TESTS.jmx @@ -48,7 +48,7 @@ false - + stoptest false diff --git a/bin/testfiles/FTP_TESTS.xml b/bin/testfiles/FTP_TESTS.xml index 9c3015fab88..973c72543cc 100644 --- a/bin/testfiles/FTP_TESTS.xml +++ b/bin/testfiles/FTP_TESTS.xml @@ -1,6 +1,6 @@ - + Response Assertion diff --git a/bin/testfiles/GenTest210.jmx b/bin/testfiles/GenTest210.jmx index 125a230701f..f206ea7a33a 100644 --- a/bin/testfiles/GenTest210.jmx +++ b/bin/testfiles/GenTest210.jmx @@ -11,7 +11,7 @@ - + continue false diff --git a/bin/testfiles/GenTest25.jmx b/bin/testfiles/GenTest25.jmx index e20950868cd..020d46d92f5 100644 --- a/bin/testfiles/GenTest25.jmx +++ b/bin/testfiles/GenTest25.jmx @@ -11,7 +11,7 @@ - + continue false diff --git a/bin/testfiles/GenTest251.jmx b/bin/testfiles/GenTest251.jmx index f6d1bd50f94..1dbde84600e 100644 --- a/bin/testfiles/GenTest251.jmx +++ b/bin/testfiles/GenTest251.jmx @@ -11,7 +11,7 @@ - + continue false diff --git a/bin/testfiles/GenTest26.jmx b/bin/testfiles/GenTest26.jmx index 215d8b668c3..d04bcec78d0 100644 --- a/bin/testfiles/GenTest26.jmx +++ b/bin/testfiles/GenTest26.jmx @@ -11,7 +11,7 @@ - + continue false diff --git a/bin/testfiles/GenTest27.jmx b/bin/testfiles/GenTest27.jmx index 3e706e5eed8..bd2e1b3eb10 100644 --- a/bin/testfiles/GenTest27.jmx +++ b/bin/testfiles/GenTest27.jmx @@ -11,7 +11,7 @@ - + continue false diff --git a/bin/testfiles/GenTest27_original.jmx b/bin/testfiles/GenTest27_original.jmx index 36fb50c1e1e..9ca5c42df15 100644 --- a/bin/testfiles/GenTest27_original.jmx +++ b/bin/testfiles/GenTest27_original.jmx @@ -11,7 +11,7 @@ - + continue false diff --git a/bin/testfiles/JDBC_TESTS.csv b/bin/testfiles/JDBC_TESTS.csv index ba56666ef62..654216e3908 100644 --- a/bin/testfiles/JDBC_TESTS.csv +++ b/bin/testfiles/JDBC_TESTS.csv @@ -1,11 +1,11 @@ label,responseCode,responseMessage,threadName,dataType,success,grpThreads,allThreads,SampleCount,ErrorCount -JSR223_CHECK_POOL_PREINIT,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 -JDBC_DROP_PROCEDURE,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 -JDBC_DROP_PROCEDURE,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 -JDBC_DROP_TABLE,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 -JDBC_CREATE_TABLE,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 -JDBC_CREATE_PROCEDURE,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 -JDBC_CREATE_PROCEDURE_SELECT,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 +JSR223_CHECK_POOL_PREINIT,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 +JDBC_DROP_PROCEDURE,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 +JDBC_DROP_PROCEDURE,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 +JDBC_DROP_TABLE,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 +JDBC_CREATE_TABLE,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 +JDBC_CREATE_PROCEDURE,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 +JDBC_CREATE_PROCEDURE_SELECT,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 JDBC_INSERT,200,OK,TG-OK 1-1,text,true,1,1,1,0 JDBC_CALL_PROCEDURE,200,OK,TG-OK 1-1,text,true,1,1,1,0 JDBC_CALL_PROCEDURE_SELECT,200,OK,TG-OK 1-1,text,true,1,1,1,0 diff --git a/bin/testfiles/JDBC_TESTS.jmx b/bin/testfiles/JDBC_TESTS.jmx index ff1705a823d..3d0369cca80 100644 --- a/bin/testfiles/JDBC_TESTS.jmx +++ b/bin/testfiles/JDBC_TESTS.jmx @@ -30,7 +30,7 @@ ifexists=false - + continue false diff --git a/bin/testfiles/JDBC_TESTS.xml b/bin/testfiles/JDBC_TESTS.xml index 4b9b3021508..8ebca768854 100644 --- a/bin/testfiles/JDBC_TESTS.xml +++ b/bin/testfiles/JDBC_TESTS.xml @@ -1,48 +1,48 @@ - + JSR223_CHECK_POOL_PREINIT_ASSERTION false false - + RA false false - + RA false false - + RA false false - + RA false false - + RA false false - + RA false diff --git a/bin/testfiles/JMS_TESTS.csv b/bin/testfiles/JMS_TESTS.csv index 6d315211fbe..3be2ac9d90a 100644 --- a/bin/testfiles/JMS_TESTS.csv +++ b/bin/testfiles/JMS_TESTS.csv @@ -1,5 +1,5 @@ label,responseCode,responseMessage,threadName,dataType,success,grpThreads,allThreads,SampleCount,ErrorCount -BSS_startActiveMQ,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 +BSS_startActiveMQ,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 JMS-P2P-DefaultCorrelationId,200,OK,TG-JMS-P2P 1-1,text,true,1,1,1,0 JSS-ConsumeUpcomingMessage,200,OK,TG-JMS-P2P 1-1,text,true,1,1,1,0 JMS-P2P-DefaultCorrelationId-TempQueue,200,OK,TG-JMS-P2P 1-1,text,true,1,1,1,0 diff --git a/bin/testfiles/JMS_TESTS.jmx b/bin/testfiles/JMS_TESTS.jmx index ad50947eabe..b998e76f62c 100644 --- a/bin/testfiles/JMS_TESTS.jmx +++ b/bin/testfiles/JMS_TESTS.jmx @@ -12,7 +12,7 @@ true - + stoptest false diff --git a/bin/testfiles/JMS_TESTS.xml b/bin/testfiles/JMS_TESTS.xml index c2a5029f560..afb133f4ab1 100644 --- a/bin/testfiles/JMS_TESTS.xml +++ b/bin/testfiles/JMS_TESTS.xml @@ -1,6 +1,6 @@ - + Response Assertion diff --git a/bin/testfiles/SavedGenTest210.jmx b/bin/testfiles/SavedGenTest210.jmx index 24afd960db8..b6461d7f228 100644 --- a/bin/testfiles/SavedGenTest210.jmx +++ b/bin/testfiles/SavedGenTest210.jmx @@ -11,7 +11,7 @@ - + continue false diff --git a/bin/testfiles/SavedGenTest27.jmx b/bin/testfiles/SavedGenTest27.jmx index feea3f07a70..be566aba2c7 100644 --- a/bin/testfiles/SavedGenTest27.jmx +++ b/bin/testfiles/SavedGenTest27.jmx @@ -11,7 +11,7 @@ - + continue false diff --git a/bin/testfiles/SlowCharsFeature.jmx b/bin/testfiles/SlowCharsFeature.jmx index 17a8e2ee152..6aec68f4e9d 100644 --- a/bin/testfiles/SlowCharsFeature.jmx +++ b/bin/testfiles/SlowCharsFeature.jmx @@ -20,7 +20,7 @@ - + continue false diff --git a/bin/testfiles/SlowCharsFeature_HttpClient4.csv b/bin/testfiles/SlowCharsFeature_HttpClient4.csv index a9b344cbe90..9a8bdb15d30 100644 --- a/bin/testfiles/SlowCharsFeature_HttpClient4.csv +++ b/bin/testfiles/SlowCharsFeature_HttpClient4.csv @@ -1,5 +1,5 @@ label,responseCode,responseMessage,threadName,dataType,success -JSS_setCPS,200,OK,setUp Thread Group 1-1,text,true +JSS_setCPS,200,OK,Setup Thread Group 1-1,text,true ApacheJMeter-HP-NonSecure,206,Partial Content,Thread Group 1-1,text,true ApacheJMeter-HP-Secure,206,Partial Content,Thread Group 1-1,text,true HTTPS-SNI-without-timeout,206,Partial Content,Thread Group 1-1,text,true diff --git a/bin/testfiles/SlowCharsFeature_HttpClient4.xml b/bin/testfiles/SlowCharsFeature_HttpClient4.xml index 118455f7162..36da317b156 100644 --- a/bin/testfiles/SlowCharsFeature_HttpClient4.xml +++ b/bin/testfiles/SlowCharsFeature_HttpClient4.xml @@ -1,6 +1,6 @@ - + JSA-CheckResponseTimeHigherThan5s diff --git a/bin/testfiles/SlowCharsFeature_Java.csv b/bin/testfiles/SlowCharsFeature_Java.csv index b4aa8b6fa3b..96d1053c92a 100644 --- a/bin/testfiles/SlowCharsFeature_Java.csv +++ b/bin/testfiles/SlowCharsFeature_Java.csv @@ -1,5 +1,5 @@ label,responseCode,responseMessage,threadName,dataType,success -JSS_setCPS,200,OK,setUp Thread Group 1-1,text,true +JSS_setCPS,200,OK,Setup Thread Group 1-1,text,true ApacheJMeter-HP-Secure,206,Partial Content,Thread Group 1-1,text,true HTTPS-SNI-without-timeout,206,Partial Content,Thread Group 1-1,text,true HTTPS-SNI-with-timeout,206,Partial Content,Thread Group 1-1,text,true diff --git a/bin/testfiles/SlowCharsFeature_Java.xml b/bin/testfiles/SlowCharsFeature_Java.xml index 246849020b3..e7e959544e0 100644 --- a/bin/testfiles/SlowCharsFeature_Java.xml +++ b/bin/testfiles/SlowCharsFeature_Java.xml @@ -1,6 +1,6 @@ - + JSA-CheckResponseTimeHigherThan5s diff --git a/bin/testfiles/TCP_TESTS.csv b/bin/testfiles/TCP_TESTS.csv index a3b99661a4d..13bdde96ae9 100644 --- a/bin/testfiles/TCP_TESTS.csv +++ b/bin/testfiles/TCP_TESTS.csv @@ -1,5 +1,5 @@ label,responseCode,responseMessage,threadName,dataType,success,grpThreads,allThreads,SampleCount,ErrorCount -MinaTcpServerInitializer,200,OK,setUp Thread Group 1-1,text,true,1,1,1,0 +MinaTcpServerInitializer,200,OK,Setup Thread Group 1-1,text,true,1,1,1,0 TCP Sampler-Hello,200,OK,TG-TCPClientImpl 1-1,text,true,1,1,1,0 TCP Sampler-Timeout,500,"org.apache.jmeter.protocol.tcp.sampler.ReadException: Error reading from server, bytes read: 0",TG-TCPClientImpl 1-1,text,true,1,1,1,0 TCP Sampler-Quit,200,OK,TG-TCPClientImpl 1-1,text,true,1,1,1,0 diff --git a/bin/testfiles/TCP_TESTS.jmx b/bin/testfiles/TCP_TESTS.jmx index 1bfd6e85cd3..594b0f7dc5e 100644 --- a/bin/testfiles/TCP_TESTS.jmx +++ b/bin/testfiles/TCP_TESTS.jmx @@ -35,7 +35,7 @@ https://stackoverflow.com/questions/37702682/jmeter-tcp-sampler-doesnt-close-the 10 - + stoptest false diff --git a/bin/testfiles/TCP_TESTS.xml b/bin/testfiles/TCP_TESTS.xml index 76654bce38e..f7c965f5328 100644 --- a/bin/testfiles/TCP_TESTS.xml +++ b/bin/testfiles/TCP_TESTS.xml @@ -1,6 +1,6 @@ - + RA_time diff --git a/bin/testfiles/TEST_HTTP.jmx b/bin/testfiles/TEST_HTTP.jmx index da93b79e0a8..3369fe81a94 100644 --- a/bin/testfiles/TEST_HTTP.jmx +++ b/bin/testfiles/TEST_HTTP.jmx @@ -12,7 +12,7 @@ true - + stoptest false diff --git a/bin/testfiles/TEST_HTTP_HttpClient4.csv b/bin/testfiles/TEST_HTTP_HttpClient4.csv index 23f71a842dc..911aaedaa5e 100644 --- a/bin/testfiles/TEST_HTTP_HttpClient4.csv +++ b/bin/testfiles/TEST_HTTP_HttpClient4.csv @@ -1,4 +1,4 @@ -JSS_startMirror,200,setUp Thread Group 1-1,text,true +JSS_startMirror,200,Setup Thread Group 1-1,text,true GET_NO_PARAMETERS,200,TG_TEST_GET_COMBINATIONS 1-1,text,true GET_WITH_PARAMETERS_IN_URL,200,TG_TEST_GET_COMBINATIONS 1-1,text,true GET_WITH_PARAMETERS,200,TG_TEST_GET_COMBINATIONS 1-1,text,true diff --git a/bin/testfiles/TEST_HTTP_Java.csv b/bin/testfiles/TEST_HTTP_Java.csv index 57afa35fb7f..5f4ceecbae3 100644 --- a/bin/testfiles/TEST_HTTP_Java.csv +++ b/bin/testfiles/TEST_HTTP_Java.csv @@ -1,4 +1,4 @@ -JSS_startMirror,200,setUp Thread Group 1-1,text,true +JSS_startMirror,200,Setup Thread Group 1-1,text,true GET_NO_PARAMETERS,200,TG_TEST_GET_COMBINATIONS 1-1,text,true GET_WITH_PARAMETERS_IN_URL,200,TG_TEST_GET_COMBINATIONS 1-1,text,true GET_WITH_PARAMETERS,200,TG_TEST_GET_COMBINATIONS 1-1,text,true diff --git a/bin/testfiles/TestCookieManager.csv b/bin/testfiles/TestCookieManager.csv index 3f23641ba88..dbfe84290eb 100644 --- a/bin/testfiles/TestCookieManager.csv +++ b/bin/testfiles/TestCookieManager.csv @@ -1,5 +1,5 @@ label,responseCode,threadName,dataType,success,grpThreads,allThreads,SampleCount,ErrorCount -JSS_startMirror,200,setUp Thread Group 1-1,text,true,1,1,1,0 +JSS_startMirror,200,Setup Thread Group 1-1,text,true,1,1,1,0 HTTP-Request-HC4,200,TG-ManagedCookieHC4 1-1,text,true,1,1,1,0 HTTPS-Request-HC4,Non HTTP response code: org.apache.http.conn.HttpHostConnectException,TG-ManagedCookieHC4 1-1,text,true,1,1,1,0 HTTP-Request-Java,200,TG-ManagedCookieJava 2-1,text,true,1,1,1,0 diff --git a/bin/testfiles/TestCookieManager.jmx b/bin/testfiles/TestCookieManager.jmx index 9f6c551918d..8f7449957d5 100644 --- a/bin/testfiles/TestCookieManager.jmx +++ b/bin/testfiles/TestCookieManager.jmx @@ -26,7 +26,7 @@ - + stoptest false diff --git a/bin/testfiles/TestCookieManager.xml b/bin/testfiles/TestCookieManager.xml index 8e5f9c2cbb6..99a9e5e6681 100644 --- a/bin/testfiles/TestCookieManager.xml +++ b/bin/testfiles/TestCookieManager.xml @@ -1,6 +1,6 @@ - + Response Assertion diff --git a/bin/testfiles/TestKeepAlive.csv b/bin/testfiles/TestKeepAlive.csv index 3a5ec173b5c..4bf4541bb7f 100644 --- a/bin/testfiles/TestKeepAlive.csv +++ b/bin/testfiles/TestKeepAlive.csv @@ -1,4 +1,4 @@ -JSPP_SetProperties,200,OK,setUp Thread Group 1-1,text,true +JSPP_SetProperties,200,OK,Setup Thread Group 1-1,text,true HTTP_Request_CLOSE,200,OK,Thread Group 1-1,text,true HTTP-Warmup,200,OK,Thread Group 1-1,text,true HTTP_Request_REUSE,200,OK,Thread Group 1-1,text,true diff --git a/bin/testfiles/TestKeepAlive.jmx b/bin/testfiles/TestKeepAlive.jmx index a6c580f889e..3d0b0abea48 100644 --- a/bin/testfiles/TestKeepAlive.jmx +++ b/bin/testfiles/TestKeepAlive.jmx @@ -43,7 +43,7 @@ false - + continue false diff --git a/bin/testfiles/TestSchedulerWithTimer.jmx b/bin/testfiles/TestSchedulerWithTimer.jmx index 191a3275107..1c8b1fd875f 100644 --- a/bin/testfiles/TestSchedulerWithTimer.jmx +++ b/bin/testfiles/TestSchedulerWithTimer.jmx @@ -124,7 +124,7 @@ - + continue false diff --git a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties index 23721c4b4c9..a4577d247d4 100644 --- a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties +++ b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties @@ -1143,7 +1143,7 @@ send_file_param_name_label=Parameter Name server=Server Name or IP\: servername=Servername \: session_argument_name=Session Argument Name -setup_thread_group_title=setUp Thread Group +setup_thread_group_title=Setup Thread Group sha_string=String to be hashed should_save=You should save your test plan before running it. \nIf you are using supporting data files (ie, for CSV Data Set or __StringFromFile), \nthen it is particularly important to first save your test script. \nDo you want to save your test plan first? shutdown=Shutdown diff --git a/xdocs/demos/JDBC-Pre-Post-Processor.jmx b/xdocs/demos/JDBC-Pre-Post-Processor.jmx index de46391056f..c0300e3392e 100644 --- a/xdocs/demos/JDBC-Pre-Post-Processor.jmx +++ b/xdocs/demos/JDBC-Pre-Post-Processor.jmx @@ -154,7 +154,7 @@ - + continue false diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml index 213a62758ed..73c64ed3d14 100644 --- a/xdocs/usermanual/component_reference.xml +++ b/xdocs/usermanual/component_reference.xml @@ -6628,7 +6628,7 @@ See JMeter's Classpath and

A Thread Group defines a pool of users that will execute a particular test case against your server. In the Thread Group GUI, you can control the number of users simulated (number of threads), the ramp up time (how long it takes to start all the threads), the number of times to perform the test, and optionally, a start and stop time for the test.

-See also and . +See also and .

When using the scheduler, JMeter runs the thread group until either the number of loops is reached or the duration/end-time is reached - whichever occurs first. @@ -7303,7 +7303,7 @@ This is done by default since JMeter 2.13. - +

A special type of ThreadGroup that can be utilized to perform Pre-Test Actions. The behavior of these threads