From 74512335884de44c3d545816f5173ba025e1bac2 Mon Sep 17 00:00:00 2001 From: niclas Date: Fri, 3 Aug 2018 13:48:13 +0800 Subject: [PATCH] Fixed that the tests executes correctly, and no failures. --- management/.gitignore | 2 +- management/build.gradle | 22 +++++++++---------- management/dependencies.gradle | 5 +++-- management/gradle.properties | 9 ++++---- .../channel-manager-impl/build.gradle | 1 + .../command-executor-cli/build.gradle | 1 + .../command-executor-impl/build.gradle | 2 ++ .../desktop-manager-impl/build.gradle | 1 + .../environment-manager-cli/build.gradle | 1 + .../environment-manager-impl/build.gradle | 1 + .../host-registration-impl/build.gradle | 1 + .../host-registry-cli/build.gradle | 2 ++ .../host-registry-impl/build.gradle | 2 ++ .../host-registry-rest/build.gradle | 1 + .../hub-manager/hub-manager-cli/build.gradle | 1 + .../identity-manager-impl/build.gradle | 1 + .../key-server/key-server-impl/build.gradle | 1 + .../local-peer/local-peer-impl/build.gradle | 2 ++ .../core/messenger/messenger-api/pom.xml | 1 - .../messenger/messenger-impl/build.gradle | 2 ++ .../core/messenger/messenger-impl/pom.xml | 1 - .../messenger/messenger-rest/build.gradle | 1 + .../core/metric/metric-cli/build.gradle | 1 + .../core/metric/metric-impl/build.gradle | 2 ++ .../server/core/metric/metric-impl/pom.xml | 1 - .../network-manager-impl/build.gradle | 1 + .../peer-manager-cli/build.gradle | 1 + .../peer-manager-impl/build.gradle | 4 ++++ .../server/core/subutai-appender/build.gradle | 1 + .../template-manager-impl/build.gradle | 1 + .../core/tracker/tracker-impl/build.gradle | 1 + .../core/tracker/tracker-rest/build.gradle | 2 ++ .../tracker/rest/RestServiceImplTest.java | 3 ++- management/server/subutai-common/build.gradle | 3 ++- .../server/subutai-hub-share/build.gradle | 1 + 35 files changed, 60 insertions(+), 23 deletions(-) diff --git a/management/.gitignore b/management/.gitignore index e440e0671cf..6884cc3ae44 100644 --- a/management/.gitignore +++ b/management/.gitignore @@ -9,7 +9,7 @@ .classpath .settings .metadata -target +target/ git.properties .gitignore # Package Files # diff --git a/management/build.gradle b/management/build.gradle index d26c45e6c1d..12d1e7983ea 100644 --- a/management/build.gradle +++ b/management/build.gradle @@ -109,21 +109,21 @@ allprojects { } } - if (releaseBuild == "true") { - println "Project: " + project.name + " in Releasebuild: " + releaseBuild + apply plugin: 'nebula.nebula-release' - apply plugin: 'nebula.nebula-release' - - uploadArchives { - repositories { - mavenDeployer { - repository(url: "$nexusDeployTarget") { - authentication(userName: "$nexusUsername", password: "$nexusPassword") - } + uploadArchives { + repositories { + mavenDeployer { + repository(url: "$nexusDeployTarget") { + authentication(userName: "$nexusUsername", password: "$nexusPassword") } } } - project.rootProject.tasks.release.dependsOn(uploadArchives) + } + project.rootProject.tasks.release.dependsOn(uploadArchives) + + test { + workingDir = file(project.projectDir) } if (ciBuild.toBoolean()) { diff --git a/management/dependencies.gradle b/management/dependencies.gradle index 0b0ec86438a..02c016a6256 100644 --- a/management/dependencies.gradle +++ b/management/dependencies.gradle @@ -20,7 +20,7 @@ def gogoCommandVersion = "0.16.0" def gogoRuntimeVersion = "0.16.2" def gsonVersion = '2.3.1' def guavaVersion = '18.0' -def hamcrestVersion = '1.3.0' +def hamcrestVersion = '1.3' def httpClientVersion = '4.5.2' def httpCoreVersion = '4.4.5' def jacksonVersion = '2.6.3' @@ -151,7 +151,7 @@ rootProject.ext { karaf_shell : [group: "org.apache.karaf.shell", name: "org.apache.karaf.shell.console", version: karafVersion, transitive: false], log4j : "log4j:log4j:$log4jVersion", - mockito : [group: "org.mockito", name: "mockito-core", version: mockitoVersion, transitive: true], + mockito : [group: "org.mockito", name: "mockito-all", version: mockitoVersion, transitive: true], netty : "io.netty:netty:$nettyVersion", nimbus_jwt : "com.nimbusds:nimbus-jose-jwt:$nimbusJwtVersion", @@ -165,6 +165,7 @@ rootProject.ext { osgi_core : [group: "org.osgi", name: "org.osgi.core", version: osgiCoreVersion], servicemix_beanflow : [group: "org.apache.servicemix", name: "servicemix-beanflow", version: servicemixBeanflowVersion, transitive: false], slf4j : [group: "org.slf4j", name: "slf4j-api", version: slf4jVersion, transitive: false], + slf4j_testlogger : [group: "org.slf4j", name: "slf4j-simple", version: slf4jVersion, transitive: false], uuid_generator : [group: "com.fasterxml.uuid", name: "java-uuid-generator", version: uuidGeneratorVersion, transitive: false], xerial_snappy : "org.xerial.snappy:snappy-java:$xerialSnappyVersion" diff --git a/management/gradle.properties b/management/gradle.properties index 6aee5b2bd02..dadfdd6be7a 100644 --- a/management/gradle.properties +++ b/management/gradle.properties @@ -1,6 +1,7 @@ org.gradle.daemon=true +git.root=../ # Uncertain of the proxy settimgs needed. #--- http proxy #systemProp.http.proxyHost= @@ -11,14 +12,14 @@ org.gradle.daemon=true #systemProp.https.proxyPort=8080 #systemProp.https.nonProxyHosts= #--- nexus -#nexusUrl= +#nexusUrl=http://d1:8081 #nexusUrlMavenPublic=https://nexus.psp.cardtech.de/nexus/repository/maven-public #nexusUrlMavenSnapshots=https://nexus.psp.cardtech.de/nexus/repository/maven-snapshots #nexusUrlMavenReleases=https://nexus.psp.cardtech.de/nexus/repository/maven-releases #nexusUrlMavenThirdparty=https://nexus.psp.cardtech.de/nexus/repository/maven-thirdparty -#nexusDeployTarget=https://nexus.psp.cardtech.de/nexus/repository/maven-thirdparty -#nexusUsername=jenkins -#nexusPassword=jenkins +nexusDeployTarget=http://d1:8081/repository/maven-snapshots/ +nexusUsername=jenkins +nexusPassword=habbazout #--- sonarqube #systemProp.sonar.host.url= #systemProp.sonar.login=0c6f135bb54690a116e51553071c383eb776fd1a diff --git a/management/server/core/channel-manager/channel-manager-impl/build.gradle b/management/server/core/channel-manager/channel-manager-impl/build.gradle index e76680b338b..bddc0d6941f 100644 --- a/management/server/core/channel-manager/channel-manager-impl/build.gradle +++ b/management/server/core/channel-manager/channel-manager-impl/build.gradle @@ -10,4 +10,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/command-executor/command-executor-cli/build.gradle b/management/server/core/command-executor/command-executor-cli/build.gradle index 0725c8558eb..9192440a0a5 100644 --- a/management/server/core/command-executor/command-executor-cli/build.gradle +++ b/management/server/core/command-executor/command-executor-cli/build.gradle @@ -8,4 +8,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/command-executor/command-executor-impl/build.gradle b/management/server/core/command-executor/command-executor-impl/build.gradle index a217bb1d43b..b9e33951fb4 100644 --- a/management/server/core/command-executor/command-executor-impl/build.gradle +++ b/management/server/core/command-executor/command-executor-impl/build.gradle @@ -10,4 +10,6 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito + testCompile libraries.slf4j_testlogger } diff --git a/management/server/core/desktop-manager/desktop-manager-impl/build.gradle b/management/server/core/desktop-manager/desktop-manager-impl/build.gradle index e254811ad80..a2e0c0a3386 100644 --- a/management/server/core/desktop-manager/desktop-manager-impl/build.gradle +++ b/management/server/core/desktop-manager/desktop-manager-impl/build.gradle @@ -6,4 +6,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/environment-manager/environment-manager-cli/build.gradle b/management/server/core/environment-manager/environment-manager-cli/build.gradle index 5850303dee2..36f0ddfc05e 100644 --- a/management/server/core/environment-manager/environment-manager-cli/build.gradle +++ b/management/server/core/environment-manager/environment-manager-cli/build.gradle @@ -6,4 +6,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/environment-manager/environment-manager-impl/build.gradle b/management/server/core/environment-manager/environment-manager-impl/build.gradle index 9029df79e09..2fe1fbeae1f 100644 --- a/management/server/core/environment-manager/environment-manager-impl/build.gradle +++ b/management/server/core/environment-manager/environment-manager-impl/build.gradle @@ -14,4 +14,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/host-registration/host-registration-impl/build.gradle b/management/server/core/host-registration/host-registration-impl/build.gradle index b593f510292..c84197c67c6 100644 --- a/management/server/core/host-registration/host-registration-impl/build.gradle +++ b/management/server/core/host-registration/host-registration-impl/build.gradle @@ -10,4 +10,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/host-registry/host-registry-cli/build.gradle b/management/server/core/host-registry/host-registry-cli/build.gradle index 6e7db8dcd28..5dcb8cd6510 100644 --- a/management/server/core/host-registry/host-registry-cli/build.gradle +++ b/management/server/core/host-registry/host-registry-cli/build.gradle @@ -8,4 +8,6 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito + testCompile libraries.slf4j_testlogger } diff --git a/management/server/core/host-registry/host-registry-impl/build.gradle b/management/server/core/host-registry/host-registry-impl/build.gradle index fdbef41e0d1..23b62ced583 100644 --- a/management/server/core/host-registry/host-registry-impl/build.gradle +++ b/management/server/core/host-registry/host-registry-impl/build.gradle @@ -7,4 +7,6 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito + testCompile libraries.slf4j_testlogger } diff --git a/management/server/core/host-registry/host-registry-rest/build.gradle b/management/server/core/host-registry/host-registry-rest/build.gradle index bd3274fa7c1..06131901aad 100644 --- a/management/server/core/host-registry/host-registry-rest/build.gradle +++ b/management/server/core/host-registry/host-registry-rest/build.gradle @@ -7,4 +7,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/hub-manager/hub-manager-cli/build.gradle b/management/server/core/hub-manager/hub-manager-cli/build.gradle index 29e53d81790..551d497d9cc 100644 --- a/management/server/core/hub-manager/hub-manager-cli/build.gradle +++ b/management/server/core/hub-manager/hub-manager-cli/build.gradle @@ -7,4 +7,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/identity-manager/identity-manager-impl/build.gradle b/management/server/core/identity-manager/identity-manager-impl/build.gradle index 01e8f87b174..1b5fffff3a7 100644 --- a/management/server/core/identity-manager/identity-manager-impl/build.gradle +++ b/management/server/core/identity-manager/identity-manager-impl/build.gradle @@ -12,4 +12,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/key-server/key-server-impl/build.gradle b/management/server/core/key-server/key-server-impl/build.gradle index 96cfafaa64a..a51fcbe7609 100644 --- a/management/server/core/key-server/key-server-impl/build.gradle +++ b/management/server/core/key-server/key-server-impl/build.gradle @@ -6,4 +6,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/local-peer/local-peer-impl/build.gradle b/management/server/core/local-peer/local-peer-impl/build.gradle index 9a16cb2cb03..833fea8aeb4 100644 --- a/management/server/core/local-peer/local-peer-impl/build.gradle +++ b/management/server/core/local-peer/local-peer-impl/build.gradle @@ -18,4 +18,6 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito + testCompile libraries.slf4j_testlogger } diff --git a/management/server/core/messenger/messenger-api/pom.xml b/management/server/core/messenger/messenger-api/pom.xml index 27a12fda91a..67d87a7f9b7 100644 --- a/management/server/core/messenger/messenger-api/pom.xml +++ b/management/server/core/messenger/messenger-api/pom.xml @@ -37,7 +37,6 @@ org.apache.commons commons-lang3 - test diff --git a/management/server/core/messenger/messenger-impl/build.gradle b/management/server/core/messenger/messenger-impl/build.gradle index b2ebd815ca9..6bf58fc286b 100644 --- a/management/server/core/messenger/messenger-impl/build.gradle +++ b/management/server/core/messenger/messenger-impl/build.gradle @@ -6,4 +6,6 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito + testCompile libraries.slf4j_testlogger } diff --git a/management/server/core/messenger/messenger-impl/pom.xml b/management/server/core/messenger/messenger-impl/pom.xml index 890420a2e67..cb46b825feb 100644 --- a/management/server/core/messenger/messenger-impl/pom.xml +++ b/management/server/core/messenger/messenger-impl/pom.xml @@ -45,7 +45,6 @@ org.apache.commons commons-lang3 - test org.hamcrest diff --git a/management/server/core/messenger/messenger-rest/build.gradle b/management/server/core/messenger/messenger-rest/build.gradle index 595c46a3ab7..7fafa4d56cb 100644 --- a/management/server/core/messenger/messenger-rest/build.gradle +++ b/management/server/core/messenger/messenger-rest/build.gradle @@ -6,4 +6,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/metric/metric-cli/build.gradle b/management/server/core/metric/metric-cli/build.gradle index 4cdcc0c0e42..dffd2523e22 100644 --- a/management/server/core/metric/metric-cli/build.gradle +++ b/management/server/core/metric/metric-cli/build.gradle @@ -6,4 +6,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/metric/metric-impl/build.gradle b/management/server/core/metric/metric-impl/build.gradle index 5e7ac041971..32e6eb2955d 100644 --- a/management/server/core/metric/metric-impl/build.gradle +++ b/management/server/core/metric/metric-impl/build.gradle @@ -5,6 +5,8 @@ dependencies { compile project(":server:subutai-common") compile libraries.slf4j + testCompile project(":server:core:identity-manager:identity-manager-api") testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/metric/metric-impl/pom.xml b/management/server/core/metric/metric-impl/pom.xml index 6c46404558a..bdf2b2c1d38 100644 --- a/management/server/core/metric/metric-impl/pom.xml +++ b/management/server/core/metric/metric-impl/pom.xml @@ -52,7 +52,6 @@ org.apache.commons commons-lang3 - test org.hsqldb diff --git a/management/server/core/network-manager/network-manager-impl/build.gradle b/management/server/core/network-manager/network-manager-impl/build.gradle index 03bc3f4d464..acf2434b36f 100644 --- a/management/server/core/network-manager/network-manager-impl/build.gradle +++ b/management/server/core/network-manager/network-manager-impl/build.gradle @@ -6,4 +6,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/peer-manager/peer-manager-cli/build.gradle b/management/server/core/peer-manager/peer-manager-cli/build.gradle index 5a01570f931..23f704014a7 100644 --- a/management/server/core/peer-manager/peer-manager-cli/build.gradle +++ b/management/server/core/peer-manager/peer-manager-cli/build.gradle @@ -7,4 +7,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/peer-manager/peer-manager-impl/build.gradle b/management/server/core/peer-manager/peer-manager-impl/build.gradle index b5045962268..f36ceef7cf1 100644 --- a/management/server/core/peer-manager/peer-manager-impl/build.gradle +++ b/management/server/core/peer-manager/peer-manager-impl/build.gradle @@ -9,6 +9,10 @@ dependencies { compile libraries.open_jpa compile libraries.slf4j + testCompile project(":server:core:command-executor:command-executor-api") + testCompile project(":server:core:metric:metric-api") + testCompile project(":server:core:local-peer:local-peer-impl") testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/subutai-appender/build.gradle b/management/server/core/subutai-appender/build.gradle index 40ccc9e20b6..c2e6e62e747 100644 --- a/management/server/core/subutai-appender/build.gradle +++ b/management/server/core/subutai-appender/build.gradle @@ -4,4 +4,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/template-manager/template-manager-impl/build.gradle b/management/server/core/template-manager/template-manager-impl/build.gradle index 8bafd55d8a9..f184a4e518c 100644 --- a/management/server/core/template-manager/template-manager-impl/build.gradle +++ b/management/server/core/template-manager/template-manager-impl/build.gradle @@ -7,4 +7,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/tracker/tracker-impl/build.gradle b/management/server/core/tracker/tracker-impl/build.gradle index 5e6ab1d1d13..13c0a6100cd 100644 --- a/management/server/core/tracker/tracker-impl/build.gradle +++ b/management/server/core/tracker/tracker-impl/build.gradle @@ -7,4 +7,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/tracker/tracker-rest/build.gradle b/management/server/core/tracker/tracker-rest/build.gradle index 0497f46ac3f..f71af2df238 100644 --- a/management/server/core/tracker/tracker-rest/build.gradle +++ b/management/server/core/tracker/tracker-rest/build.gradle @@ -6,6 +6,8 @@ dependencies { compile libraries.guava compile libraries.slf4j + testCompile project(":server:core:tracker:tracker-impl") testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito } diff --git a/management/server/core/tracker/tracker-rest/src/test/java/io/subutai/core/tracker/rest/RestServiceImplTest.java b/management/server/core/tracker/tracker-rest/src/test/java/io/subutai/core/tracker/rest/RestServiceImplTest.java index 9227b723e25..3c9f5685f66 100644 --- a/management/server/core/tracker/tracker-rest/src/test/java/io/subutai/core/tracker/rest/RestServiceImplTest.java +++ b/management/server/core/tracker/tracker-rest/src/test/java/io/subutai/core/tracker/rest/RestServiceImplTest.java @@ -52,7 +52,8 @@ public class RestServiceImplTest @Before - public void setUp() throws Exception + public void setUp() + throws Exception { restService = new RestServiceImpl( tracker ); diff --git a/management/server/subutai-common/build.gradle b/management/server/subutai-common/build.gradle index 03c21ef57e2..4c8b8ba2320 100644 --- a/management/server/subutai-common/build.gradle +++ b/management/server/subutai-common/build.gradle @@ -18,7 +18,8 @@ dependencies { compile libraries.uuid_generator testCompile libraries.hamcrest + testCompile libraries.mockito - // BAD!! + // BAD!! - compile!! compile libraries.junit } diff --git a/management/server/subutai-hub-share/build.gradle b/management/server/subutai-hub-share/build.gradle index 33d97cb6244..c9405e7ca50 100644 --- a/management/server/subutai-hub-share/build.gradle +++ b/management/server/subutai-hub-share/build.gradle @@ -9,4 +9,5 @@ dependencies { testCompile libraries.hamcrest testCompile libraries.junit + testCompile libraries.mockito }