100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Make downstream consumption of test fixtures easier (#1723)
Rich Turnerab8128edf454
diff --git a/test/build.gradle b/test/build.gradleindex 574a7bb60..0def5b38a 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -6,7 +6,6 @@ plugins {}apply plugin: "java-library"-apply plugin: "java-test-fixtures"apply plugin: "groovy"apply plugin: "maven-publish"apply plugin: "signing"@@ -14,16 +13,16 @@ apply plugin: "signing"dependencies {testImplementation project(":setup").sourceSets.integration.output- testFixturesApi project(":manager")+ api project(":manager")- testFixturesImplementation "org.apache.groovy:groovy-all:$groovyVersion"- testFixturesImplementation "org.apache.groovy:groovy-test:$groovyVersion"- testFixturesApi platform("org.spockframework:spock-bom:$spockVersion")- testFixturesApi 'org.spockframework:spock-core'+ implementation "org.apache.groovy:groovy-all:$groovyVersion"+ implementation "org.apache.groovy:groovy-test:$groovyVersion"+ api platform("org.spockframework:spock-bom:$spockVersion")+ api 'org.spockframework:spock-core'// optional dependencies for using Spock- testFixturesRuntimeOnly "net.bytebuddy:byte-buddy:$byteBuddyVersion" // allows mocking of classes (in addition to interfaces)- testFixturesRuntimeOnly "org.objenesis:objenesis:$objenesisVersion" // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)+ testRuntimeOnly "net.bytebuddy:byte-buddy:$byteBuddyVersion" // allows mocking of classes (in addition to interfaces)+ testRuntimeOnly "org.objenesis:objenesis:$objenesisVersion" // allows mocking of classes without default constructor (together with ByteBuddy or CGLIB)testImplementation("com.github.calimero:calimero-server:$calimeroVersion") {// Has a dependency on the SLF4J simple providerdiff --git a/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ContainerTrait.groovysimilarity index 100%rename from test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovyrename to test/src/main/groovy/org/openremote/test/ContainerTrait.groovydiff --git a/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovysimilarity index 100%rename from test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovyrename to test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovydiff --git a/test/src/testFixtures/groovy/org/openremote/test/TestUtil.groovy b/test/src/main/groovy/org/openremote/test/TestUtil.groovysimilarity index 100%rename from test/src/testFixtures/groovy/org/openremote/test/TestUtil.groovyrename to test/src/main/groovy/org/openremote/test/TestUtil.groovydiff --git a/test/src/testFixtures/java/org/openremote/test/TestFixture.java b/test/src/main/java/org/openremote/test/TestFixture.javasimilarity index 100%rename from test/src/testFixtures/java/org/openremote/test/TestFixture.javarename to test/src/main/java/org/openremote/test/TestFixture.javadiff --git a/test/src/testFixtures/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension b/test/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtensionsimilarity index 100%rename from test/src/testFixtures/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtensionrename to test/src/main/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension