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 e5355de319 chore: remove Groovy compilation from the build pipeline
add ae75354d3c refactor: replace org.junit.Assert with
org.junit.jupiter.api.Assertions
add c962ec690a refactor: migrate JUnit 3 tests to JUnit 5, remove JUnit 4
test dependency
No new revisions were added by this update.
Summary of changes:
.../main/kotlin/build-logic.test-junit5.gradle.kts | 8 +-
src/bom-testing/build.gradle.kts | 1 -
src/components/build.gradle.kts | 1 -
.../jmeter/config/KeystoreConfigBeanInfo.java | 2 +-
.../jmeter/assertions/ResponseAssertionTest.java | 34 +--
.../jmeter/assertions/SMIMEAssertionTest.java | 32 +-
.../jmeter/assertions/SizeAssertionTest.java | 15 +-
.../jmeter/assertions/XMLSchemaAssertionTest.java | 10 +-
.../jmeter/assertions/XPath2AssertionTest.java | 65 ++--
.../jmeter/assertions/XPathAssertionTest.java | 103 ++++---
.../assertions/jmespath/TestJMESPathAssertion.java | 4 +-
.../org/apache/jmeter/config/TestCVSDataSet.java | 134 ++++-----
.../jmeter/config/gui/TestArgumentsPanel.java | 2 +-
.../jmeter/control/TestGenericController.java | 3 +-
.../apache/jmeter/control/TestIfController.java | 28 +-
.../jmeter/control/TestInterleaveControl.java | 10 +-
.../apache/jmeter/control/TestLoopController.java | 6 +-
.../jmeter/control/TestOnceOnlyController.java | 2 +-
.../jmeter/control/TestRandomController.java | 11 +-
.../jmeter/control/TestTransactionController.java | 7 +-
.../apache/jmeter/control/TestWhileController.java | 74 ++---
.../jmeter/extractor/TestHtmlExtractorJSoup.java | 4 +-
.../jmeter/extractor/TestRegexExtractor.java | 82 ++---
.../jmeter/extractor/TestXPath2Extractor.java | 4 +-
.../json/jmespath/TestJMESPathExtractor.java | 2 -
.../org/apache/jmeter/gui/action/TestSave.java | 2 +-
.../gui/action/template/TestTemplateManager.java | 18 +-
.../jmeter/timers/ConstantThroughputTimerTest.java | 44 +--
.../PreciseThroughputTimerTest.java | 31 +-
.../jmeter/visualizers/TestRenderAsJson.java | 16 +-
.../visualizers/TestSamplingStatCalculator.java | 10 +-
.../backend/SamplerMetricFixedModeTest.java | 92 +++---
.../backend/SamplerMetricTimedModeTest.java | 88 +++---
src/core/build.gradle.kts | 1 -
.../apache/jmeter/testbeans/gui/TestBeanGUI.java | 3 +-
.../org/apache/jmeter/engine/LocalHostTest.java | 7 +-
.../org/apache/jmeter/engine/TestTreeCloner.java | 19 +-
.../jmeter/engine/util/TestValueReplacer.java | 4 +-
.../gui/logging/TestGuiLogEventAppender.java | 4 +-
.../apache/jmeter/listeners/TestResultAction.java | 38 +--
.../jmeter/report/core/CsvSampleReaderTest.java | 16 +-
.../jmeter/report/core/SampleMetadataTest.java | 2 +-
.../jmeter/report/core/TestCsvSampleWriter.java | 8 +-
.../samplers/TestSampleSaveConfiguration.java | 61 ++--
.../org/apache/jmeter/save/TestCSVSaveService.java | 20 +-
.../testbeans/gui/TestBooleanPropertyEditor.java | 32 +-
.../testbeans/gui/TestComboStringEditor.java | 4 +-
.../testbeans/gui/TestFieldStringEditor.java | 2 +-
.../org/apache/jmeter/testelement/PackageTest.java | 8 +-
.../jmeter/testelement/TestNumberProperty.java | 4 +-
.../jmeter/threads/JMeterContextServiceHelper.java | 41 ---
.../apache/jmeter/threads/TestJMeterThread.java | 11 +-
.../apache/jmeter/threads/TestTestCompiler.java | 2 +-
.../threads/TestUnmodifiableJMeterVariables.java | 4 +-
.../java/org/apache/jmeter/util/PackageTest.java | 2 +-
.../jmeter/util/SecurityProviderLoaderTest.java | 63 ++--
.../apache/jmeter/util/StringUtilitiesTest.java | 4 +-
.../org/apache/jmeter/util/TestJMeterUtils.java | 22 +-
.../java/org/apache/jmeter/util/XPathUtilTest.java | 34 +--
.../org/apache/jorphan/reflect/TestFunctor.java | 33 +-
.../org/apache/jmeter/junit/JMeterTestCase.java | 3 +-
.../apache/jmeter/junit/JMeterTestCaseJUnit.java | 131 --------
.../junit/categories/ExcludeCategoryFilter.java | 58 ----
.../jmeter/junit/categories/NeedGuiTests.java | 25 --
.../org/apache/jmeter/resources/PackageTest.java | 86 ++----
.../jmeter/resources/ResourceKeyUsageTest.java | 11 +-
.../jmeter/threads/TestJMeterContextService.java | 2 +-
.../jmeter/control/TestSwitchController.java | 42 +--
.../functions/ComponentReferenceFunctionTest.java | 99 +++---
.../org/apache/jmeter/gui/action/TestLoad.java | 68 ++---
.../java/org/apache/jmeter/junit/JMeterTest.java | 331 +++++++++------------
.../jmeter/resources/TestPropertiesFiles.java | 10 +-
.../org/apache/jmeter/save/TestSaveService.java | 13 +-
.../apache/jmeter/testbeans/gui/PackageTest.java | 99 ++----
.../apache/jmeter/testelement/TestElementTest.java | 59 ++--
.../java/org/apache/jorphan/TestFunctorUsers.java | 16 +-
.../apache/jorphan/reflect/TestClassFinder.java | 26 +-
.../org/apache/jmeter/gui/GuiComponentHolder.kt | 27 +-
.../apache/jmeter/functions/EvalFunctionTest.java | 6 +-
.../org/apache/jmeter/functions/PackageTest.java | 102 +++----
.../jmeter/functions/RandomFunctionTest.java | 12 +-
.../jmeter/functions/TestFileRowColContainer.java | 25 +-
.../apache/jmeter/functions/TestFileToString.java | 12 +-
.../jmeter/functions/TestGroovyFunction.java | 2 +-
.../apache/jmeter/functions/TestIsPropDefined.java | 2 +-
.../apache/jmeter/functions/TestRegexFunction.java | 8 +-
.../apache/jmeter/functions/TestSetProperty.java | 6 +-
.../org/apache/jmeter/functions/VariableTest.java | 20 +-
.../apache/commons/cli/avalon/ClutilTestCase.java | 56 ++--
.../apache/jorphan/collections/PackageTest.java | 10 +-
.../org/apache/jorphan/exec/TestKeyToolUtils.java | 2 +-
.../apache/jorphan/gui/TableModelEventBacker.java | 12 +-
src/protocol/http/build.gradle.kts | 1 +
.../http/config/MultipartUrlConfigTest.java | 2 +-
.../jmeter/protocol/http/config/UrlConfigTest.java | 6 +-
.../protocol/http/control/TestAuthManager.java | 10 +-
.../control/TestAuthManagerThreadIteration.java | 20 +-
.../control/TestCacheManagerThreadIteration.java | 64 ++--
.../control/TestCookieManagerThreadIteration.java | 103 ++++---
.../http/control/TestHC4CookieManager.java | 53 ++--
.../http/control/TestHTTPMirrorThread.java | 94 ++----
.../http/control/gui/TestHttpTestSampleGui.java | 11 +-
.../protocol/http/modifier/TestAnchorModifier.java | 9 +-
.../http/modifier/TestURLRewritingModifier.java | 11 +-
.../protocol/http/parser/TestBaseParser.java | 12 +-
.../protocol/http/parser/TestHTMLParser.java | 108 +++----
.../protocol/http/parser/TestHtmlParsingUtils.java | 4 +-
.../protocol/http/proxy/TestHttpRequestHdr.java | 32 +-
.../protocol/http/proxy/TestProxyControl.java | 56 ++--
.../jmeter/protocol/http/sampler/PackageTest.java | 5 +-
.../protocol/http/sampler/PostWriterTest.java | 6 +-
.../protocol/http/sampler/PutWriterTest.java | 8 +-
.../protocol/http/sampler/SamplingNamingTest.java | 19 +-
.../protocol/http/sampler/TestHTTPHC4Impl.java | 13 +-
.../protocol/http/sampler/TestHTTPSamplers.java | 4 +-
.../TestHTTPSamplersAgainstHttpMirrorServer.java | 131 ++++----
.../protocol/http/sampler/TestHttpWebdav.java | 13 +-
.../protocol/http/util/TestHTTPArgument.java | 2 +-
.../jmeter/protocol/http/util/TestHTTPFileArg.java | 26 +-
.../protocol/http/util/TestHTTPFileArgs.java | 5 +-
.../http/util/accesslog/TestLogFilter.java | 24 +-
.../http/util/accesslog/TestSessionFilter.java | 4 +-
.../http/util/accesslog/TestTCLogParser.java | 16 +-
.../jmeter/testelement/TestHeaderManager.java | 2 +-
.../http/control/HttpMirrorServerExtension.kt | 89 ++++++
.../protocol/jms/sampler/PublisherSamplerTest.java | 4 +-
.../sampler/render/BinaryMessageRendererTest.java | 64 +++-
.../protocol/ldap/config/gui/PackageTest.java | 2 +-
.../tcp/sampler/BinaryTCPClientImplTest.java | 16 +-
.../LengthPrefixedBinaryTCPClientImplTest.java | 4 +-
.../tcp/sampler/TCPClientDecoratorTest.java | 4 +-
131 files changed, 1727 insertions(+), 2105 deletions(-)
delete mode 100644
src/core/src/test/java/org/apache/jmeter/threads/JMeterContextServiceHelper.java
delete mode 100644
src/core/src/testFixtures/java/org/apache/jmeter/junit/JMeterTestCaseJUnit.java
delete mode 100644
src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/ExcludeCategoryFilter.java
delete mode 100644
src/core/src/testFixtures/java/org/apache/jmeter/junit/categories/NeedGuiTests.java
copy
build-logic/publishing/src/main/kotlin/build-logic.java-published-platform.gradle.kts
=> src/dist-check/src/test/kotlin/org/apache/jmeter/gui/GuiComponentHolder.kt
(63%)
create mode 100644
src/protocol/http/src/testFixtures/kotlin/org/apache/jmeter/protocol/http/control/HttpMirrorServerExtension.kt