jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vladimirsitni...@apache.org
Subject [jmeter] branch master updated (fb66808 -> ce0870f)
Date Thu, 26 Sep 2019 13:07:25 GMT
This is an automated email from the ASF dual-hosted git repository.

vladimirsitnikov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git.


    from fb66808  Enable concurrent execution of certain tests
     add ce0870f  Remove cp1252-encoded files from Git control

No new revisions were added by this update.

Summary of changes:
 .editorconfig                                      |   3 -
 build.gradle.kts                                   |   2 -
 .../org/apache/jmeter/junit/JMeterTestUtils.java   |   4 +-
 .../jmeter/util/JMeterContextExtension.java}       |  65 +++---
 .../jmeter/functions/CSVReadFunctionTest.java      | 259 +++++++++++++--------
 .../jmeter/functions/CsvConcurrencyTest.java       |  99 --------
 .../jmeter/functions/FunctionTestHelper.java       |  26 ++-
 .../org/apache/jmeter/functions/PackageTest.java   |  23 +-
 .../functions/StringFromFileFunctionTest.java      |  69 +++---
 .../jmeter/functions/TestSamplerNameFunction.java  |   2 +-
 .../jmeter/functions/XPathConcurrencyTest.java     |   4 +-
 .../apache/jmeter/functions/testfiles/SFFTest1.txt |   5 -
 .../apache/jmeter/functions/testfiles/SFFTest2.txt |   5 -
 .../apache/jmeter/functions/testfiles/SFFTest3.txt |   5 -
 .../jmeter/functions/testfiles/testblank.csv       |   4 -
 .../testfiles/unit/CSVReadFunctionTest.csv         |   4 -
 .../testfiles/unit/FunctionsPackageTest.csv        |   4 -
 .../http/sampler/ParallelResourcesAndIpSource.java |  18 +-
 .../jms/sampler/render/BinaryMessageRenderer.java  |   2 +-
 .../sampler/render/BinaryMessageRendererTest.java  |  97 ++++----
 .../jms/sampler/render/MessageRendererTest.java    |  45 ++--
 .../sampler/render/ObjectMessageRendererTest.java  |  74 +++---
 .../sampler/render/TextMessageRendererTest.java    |  66 +++---
 .../jmeter/protocol/jms/sampler/render/cp1252.txt  |   1 -
 .../jmeter/protocol/jms/sampler/render/noVar.txt   |   1 -
 .../protocol/jms/sampler/render/object_cp1252.xml  |   1 -
 .../protocol/jms/sampler/render/object_doe.xml     |   1 -
 .../jms/sampler/render/object_prolog_cp1252.xml    |   2 -
 .../protocol/jms/sampler/render/object_utf8.xml    |   1 -
 .../jmeter/protocol/jms/sampler/render/oneVar.txt  |   1 -
 .../jmeter/protocol/jms/sampler/render/utf8.txt    |   1 -
 .../apache/jmeter/testkit}/ResourceLocator.java    |  20 +-
 .../java/org/apache/jmeter/testkit/Resources.java  |  51 ----
 33 files changed, 415 insertions(+), 550 deletions(-)
 copy src/{protocol/http/src/test/java/org/apache/jmeter/wiremock/WireMockExtension.java =>
core/src/test/java/org/apache/jmeter/util/JMeterContextExtension.java} (51%)
 delete mode 100644 src/functions/src/test/java/org/apache/jmeter/functions/CsvConcurrencyTest.java
 delete mode 100644 src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest1.txt
 delete mode 100644 src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest2.txt
 delete mode 100644 src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/SFFTest3.txt
 delete mode 100644 src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/testblank.csv
 delete mode 100644 src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/unit/CSVReadFunctionTest.csv
 delete mode 100644 src/functions/src/test/resources/org/apache/jmeter/functions/testfiles/unit/FunctionsPackageTest.csv
 delete mode 100644 src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/cp1252.txt
 delete mode 100644 src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/noVar.txt
 delete mode 100644 src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_cp1252.xml
 delete mode 100644 src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_doe.xml
 delete mode 100644 src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_prolog_cp1252.xml
 delete mode 100644 src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/object_utf8.xml
 delete mode 100644 src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/oneVar.txt
 delete mode 100644 src/protocol/jms/src/test/resources/org/apache/jmeter/protocol/jms/sampler/render/utf8.txt
 rename src/{core/src/test/java/org/apache/jmeter/test => testkit/src/main/java/org/apache/jmeter/testkit}/ResourceLocator.java
(73%)
 delete mode 100644 src/testkit/src/main/java/org/apache/jmeter/testkit/Resources.java


Mime
View raw message