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
Test configuration updates
Rich Turner248f138d3d9f
diff --git a/gradle.properties b/gradle.propertiesindex 6728624b8..80b9e2f7a 100644--- a/gradle.properties+++ b/gradle.properties@@ -23,10 +23,9 @@ postgresJdbcVersion = 42.3.1hikaricpVersion = 3.4.5junitVersion = 4.13.2spockVersion = 2.0-groovy-3.0-byteBuddyVersion = 1.9.3-objenesisVersion = 2.6+byteBuddyVersion = 1.11.0+objenesisVersion = 3.2camelVersion = 2.19.0-tyrusVersion = 1.10sunriseSunsetCalculatorVersion = 1.2easyRulesVersion = 4.1.0quartzVersion= 2.3.2diff --git a/test/build.gradle b/test/build.gradleindex 38856d7f0..f56ff0085 100644--- a/test/build.gradle+++ b/test/build.gradle@@ -6,21 +6,20 @@ plugins {}apply plugin: "java-library"+apply plugin: "java-test-fixtures"apply plugin: "groovy"dependencies {api resolveProject(":manager")- api "org.codehaus.groovy:groovy-all:$groovyVersion"+ implementation "org.codehaus.groovy:groovy:$groovyVersion"+ testFixturesApi platform("org.spockframework:spock-bom:$spockVersion")+ testFixturesApi 'org.spockframework:spock-core'- api "junit:junit:$junitVersion"- api "org.spockframework:spock-core:$spockVersion"-- api "org.glassfish.tyrus:tyrus-client:$tyrusVersion"- api "org.glassfish.tyrus:tyrus-container-grizzly-client:$tyrusVersion"- api "org.objenesis:objenesis:$objenesisVersion"- api "net.bytebuddy:byte-buddy:$byteBuddyVersion"+ // optional dependencies for using Spock+ 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)api("com.github.calimero:calimero-server:$calimeroVersion") {// Libraries should not depend on a logging implementation and/or alpha versions!@@ -34,7 +33,6 @@ tasks.withType(Test) {test {workingDir = findProject(":openremote") != null ? resolveProject("").projectDir : rootProject.projectDir- outputs.upToDateWhen {false}useJUnitPlatform()testLogging {// set options for log level LIFECYCLEdiff --git a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovysimilarity index 99%rename from test/src/main/groovy/org/openremote/test/ContainerTrait.groovyrename to test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovyindex 514847eab..85525ef3e 100644--- a/test/src/main/groovy/org/openremote/test/ContainerTrait.groovy+++ b/test/src/testFixtures/groovy/org/openremote/test/ContainerTrait.groovy@@ -21,7 +21,6 @@ package org.openremote.testimport org.apache.camel.ProducerTemplateimport org.apache.camel.builder.RouteBuilder-import org.glassfish.tyrus.client.ClientManagerimport org.jboss.resteasy.client.jaxrs.ResteasyClientimport org.jboss.resteasy.client.jaxrs.ResteasyClientBuilderimport org.jboss.resteasy.client.jaxrs.ResteasyWebTargetdiff --git a/test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovy b/test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovysimilarity index 100%rename from test/src/main/groovy/org/openremote/test/ManagerContainerTrait.groovyrename to test/src/testFixtures/groovy/org/openremote/test/ManagerContainerTrait.groovydiff --git a/test/src/main/groovy/org/openremote/test/TestUtil.groovy b/test/src/testFixtures/groovy/org/openremote/test/TestUtil.groovysimilarity index 100%rename from test/src/main/groovy/org/openremote/test/TestUtil.groovyrename to test/src/testFixtures/groovy/org/openremote/test/TestUtil.groovydiff --git a/test/src/main/java/org/openremote/test/TestFixture.java b/test/src/testFixtures/java/org/openremote/test/TestFixture.javasimilarity index 100%rename from test/src/main/java/org/openremote/test/TestFixture.javarename to test/src/testFixtures/java/org/openremote/test/TestFixture.javadiff --git a/test/src/test/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension b/test/src/testFixtures/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtensionsimilarity index 100%rename from test/src/test/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtensionrename to test/src/testFixtures/resources/META-INF/services/org.spockframework.runtime.extension.IGlobalExtension