You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2015/10/28 01:56:34 UTC
[10/12] incubator-brooklyn git commit: [BROOKLYN-183] Fix
brooklyn-itest compilation
[BROOKLYN-183] Fix brooklyn-itest compilation
Running tests still fails.
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/2aaf1251
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/2aaf1251
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/2aaf1251
Branch: refs/heads/master
Commit: 2aaf125107757f6861a44421d8515fe0faad9761
Parents: dc6e5aa
Author: Ciprian Ciubotariu <ch...@gmx.net>
Authored: Wed Oct 28 00:25:56 2015 +0200
Committer: Ciprian Ciubotariu <ch...@gmx.net>
Committed: Wed Oct 28 00:25:56 2015 +0200
----------------------------------------------------------------------
.../test/java/org/apache/brooklyn/AssemblyTest.java | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/2aaf1251/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
----------------------------------------------------------------------
diff --git a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
index 180d4d2..ad67105 100644
--- a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
+++ b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
@@ -19,6 +19,7 @@
package org.apache.brooklyn;
import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration;
@@ -37,18 +38,20 @@ import org.apache.karaf.features.FeaturesService;
import org.ops4j.pax.exam.Configuration;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
+import org.ops4j.pax.exam.options.MavenArtifactProvisionOption;
import org.ops4j.pax.exam.options.MavenArtifactUrlReference;
import org.ops4j.pax.exam.options.MavenUrlReference;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.ops4j.pax.exam.testng.listener.PaxExam;
import org.osgi.framework.BundleContext;
+import org.testng.annotations.Listeners;
import org.testng.annotations.Test;
/**
* Tests the apache-brooklyn karaf runtime assembly.
*/
-@RunWith(PaxExam.class)
+@Listeners(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
public class AssemblyTest {
@@ -75,10 +78,18 @@ public class AssemblyTest {
configureConsole().ignoreLocalConsole(),
logLevel(LogLevel.INFO),
keepRuntimeFolder(),
- features(karafStandardFeaturesRepository(), "eventadmin")
+ features(karafStandardFeaturesRepository(), "eventadmin"),
+ addTestNGBundle()
};
}
+ private static MavenArtifactProvisionOption addTestNGBundle() {
+ return mavenBundle()
+ .groupId("org.testng")
+ .artifactId("testng")
+ .version(asInProject());
+ }
+
private static MavenArtifactUrlReference brooklynKarafDist() {
return maven()
.groupId("org.apache.brooklyn")