Merge pull request #14402 from rjernst/reorganize_rr_gradle_plugin
Move RR gradle plugin files to match external repo paths
This commit is contained in:
commit
0a4fa7453b
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
import com.carrotsearch.ant.tasks.junit4.SuiteBalancer
|
import com.carrotsearch.ant.tasks.junit4.SuiteBalancer
|
||||||
import com.carrotsearch.ant.tasks.junit4.balancers.ExecutionTimeBalancer
|
import com.carrotsearch.ant.tasks.junit4.balancers.ExecutionTimeBalancer
|
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener
|
import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener
|
||||||
import com.carrotsearch.ant.tasks.junit4.listeners.antxml.AntXmlReport
|
import com.carrotsearch.ant.tasks.junit4.listeners.antxml.AntXmlReport
|
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
import org.gradle.api.logging.LogLevel
|
import org.gradle.api.logging.LogLevel
|
||||||
import org.gradle.api.logging.Logger
|
import org.gradle.api.logging.Logger
|
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
import com.carrotsearch.ant.tasks.junit4.JUnit4
|
import com.carrotsearch.ant.tasks.junit4.JUnit4
|
||||||
import org.gradle.api.AntBuilder
|
import org.gradle.api.AntBuilder
|
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
import com.carrotsearch.ant.tasks.junit4.ListenersList
|
import com.carrotsearch.ant.tasks.junit4.ListenersList
|
||||||
import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener
|
import com.carrotsearch.ant.tasks.junit4.listeners.AggregatedEventListener
|
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
class SlowTestsConfiguration {
|
class SlowTestsConfiguration {
|
||||||
int heartbeat = 0
|
int heartbeat = 0
|
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
class StackTraceFiltersConfiguration {
|
class StackTraceFiltersConfiguration {
|
||||||
List<String> patterns = new ArrayList<>()
|
List<String> patterns = new ArrayList<>()
|
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
import org.gradle.util.ConfigureUtil
|
import org.gradle.util.ConfigureUtil
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
import com.carrotsearch.ant.tasks.junit4.JUnit4
|
import com.carrotsearch.ant.tasks.junit4.JUnit4
|
||||||
import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.eventbus.Subscribe
|
import com.carrotsearch.ant.tasks.junit4.dependencies.com.google.common.eventbus.Subscribe
|
|
@ -1,4 +1,4 @@
|
||||||
package com.carrotsearch.gradle.randomizedtesting
|
package com.carrotsearch.gradle.junit4
|
||||||
|
|
||||||
import com.carrotsearch.ant.tasks.junit4.JUnit4
|
import com.carrotsearch.ant.tasks.junit4.JUnit4
|
||||||
import com.carrotsearch.ant.tasks.junit4.Pluralize
|
import com.carrotsearch.ant.tasks.junit4.Pluralize
|
||||||
|
@ -18,7 +18,7 @@ import org.junit.runner.Description
|
||||||
import java.util.concurrent.atomic.AtomicInteger
|
import java.util.concurrent.atomic.AtomicInteger
|
||||||
|
|
||||||
import static com.carrotsearch.ant.tasks.junit4.FormattingUtils.*
|
import static com.carrotsearch.ant.tasks.junit4.FormattingUtils.*
|
||||||
import static com.carrotsearch.gradle.randomizedtesting.TestLoggingConfiguration.OutputMode
|
import static com.carrotsearch.gradle.junit4.TestLoggingConfiguration.OutputMode
|
||||||
|
|
||||||
class TestReportLogger extends TestsSummaryEventListener implements AggregatedEventListener {
|
class TestReportLogger extends TestsSummaryEventListener implements AggregatedEventListener {
|
||||||
|
|
|
@ -37,7 +37,7 @@ class BuildPlugin implements Plugin<Project> {
|
||||||
void apply(Project project) {
|
void apply(Project project) {
|
||||||
globalBuildInfo(project)
|
globalBuildInfo(project)
|
||||||
project.pluginManager.apply('java')
|
project.pluginManager.apply('java')
|
||||||
project.pluginManager.apply('carrotsearch.randomizedtesting')
|
project.pluginManager.apply('carrotsearch.randomized-testing')
|
||||||
// these plugins add lots of info to our jars
|
// these plugins add lots of info to our jars
|
||||||
project.pluginManager.apply('nebula.info-broker')
|
project.pluginManager.apply('nebula.info-broker')
|
||||||
project.pluginManager.apply('nebula.info-basic')
|
project.pluginManager.apply('nebula.info-basic')
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.gradle.test
|
package org.elasticsearch.gradle.test
|
||||||
|
|
||||||
import com.carrotsearch.gradle.randomizedtesting.RandomizedTestingTask
|
import com.carrotsearch.gradle.junit4.RandomizedTestingTask
|
||||||
import org.elasticsearch.gradle.BuildPlugin
|
import org.elasticsearch.gradle.BuildPlugin
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
import org.gradle.api.Task
|
import org.gradle.api.Task
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.gradle.test
|
package org.elasticsearch.gradle.test
|
||||||
|
|
||||||
import com.carrotsearch.gradle.randomizedtesting.RandomizedTestingTask
|
import com.carrotsearch.gradle.junit4.RandomizedTestingTask
|
||||||
import org.elasticsearch.gradle.ElasticsearchProperties
|
import org.elasticsearch.gradle.ElasticsearchProperties
|
||||||
import org.gradle.api.Plugin
|
import org.gradle.api.Plugin
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
|
@ -29,7 +29,7 @@ class RestTestPlugin implements Plugin<Project> {
|
||||||
@Override
|
@Override
|
||||||
void apply(Project project) {
|
void apply(Project project) {
|
||||||
project.pluginManager.apply('java-base')
|
project.pluginManager.apply('java-base')
|
||||||
project.pluginManager.apply('carrotsearch.randomizedtesting')
|
project.pluginManager.apply('carrotsearch.randomized-testing')
|
||||||
project.pluginManager.apply('idea')
|
project.pluginManager.apply('idea')
|
||||||
|
|
||||||
// remove some unnecessary tasks for a qa test
|
// remove some unnecessary tasks for a qa test
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
implementation-class=com.carrotsearch.gradle.junit4.RandomizedTestingPlugin
|
|
@ -1 +0,0 @@
|
||||||
implementation-class=com.carrotsearch.gradle.randomizedtesting.RandomizedTestingPlugin
|
|
|
@ -17,7 +17,7 @@
|
||||||
* under the License.
|
* under the License.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import com.carrotsearch.gradle.randomizedtesting.RandomizedTestingTask
|
import com.carrotsearch.gradle.junit4.RandomizedTestingTask
|
||||||
import org.elasticsearch.gradle.BuildPlugin
|
import org.elasticsearch.gradle.BuildPlugin
|
||||||
import org.elasticsearch.gradle.test.RestSpecHack
|
import org.elasticsearch.gradle.test.RestSpecHack
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue