浏览代码

Remove random runner from build tools (internal) tests (#88577)

This removes unrequited overhead for writing build tool and build tool internal tests and mechanically ports all junit3 tests to junit4.
Rene Groeschke 3 年之前
父节点
当前提交
160b14fbb1
共有 28 个文件被更改,包括 142 次插入413 次删除
  1. 1 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/AbstractDistributionDownloadPluginTests.java
  2. 6 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/ConcatFilesTaskTests.java
  3. 10 5
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/EmptyDirTaskTests.java
  4. 3 0
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginTests.java
  5. 13 3
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/JdkDownloadPluginTests.java
  6. 13 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/checkstyle/SnipptLengthCheckTests.java
  7. 10 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/doc/RestTestFromSnippetsTaskTests.java
  8. 7 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/doc/SnippetsTaskTests.java
  9. 7 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/docker/DockerSupportServiceTests.java
  10. 12 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/docker/TransformLog4jConfigFilterTests.java
  11. 1 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTaskTests.java
  12. 12 7
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTaskTests.java
  13. 11 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTaskTests.java
  14. 4 5
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/UpdateShasTaskTests.java
  15. 2 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/GenerateReleaseNotesTaskTest.java
  16. 4 3
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/PruneChangelogsTaskTests.java
  17. 7 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/TransformTests.java
  18. 7 2
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/AddMatchTests.java
  19. 4 0
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/RemoveMatchTests.java
  20. 4 1
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsRegexTests.java
  21. 4 1
      build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsTests.java
  22. 0 1
      build-tools/build.gradle
  23. 0 46
      build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/BaseTestCase.java
  24. 0 225
      build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleIntegrationTestCase.java
  25. 0 27
      build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleThreadsFilter.java
  26. 0 20
      build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleUnitTestCase.java
  27. 0 44
      build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/JUnit3MethodProvider.java
  28. 0 1
      gradle/build.versions.toml

+ 1 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/AbstractDistributionDownloadPluginTests.java

@@ -10,7 +10,6 @@ package org.elasticsearch.gradle;
 
 import org.elasticsearch.gradle.internal.BwcVersions;
 import org.elasticsearch.gradle.internal.BwcVersions.VersionPair;
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;
 import org.gradle.testfixtures.ProjectBuilder;
@@ -18,7 +17,7 @@ import org.gradle.testfixtures.ProjectBuilder;
 import java.io.File;
 import java.util.Arrays;
 
-public class AbstractDistributionDownloadPluginTests extends GradleUnitTestCase {
+public class AbstractDistributionDownloadPluginTests {
     protected static Project rootProject;
     protected static Project archivesProject;
     protected static Project packagesProject;

+ 6 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/ConcatFilesTaskTests.java

@@ -7,9 +7,9 @@
  */
 package org.elasticsearch.gradle.internal;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.gradle.api.Project;
 import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -17,8 +17,11 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.Arrays;
 
-public class ConcatFilesTaskTests extends GradleUnitTestCase {
+import static org.junit.Assert.assertEquals;
 
+public class ConcatFilesTaskTests {
+
+    @Test
     public void testHeaderAdded() throws IOException {
 
         Project project = createProject();
@@ -39,6 +42,7 @@ public class ConcatFilesTaskTests extends GradleUnitTestCase {
         file.delete();
     }
 
+    @Test
     public void testConcatenationWithUnique() throws IOException {
 
         Project project = createProject();

+ 10 - 5
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/EmptyDirTaskTests.java

@@ -7,18 +7,22 @@
  */
 package org.elasticsearch.gradle.internal;
 
-import com.carrotsearch.randomizedtesting.RandomizedTest;
-
 import org.apache.tools.ant.taskdefs.condition.Os;
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.gradle.api.Project;
 import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
 
-public class EmptyDirTaskTests extends GradleUnitTestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
+public class EmptyDirTaskTests {
 
+    @Test
     public void testCreateEmptyDir() throws Exception {
         Project project = ProjectBuilder.builder().build();
         EmptyDirTask emptyDirTask = project.getTasks().create("emptyDirTask", EmptyDirTask.class);
@@ -40,8 +44,9 @@ public class EmptyDirTaskTests extends GradleUnitTestCase {
         newEmptyFolder.delete();
     }
 
+    @Test
     public void testCreateEmptyDirNoPermissions() throws Exception {
-        RandomizedTest.assumeFalse("Functionality is Unix specific", Os.isFamily(Os.FAMILY_WINDOWS));
+        assumeFalse("Functionality is Unix specific", Os.isFamily(Os.FAMILY_WINDOWS));
 
         Project project = ProjectBuilder.builder().build();
         EmptyDirTask emptyDirTask = project.getTasks().create("emptyDirTask", EmptyDirTask.class);

+ 3 - 0
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginTests.java

@@ -14,11 +14,13 @@ import org.elasticsearch.gradle.VersionProperties;
 import org.elasticsearch.gradle.internal.distribution.InternalElasticsearchDistributionTypes;
 import org.gradle.api.Project;
 import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.Test;
 
 import java.io.File;
 
 public class InternalDistributionDownloadPluginTests extends AbstractDistributionDownloadPluginTests {
 
+    @Test
     public void testLocalCurrentVersionPackages() {
         ElasticsearchDistributionType[] types = { InternalElasticsearchDistributionTypes.RPM, InternalElasticsearchDistributionTypes.DEB };
         for (ElasticsearchDistributionType packageType : types) {
@@ -33,6 +35,7 @@ public class InternalDistributionDownloadPluginTests extends AbstractDistributio
         }
     }
 
+    @Test
     public void testLocalBwcPackages() {
         ElasticsearchDistributionType[] types = { InternalElasticsearchDistributionTypes.RPM, InternalElasticsearchDistributionTypes.DEB };
         for (ElasticsearchDistributionType packageType : types) {

+ 13 - 3
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/JdkDownloadPluginTests.java

@@ -8,15 +8,17 @@
 
 package org.elasticsearch.gradle.internal;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.gradle.api.NamedDomainObjectContainer;
 import org.gradle.api.Project;
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.BeforeClass;
+import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertThrows;
 
-public class JdkDownloadPluginTests extends GradleUnitTestCase {
+public class JdkDownloadPluginTests {
     private static Project rootProject;
 
     @BeforeClass
@@ -24,10 +26,12 @@ public class JdkDownloadPluginTests extends GradleUnitTestCase {
         rootProject = ProjectBuilder.builder().build();
     }
 
+    @Test
     public void testMissingVendor() {
         assertJdkError(createProject(), "testjdk", null, "11.0.2+33", "linux", "x64", "vendor not specified for jdk [testjdk]");
     }
 
+    @Test
     public void testUnknownVendor() {
         assertJdkError(
             createProject(),
@@ -40,10 +44,12 @@ public class JdkDownloadPluginTests extends GradleUnitTestCase {
         );
     }
 
+    @Test
     public void testMissingVersion() {
         assertJdkError(createProject(), "testjdk", "openjdk", null, "linux", "x64", "version not specified for jdk [testjdk]");
     }
 
+    @Test
     public void testBadVersionFormat() {
         assertJdkError(
             createProject(),
@@ -56,10 +62,12 @@ public class JdkDownloadPluginTests extends GradleUnitTestCase {
         );
     }
 
+    @Test
     public void testMissingPlatform() {
         assertJdkError(createProject(), "testjdk", "openjdk", "11.0.2+33", null, "x64", "platform not specified for jdk [testjdk]");
     }
 
+    @Test
     public void testUnknownPlatform() {
         assertJdkError(
             createProject(),
@@ -72,10 +80,12 @@ public class JdkDownloadPluginTests extends GradleUnitTestCase {
         );
     }
 
+    @Test
     public void testMissingArchitecture() {
         assertJdkError(createProject(), "testjdk", "openjdk", "11.0.2+33", "linux", null, "architecture not specified for jdk [testjdk]");
     }
 
+    @Test
     public void testUnknownArchitecture() {
         assertJdkError(
             createProject(),
@@ -97,7 +107,7 @@ public class JdkDownloadPluginTests extends GradleUnitTestCase {
         final String architecture,
         final String message
     ) {
-        IllegalArgumentException e = expectThrows(
+        IllegalArgumentException e = assertThrows(
             IllegalArgumentException.class,
             () -> createJdk(project, name, vendor, version, platform, architecture)
         );

+ 13 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/checkstyle/SnipptLengthCheckTests.java

@@ -8,7 +8,7 @@
 
 package org.elasticsearch.gradle.internal.checkstyle;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
+import org.junit.Test;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -17,40 +17,51 @@ import java.util.function.BiConsumer;
 
 import static java.util.Collections.singletonList;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.fail;
 
-public class SnipptLengthCheckTests extends GradleUnitTestCase {
+public class SnipptLengthCheckTests {
+
+    @Test
     public void testNoSnippets() {
         SnippetLengthCheck.checkFile(failOnError(), 10, "There a no snippets");
     }
 
+    @Test
     public void testEmptySnippet() {
         SnippetLengthCheck.checkFile(failOnError(), 10, "// tag::foo", "// end::foo");
     }
 
+    @Test
     public void testSnippetWithSmallText() {
         SnippetLengthCheck.checkFile(failOnError(), 10, "// tag::foo", "some words", "// end::foo");
     }
 
+    @Test
     public void testSnippetWithLeadingSpaces() {
         SnippetLengthCheck.checkFile(failOnError(), 10, "  // tag::foo", "  some words", "  // end::foo");
     }
 
+    @Test
     public void testSnippetWithEmptyLine() {
         SnippetLengthCheck.checkFile(failOnError(), 10, "  // tag::foo", "", "  some words", "  // end::foo");
     }
 
+    @Test
     public void testSnippetBrokenLeadingSpaces() {
         List<String> collection = new ArrayList<>();
         SnippetLengthCheck.checkFile(collect(collection), 10, "  // tag::foo", "some words", "  // end::foo");
         assertThat(collection, equalTo(singletonList("2: snippet line should start with [  ]")));
     }
 
+    @Test
     public void testSnippetTooLong() {
         List<String> collection = new ArrayList<>();
         SnippetLengthCheck.checkFile(collect(collection), 10, "  // tag::foo", "  too long words", "  // end::foo");
         assertThat(collection, equalTo(singletonList("2: snippet line should be no more than [10] characters but was [14]")));
     }
 
+    @Test
     public void testLotsOfErrors() {
         List<String> collection = new ArrayList<>();
         SnippetLengthCheck.checkFile(collect(collection), 10, "  // tag::foo", "asdfadf", "  too long words", "asdfadf", "  // end::foo");

+ 10 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/doc/RestTestFromSnippetsTaskTests.java

@@ -7,17 +7,21 @@
  */
 package org.elasticsearch.gradle.internal.doc;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.gradle.api.InvalidUserDataException;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 
 import static org.elasticsearch.gradle.internal.doc.RestTestsFromSnippetsTask.replaceBlockQuote;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-public class RestTestFromSnippetsTaskTests extends GradleUnitTestCase {
+public class RestTestFromSnippetsTaskTests {
     @Rule
     public ExpectedException expectedEx = ExpectedException.none();
 
+    @Test
     public void testInvalidBlockQuote() {
         String input = "\"foo\": \"\"\"bar\"";
         expectedEx.expect(InvalidUserDataException.class);
@@ -25,10 +29,12 @@ public class RestTestFromSnippetsTaskTests extends GradleUnitTestCase {
         replaceBlockQuote(input);
     }
 
+    @Test
     public void testSimpleBlockQuote() {
         assertEquals("\"foo\": \"bort baz\"", replaceBlockQuote("\"foo\": \"\"\"bort baz\"\"\""));
     }
 
+    @Test
     public void testMultipleBlockQuotes() {
         assertEquals(
             "\"foo\": \"bort baz\", \"bar\": \"other\"",
@@ -36,11 +42,13 @@ public class RestTestFromSnippetsTaskTests extends GradleUnitTestCase {
         );
     }
 
+    @Test
     public void testEscapingInBlockQuote() {
         assertEquals("\"foo\": \"bort\\\" baz\"", replaceBlockQuote("\"foo\": \"\"\"bort\" baz\"\"\""));
         assertEquals("\"foo\": \"bort\\n baz\"", replaceBlockQuote("\"foo\": \"\"\"bort\n baz\"\"\""));
     }
 
+    @Test
     public void testIsDocWriteRequest() {
         assertTrue((boolean) RestTestsFromSnippetsTask.shouldAddShardFailureCheck("doc-index/_search"));
         assertFalse((boolean) RestTestsFromSnippetsTask.shouldAddShardFailureCheck("_cat"));

+ 7 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/doc/SnippetsTaskTests.java

@@ -7,10 +7,15 @@
  */
 package org.elasticsearch.gradle.internal.doc;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
+import org.junit.Test;
 
-public class SnippetsTaskTests extends GradleUnitTestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
+public class SnippetsTaskTests {
+
+    @Test
     public void testMatchSource() {
         SnippetsTask.Source source = SnippetsTask.matchSource("[source,console]");
         assertTrue(source.getMatches());

+ 7 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/docker/DockerSupportServiceTests.java

@@ -7,7 +7,7 @@
  */
 package org.elasticsearch.gradle.internal.docker;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
+import org.junit.Test;
 
 import java.util.HashMap;
 import java.util.List;
@@ -16,9 +16,11 @@ import java.util.Map;
 import static org.elasticsearch.gradle.internal.docker.DockerSupportService.deriveId;
 import static org.elasticsearch.gradle.internal.docker.DockerSupportService.parseOsRelease;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
 
-public class DockerSupportServiceTests extends GradleUnitTestCase {
+public class DockerSupportServiceTests {
 
+    @Test
     public void testParseOsReleaseOnOracle() {
         final List<String> lines = List.of(
             "NAME=\"Oracle Linux Server\"",
@@ -60,6 +62,7 @@ public class DockerSupportServiceTests extends GradleUnitTestCase {
     /**
      * Trailing whitespace should be removed
      */
+    @Test
     public void testRemoveTrailingWhitespace() {
         final List<String> lines = List.of("NAME=\"Oracle Linux Server\"   ");
 
@@ -73,6 +76,7 @@ public class DockerSupportServiceTests extends GradleUnitTestCase {
     /**
      * Comments should be removed
      */
+    @Test
     public void testRemoveComments() {
         final List<String> lines = List.of("# A comment", "NAME=\"Oracle Linux Server\"");
 
@@ -83,6 +87,7 @@ public class DockerSupportServiceTests extends GradleUnitTestCase {
         assertThat(expected, equalTo(results));
     }
 
+    @Test
     public void testDeriveIdOnOracle() {
         final Map<String, String> osRelease = new HashMap<>();
         osRelease.put("ID", "ol");

+ 12 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/docker/TransformLog4jConfigFilterTests.java

@@ -8,17 +8,19 @@
 
 package org.elasticsearch.gradle.internal.docker;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
+import org.junit.Test;
 
 import java.util.List;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 
-public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
+public class TransformLog4jConfigFilterTests {
 
     /**
      * Check that the transformer doesn't explode when given an empty file.
      */
+    @Test
     public void testTransformEmptyConfig() {
         runTest(List.of(), List.of());
     }
@@ -26,6 +28,7 @@ public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
     /**
      * Check that the transformer leaves non-appender lines alone.
      */
+    @Test
     public void testTransformEchoesNonAppenderLines() {
         List<String> input = List.of(
             "status = error",
@@ -42,6 +45,7 @@ public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
     /**
      * Check that the root logger appenders are filtered to just the "rolling" appender
      */
+    @Test
     public void testTransformFiltersRootLogger() {
         List<String> input = List.of(
             "rootLogger.appenderRef.console.ref = console",
@@ -56,6 +60,7 @@ public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
     /**
      * Check that any explicit 'console' or 'rolling_old' appenders are removed.
      */
+    @Test
     public void testTransformRemoveExplicitConsoleAndRollingOldAppenders() {
         List<String> input = List.of(
             "appender.console.type = Console",
@@ -74,6 +79,7 @@ public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
     /**
      * Check that rolling file appenders are converted to console appenders.
      */
+    @Test
     public void testTransformConvertsRollingToConsole() {
         List<String> input = List.of("appender.rolling.type = RollingFile", "appender.rolling.name = rolling");
 
@@ -85,6 +91,7 @@ public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
     /**
      * Check that rolling file appenders have redundant properties removed.
      */
+    @Test
     public void testTransformRemovedRedundantProperties() {
         List<String> input = List.of(
             "appender.rolling.fileName = ${sys:es.logs.base_path}/${sys:es.logs.cluster_name}_server.json",
@@ -106,6 +113,7 @@ public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
     /**
      * Check that rolling file appenders have redundant properties removed.
      */
+    @Test
     public void testTransformSkipsPropertiesWithLineBreaks() {
         List<String> input = List.of(
             "appender.rolling.fileName = ${sys:es.logs.base_path}${sys:file.separator}\\",
@@ -121,6 +129,7 @@ public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
     /**
      * Check that as well as skipping old appenders, logger references to them are also skipped.
      */
+    @Test
     public void testTransformSkipsOldAppenderRefs() {
         List<String> input = List.of(
             "logger.index_indexing_slowlog.appenderRef.index_indexing_slowlog_rolling_old.ref = index_indexing_slowlog_rolling_old"
@@ -132,6 +141,7 @@ public class TransformLog4jConfigFilterTests extends GradleUnitTestCase {
     /**
      * Check that multiple blank lines are reduced to a single line.
      */
+    @Test
     public void testMultipleBlanksReducedToOne() {
         List<String> input = List.of("status = error", "", "", "rootLogger.level = info");
 

+ 1 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesTaskTests.java

@@ -8,7 +8,6 @@
 package org.elasticsearch.gradle.internal.precommit;
 
 import org.apache.groovy.util.Maps;
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
@@ -34,7 +33,7 @@ import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.containsString;
 
-public class DependencyLicensesTaskTests extends GradleUnitTestCase {
+public class DependencyLicensesTaskTests {
 
     private static final String PERMISSIVE_LICENSE_TEXT = "Eclipse Public License - v 2.0";
     private static final String STRICT_LICENSE_TEXT = "GNU LESSER GENERAL PUBLIC LICENSE Version 3";

+ 12 - 7
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/FilePermissionsTaskTests.java

@@ -7,16 +7,14 @@
  */
 package org.elasticsearch.gradle.internal.precommit;
 
-import com.carrotsearch.randomizedtesting.RandomizedTest;
-
 import org.apache.tools.ant.taskdefs.condition.Os;
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.testfixtures.ProjectBuilder;
 import org.junit.Assert;
+import org.junit.Test;
 
 import java.io.File;
 import java.nio.charset.Charset;
@@ -24,10 +22,15 @@ import java.nio.file.Files;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class FilePermissionsTaskTests extends GradleUnitTestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+
+public class FilePermissionsTaskTests {
 
+    @Test
     public void testCheckPermissionsWhenAnExecutableFileExists() throws Exception {
-        RandomizedTest.assumeFalse("Functionality is Unix specific", Os.isFamily(Os.FAMILY_WINDOWS));
+        assumeFalse("Functionality is Unix specific", Os.isFamily(Os.FAMILY_WINDOWS));
 
         Project project = createProject();
 
@@ -46,8 +49,9 @@ public class FilePermissionsTaskTests extends GradleUnitTestCase {
         file.delete();
     }
 
+    @Test
     public void testCheckPermissionsWhenNoFileExists() throws Exception {
-        RandomizedTest.assumeFalse("Functionality is Unix specific", Os.isFamily(Os.FAMILY_WINDOWS));
+        assumeFalse("Functionality is Unix specific", Os.isFamily(Os.FAMILY_WINDOWS));
 
         Project project = createProject();
 
@@ -60,8 +64,9 @@ public class FilePermissionsTaskTests extends GradleUnitTestCase {
         assertEquals("done", result.get(0));
     }
 
+    @Test
     public void testCheckPermissionsWhenNoExecutableFileExists() throws Exception {
-        RandomizedTest.assumeFalse("Functionality is Unix specific", Os.isFamily(Os.FAMILY_WINDOWS));
+        assumeFalse("Functionality is Unix specific", Os.isFamily(Os.FAMILY_WINDOWS));
 
         Project project = createProject();
 

+ 11 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/ForbiddenPatternsTaskTests.java

@@ -7,13 +7,13 @@
  */
 package org.elasticsearch.gradle.internal.precommit;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.elasticsearch.gradle.util.GradleUtils;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.FileTree;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.testfixtures.ProjectBuilder;
+import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
@@ -26,8 +26,13 @@ import java.util.Optional;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
 
-public class ForbiddenPatternsTaskTests extends GradleUnitTestCase {
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+public class ForbiddenPatternsTaskTests {
+
+    @Test
     public void testCheckInvalidPatternsWhenNoSourceFilesExist() throws Exception {
         Project project = createProject();
         ForbiddenPatternsTask task = createTask(project);
@@ -35,6 +40,7 @@ public class ForbiddenPatternsTaskTests extends GradleUnitTestCase {
         checkAndAssertTaskSuccessful(task);
     }
 
+    @Test
     public void testCheckInvalidPatternsWhenSourceFilesExistNoViolation() throws Exception {
         Project project = createProject();
         ForbiddenPatternsTask task = createTask(project);
@@ -43,6 +49,7 @@ public class ForbiddenPatternsTaskTests extends GradleUnitTestCase {
         checkAndAssertTaskSuccessful(task);
     }
 
+    @Test
     public void testCheckInvalidPatternsWhenSourceFilesExistHavingTab() throws Exception {
         Project project = createProject();
         ForbiddenPatternsTask task = createTask(project);
@@ -51,6 +58,7 @@ public class ForbiddenPatternsTaskTests extends GradleUnitTestCase {
         checkAndAssertTaskThrowsException(task);
     }
 
+    @Test
     public void testCheckInvalidPatternsWithCustomRule() throws Exception {
         Map<String, String> rule = new HashMap<>();
         rule.put("name", "TODO comments are not allowed");
@@ -64,6 +72,7 @@ public class ForbiddenPatternsTaskTests extends GradleUnitTestCase {
         checkAndAssertTaskThrowsException(task);
     }
 
+    @Test
     public void testCheckInvalidPatternsWhenExcludingFiles() throws Exception {
         Project project = createProject();
         ForbiddenPatternsTask task = createTask(project);

+ 4 - 5
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/precommit/UpdateShasTaskTests.java

@@ -8,7 +8,6 @@
 package org.elasticsearch.gradle.internal.precommit;
 
 import org.apache.commons.io.FileUtils;
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.artifacts.Dependency;
@@ -30,8 +29,11 @@ import java.security.NoSuchAlgorithmException;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-public class UpdateShasTaskTests extends GradleUnitTestCase {
+public class UpdateShasTaskTests {
 
     public static final String GROOVY_JAR_REGEX = "groovy-\\d\\.\\d+\\.\\d+\\.jar";
     @Rule
@@ -53,7 +55,6 @@ public class UpdateShasTaskTests extends GradleUnitTestCase {
 
     @Test
     public void whenDependencyDoesntExistThenShouldDeleteDependencySha() throws IOException, NoSuchAlgorithmException {
-
         File unusedSha = createFileIn(getLicensesDir(project), "test.sha1", "");
         task.updateShas();
 
@@ -84,10 +85,8 @@ public class UpdateShasTaskTests extends GradleUnitTestCase {
             .findFirst()
             .get();
         String groovyShaName = groovyJar.getName() + ".sha1";
-
         File groovySha = createFileIn(getLicensesDir(project), groovyShaName, "content");
         task.updateShas();
-
         assertThat(FileUtils.readFileToString(groovySha), equalTo("content"));
     }
 

+ 2 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/GenerateReleaseNotesTaskTest.java

@@ -8,7 +8,6 @@
 
 package org.elasticsearch.gradle.internal.release;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -17,6 +16,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.aMapWithSize;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.containsInAnyOrder;
@@ -32,7 +32,7 @@ import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
-public class GenerateReleaseNotesTaskTest extends GradleUnitTestCase {
+public class GenerateReleaseNotesTaskTest {
     private GitWrapper gitWrapper;
 
     @Before

+ 4 - 3
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/release/PruneChangelogsTaskTests.java

@@ -10,7 +10,6 @@ package org.elasticsearch.gradle.internal.release;
 
 import org.elasticsearch.gradle.OS;
 import org.elasticsearch.gradle.internal.release.PruneChangelogsTask.DeleteHelper;
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.gradle.api.GradleException;
 import org.junit.Before;
 import org.junit.Test;
@@ -25,8 +24,10 @@ import java.util.stream.Stream;
 import static org.elasticsearch.gradle.OS.WINDOWS;
 import static org.elasticsearch.gradle.internal.release.PruneChangelogsTask.findAndDeleteFiles;
 import static org.elasticsearch.gradle.internal.release.PruneChangelogsTask.findPreviousVersion;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assume.assumeFalse;
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
@@ -36,7 +37,7 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-public class PruneChangelogsTaskTests extends GradleUnitTestCase {
+public class PruneChangelogsTaskTests {
 
     private GitWrapper gitWrapper;
     private DeleteHelper deleteHelper;
@@ -152,7 +153,7 @@ public class PruneChangelogsTaskTests extends GradleUnitTestCase {
         when(deleteHelper.deleteFiles(any())).thenReturn(Set.of(new File("rootDir/docs/changelog/1234.yml")));
 
         // when:
-        GradleException e = expectThrows(
+        GradleException e = assertThrows(
             GradleException.class,
             () -> findAndDeleteFiles(
                 gitWrapper,

+ 7 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/TransformTests.java

@@ -18,7 +18,6 @@ import com.fasterxml.jackson.databind.node.TextNode;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLParser;
 
-import org.elasticsearch.gradle.internal.test.GradleUnitTestCase;
 import org.elasticsearch.gradle.internal.test.rest.transform.headers.InjectHeaders;
 import org.hamcrest.CoreMatchers;
 import org.hamcrest.Matchers;
@@ -38,7 +37,13 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.LongAdder;
 import java.util.stream.Collectors;
 
-public abstract class TransformTests extends GradleUnitTestCase {
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public abstract class TransformTests {
 
     private static final YAMLFactory YAML_FACTORY = new YAMLFactory();
     private static final ObjectMapper MAPPER = new ObjectMapper(YAML_FACTORY);

+ 7 - 2
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/AddMatchTests.java

@@ -22,6 +22,12 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
 public class AddMatchTests extends TransformTests {
 
     private static final YAMLFactory YAML_FACTORY = new YAMLFactory();
@@ -34,7 +40,7 @@ public class AddMatchTests extends TransformTests {
         JsonNode addNode = MAPPER.convertValue("_doc", JsonNode.class);
         assertEquals(
             "adding matches is only supported for named tests",
-            expectThrows(
+            assertThrows(
                 NullPointerException.class,
                 () -> transformTests(tests, Collections.singletonList(new AddMatch("_type", addNode, null)))
             ).getMessage()
@@ -89,7 +95,6 @@ public class AddMatchTests extends TransformTests {
                 if (lastTestHasAddedObject.get() == false && matchObject.get("my_number") != null) {
                     lastTestHasAddedObject.set(true);
                 }
-
             }
         });
         assertTrue(lastTestHasMatchObject.get());

+ 4 - 0
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/match/RemoveMatchTests.java

@@ -23,6 +23,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
 public class RemoveMatchTests extends TransformTests {
 
     private static final YAMLFactory YAML_FACTORY = new YAMLFactory();

+ 4 - 1
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsRegexTests.java

@@ -19,6 +19,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
 public class InjectWarningsRegexTests extends InjectFeatureTests {
 
     private static final String WARNINGS_REGEX = "warnings_regex";
@@ -34,7 +37,7 @@ public class InjectWarningsRegexTests extends InjectFeatureTests {
         validateSetupDoesNotExist(tests);
         assertEquals(
             "inject warnings is only supported for named tests",
-            expectThrows(
+            assertThrows(
                 NullPointerException.class,
                 () -> transformTests(tests, Collections.singletonList(new InjectWarnings(new ArrayList<>(addWarnings), null)))
             ).getMessage()

+ 4 - 1
build-tools-internal/src/test/java/org/elasticsearch/gradle/internal/test/rest/transform/warnings/InjectWarningsTests.java

@@ -19,6 +19,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+
 public class InjectWarningsTests extends InjectFeatureTests {
     Set<String> addWarnings = Set.of("added warning");
     private static final String WARNINGS = "warnings";
@@ -33,7 +36,7 @@ public class InjectWarningsTests extends InjectFeatureTests {
         validateSetupDoesNotExist(tests);
         assertEquals(
             "inject warnings is only supported for named tests",
-            expectThrows(
+            assertThrows(
                 NullPointerException.class,
                 () -> transformTests(tests, Collections.singletonList(new InjectWarnings(new ArrayList<>(addWarnings), null)))
             ).getMessage()

+ 0 - 1
build-tools/build.gradle

@@ -123,7 +123,6 @@ dependencies {
     testFixturesApi gradleApi()
     testFixturesApi gradleTestKit()
     testFixturesApi buildLibs.junit
-    testFixturesApi buildLibs.randomized.runner
     testFixturesApi buildLibs.wiremock
     testFixturesApi platform(buildLibs.spock.platform)
     testFixturesApi(buildLibs.spock.core) {

+ 0 - 46
build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/BaseTestCase.java

@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-package org.elasticsearch.gradle.internal.test;
-
-import junit.framework.AssertionFailedError;
-
-import com.carrotsearch.randomizedtesting.JUnit4MethodProvider;
-import com.carrotsearch.randomizedtesting.RandomizedRunner;
-import com.carrotsearch.randomizedtesting.annotations.TestMethodProviders;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
-
-import org.junit.Assert;
-import org.junit.runner.RunWith;
-
-@RunWith(RandomizedRunner.class)
-@TestMethodProviders({ JUnit4MethodProvider.class, JUnit3MethodProvider.class })
-@ThreadLeakLingering(linger = 5000) // wait for "Connection worker" to die
-public abstract class BaseTestCase extends Assert {
-
-    // add expectThrows from junit 5
-    @FunctionalInterface
-    public interface ThrowingRunnable {
-        void run() throws Throwable;
-    }
-
-    public static <T extends Throwable> T expectThrows(Class<T> expectedType, ThrowingRunnable runnable) {
-        try {
-            runnable.run();
-        } catch (Throwable e) {
-            if (expectedType.isInstance(e)) {
-                return expectedType.cast(e);
-            }
-            AssertionFailedError assertion = new AssertionFailedError(
-                "Unexpected exception type, expected " + expectedType.getSimpleName() + " but got " + e
-            );
-            assertion.initCause(e);
-            throw assertion;
-        }
-        throw new AssertionFailedError("Expected exception " + expectedType.getSimpleName() + " but no exception was thrown");
-    }
-}

+ 0 - 225
build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleIntegrationTestCase.java

@@ -1,225 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-package org.elasticsearch.gradle.internal.test;
-
-import org.apache.commons.io.FileUtils;
-import org.gradle.testkit.runner.BuildResult;
-import org.gradle.testkit.runner.BuildTask;
-import org.gradle.testkit.runner.GradleRunner;
-import org.gradle.testkit.runner.TaskOutcome;
-import org.junit.Rule;
-import org.junit.rules.TemporaryFolder;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.UncheckedIOException;
-import java.lang.management.ManagementFactory;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.util.List;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import static org.hamcrest.CoreMatchers.containsString;
-
-public abstract class GradleIntegrationTestCase extends GradleUnitTestCase {
-
-    @Rule
-    public TemporaryFolder testkitTmpDir = new TemporaryFolder();
-
-    public File workingProjectDir = null;
-
-    public abstract String projectName();
-
-    protected File getProjectDir() {
-        if (workingProjectDir == null) {
-            File root = new File("src/testKit/");
-            if (root.exists() == false) {
-                throw new RuntimeException(
-                    "Could not find resources dir for integration tests. "
-                        + "Note that these tests can only be ran by Gradle and are not currently supported by the IDE"
-                );
-            }
-            try {
-                workingProjectDir = new File(testkitTmpDir.getRoot(), projectName());
-                File sourcFolder = new File(root, projectName());
-                FileUtils.copyDirectory(sourcFolder, workingProjectDir);
-            } catch (IOException e) {
-                throw new UncheckedIOException(e);
-            }
-
-        }
-        return workingProjectDir;
-    }
-
-    protected GradleRunner getGradleRunner() {
-        File testkit;
-        try {
-            testkit = testkitTmpDir.newFolder();
-        } catch (IOException e) {
-            throw new UncheckedIOException(e);
-        }
-        return new InternalAwareGradleRunner(
-            GradleRunner.create()
-                .withProjectDir(getProjectDir())
-                .withPluginClasspath()
-                .withTestKitDir(testkit)
-                .forwardOutput()
-                .withDebug(ManagementFactory.getRuntimeMXBean().getInputArguments().toString().indexOf("-agentlib:jdwp") > 0)
-        );
-    }
-
-    protected File getBuildDir(String name) {
-        return new File(getProjectDir(), "build");
-    }
-
-    protected void assertOutputContains(String output, String... lines) {
-        for (String line : lines) {
-            assertOutputContains(output, line);
-        }
-        List<Integer> index = Stream.of(lines).map(line -> output.indexOf(line)).collect(Collectors.toList());
-        if (index.equals(index.stream().sorted().collect(Collectors.toList())) == false) {
-            fail(
-                "Expected the following lines to appear in this order:\n"
-                    + Stream.of(lines).map(line -> "   - `" + line + "`").collect(Collectors.joining("\n"))
-                    + "\nTBut the order was different. Output is:\n\n```"
-                    + output
-                    + "\n```\n"
-            );
-        }
-    }
-
-    protected void assertOutputContains(String output, Set<String> lines) {
-        for (String line : lines) {
-            assertOutputContains(output, line);
-        }
-    }
-
-    protected void assertOutputContains(String output, String line) {
-        assertThat("Expected the following line in output:\n\n" + line + "\n\nOutput is:\n" + output, output, containsString(line));
-    }
-
-    protected void assertOutputMissing(String output, String line) {
-        assertFalse("Expected the following line not to be in output:\n\n" + line + "\n\nOutput is:\n" + output, output.contains(line));
-    }
-
-    protected void assertOutputMissing(String output, String... lines) {
-        for (String line : lines) {
-            assertOutputMissing(line);
-        }
-    }
-
-    protected void assertTaskFailed(BuildResult result, String taskName) {
-        assertTaskOutcome(result, taskName, TaskOutcome.FAILED);
-    }
-
-    protected void assertTaskSuccessful(BuildResult result, String... taskNames) {
-        for (String taskName : taskNames) {
-            assertTaskOutcome(result, taskName, TaskOutcome.SUCCESS);
-        }
-    }
-
-    protected void assertTaskSkipped(BuildResult result, String... taskNames) {
-        for (String taskName : taskNames) {
-            assertTaskOutcome(result, taskName, TaskOutcome.SKIPPED);
-        }
-    }
-
-    protected void assertTaskNoSource(BuildResult result, String... taskNames) {
-        for (String taskName : taskNames) {
-            assertTaskOutcome(result, taskName, TaskOutcome.NO_SOURCE);
-        }
-    }
-
-    private void assertTaskOutcome(BuildResult result, String taskName, TaskOutcome taskOutcome) {
-        BuildTask task = result.task(taskName);
-        if (task == null) {
-            fail(
-                "Expected task `" + taskName + "` to be " + taskOutcome + ", but it did not run" + "\n\nOutput is:\n" + result.getOutput()
-            );
-        }
-        assertEquals(
-            "Expected task `"
-                + taskName
-                + "` to be "
-                + taskOutcome
-                + " but it was: "
-                + task.getOutcome()
-                + "\n\nOutput is:\n"
-                + result.getOutput(),
-            taskOutcome,
-            task.getOutcome()
-        );
-    }
-
-    protected void assertTaskUpToDate(BuildResult result, String... taskNames) {
-        for (String taskName : taskNames) {
-            BuildTask task = result.task(taskName);
-            if (task == null) {
-                fail("Expected task `" + taskName + "` to be up-to-date, but it did not run");
-            }
-            assertEquals(
-                "Expected task to be up to date but it was: " + task.getOutcome() + "\n\nOutput is:\n" + result.getOutput(),
-                TaskOutcome.UP_TO_DATE,
-                task.getOutcome()
-            );
-        }
-    }
-
-    protected void assertNoDeprecationWarning(BuildResult result) {
-        assertOutputMissing(result.getOutput(), "Deprecated Gradle features were used in this build");
-    }
-
-    protected void assertBuildFileExists(BuildResult result, String projectName, String path) {
-        Path absPath = getBuildDir(projectName).toPath().resolve(path);
-        assertTrue(
-            result.getOutput() + "\n\nExpected `" + absPath + "` to exists but it did not" + "\n\nOutput is:\n" + result.getOutput(),
-            Files.exists(absPath)
-        );
-    }
-
-    protected void assertBuildFileDoesNotExists(BuildResult result, String projectName, String path) {
-        Path absPath = getBuildDir(projectName).toPath().resolve(path);
-        assertFalse(
-            result.getOutput() + "\n\nExpected `" + absPath + "` bo to exists but it did" + "\n\nOutput is:\n" + result.getOutput(),
-            Files.exists(absPath)
-        );
-    }
-
-    protected String getLocalTestDownloadsPath() {
-        return getLocalTestPath("test.local-test-downloads-path");
-    }
-
-    private String getLocalTestPath(String propertyName) {
-        String property = System.getProperty(propertyName);
-        Objects.requireNonNull(property, propertyName + " not passed to tests");
-        File file = new File(property);
-        assertTrue("Expected " + property + " to exist, but it did not!", file.exists());
-        if (File.separator.equals("\\")) {
-            // Use / on Windows too, the build script is not happy with \
-            return file.getAbsolutePath().replace(File.separator, "/");
-        } else {
-            return file.getAbsolutePath();
-        }
-    }
-
-    public void assertOutputOnlyOnce(String output, String... text) {
-        for (String each : text) {
-            int i = output.indexOf(each);
-            if (i == -1) {
-                fail("Expected \n```" + each + "```\nto appear at most once, but it didn't at all.\n\nOutout is:\n" + output);
-            }
-            if (output.indexOf(each) != output.lastIndexOf(each)) {
-                fail("Expected `" + each + "` to appear at most once, but it did multiple times.\n\nOutout is:\n" + output);
-            }
-        }
-    }
-
-}

+ 0 - 27
build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleThreadsFilter.java

@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-package org.elasticsearch.gradle.internal.test;
-
-import com.carrotsearch.randomizedtesting.ThreadFilter;
-
-/**
- * Filter out threads controlled by gradle that may be created during unit tests.
- *
- * Currently this includes pooled threads for Exec as well as file system event watcher threads.
- */
-public class GradleThreadsFilter implements ThreadFilter {
-
-    @Override
-    public boolean reject(Thread t) {
-        return t.getName().startsWith("Exec process")
-            || t.getName().startsWith("File watcher consumer")
-            || t.getName().startsWith("Memory manager");
-
-    }
-}

+ 0 - 20
build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/GradleUnitTestCase.java

@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-package org.elasticsearch.gradle.internal.test;
-
-import com.carrotsearch.randomizedtesting.JUnit4MethodProvider;
-import com.carrotsearch.randomizedtesting.RandomizedRunner;
-import com.carrotsearch.randomizedtesting.annotations.TestMethodProviders;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakFilters;
-
-import org.junit.runner.RunWith;
-
-@RunWith(RandomizedRunner.class)
-@TestMethodProviders({ JUnit4MethodProvider.class, JUnit3MethodProvider.class })
-@ThreadLeakFilters(defaultFilters = true, filters = { GradleThreadsFilter.class })
-public abstract class GradleUnitTestCase extends BaseTestCase {}

+ 0 - 44
build-tools/src/testFixtures/java/org/elasticsearch/gradle/internal/test/JUnit3MethodProvider.java

@@ -1,44 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-package org.elasticsearch.gradle.internal.test;
-
-import com.carrotsearch.randomizedtesting.ClassModel;
-import com.carrotsearch.randomizedtesting.ClassModel.MethodModel;
-import com.carrotsearch.randomizedtesting.TestMethodProvider;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * Backwards compatible test* method provider (public, non-static).
- *
- * copy of org.apache.lucene.util.LuceneJUnit3MethodProvider to avoid a dependency between build and test fw.
- */
-public final class JUnit3MethodProvider implements TestMethodProvider {
-    @Override
-    public Collection<Method> getTestMethods(Class<?> suiteClass, ClassModel classModel) {
-        Map<Method, MethodModel> methods = classModel.getMethods();
-        ArrayList<Method> result = new ArrayList<>();
-        for (MethodModel mm : methods.values()) {
-            // Skip any methods that have overrieds/ shadows.
-            if (mm.getDown() != null) continue;
-
-            Method m = mm.element;
-            if (m.getName().startsWith("test")
-                && Modifier.isPublic(m.getModifiers())
-                && Modifier.isStatic(m.getModifiers()) == false
-                && m.getParameterTypes().length == 0) {
-                result.add(m);
-            }
-        }
-        return result;
-    }
-}

+ 0 - 1
gradle/build.versions.toml

@@ -33,7 +33,6 @@ junit5-vintage = { group = "org.junit.vintage", name="junit-vintage-engine", ver
 maven-model = "org.apache.maven:maven-model:3.6.2"
 mockito-core = "org.mockito:mockito-core:1.9.5"
 nebula-info = "com.netflix.nebula:gradle-info-plugin:11.3.3"
-randomized-runner = "com.carrotsearch.randomizedtesting:randomizedtesting-runner:2.7.7"
 shadow-plugin = "gradle.plugin.com.github.johnrengelman:shadow:7.1.2"
 spock-core = { group = "org.spockframework", name="spock-core", version.ref="spock" }
 spock-junit4 = { group = "org.spockframework", name="spock-junit4", version.ref="spock" }