brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [09/12] incubator-brooklyn git commit: [BROOKLYN-183] Drop junit deps from brooklyn-itest
Date Wed, 28 Oct 2015 00:56:33 GMT
[BROOKLYN-183] Drop junit deps from brooklyn-itest

Won't compile right now, but brooklyn-itest is disabled at the moment.


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/dc6e5aaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/dc6e5aaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/dc6e5aaa

Branch: refs/heads/master
Commit: dc6e5aaa93ee1628c8eac2a033724b50fb1c5556
Parents: 21a3857
Author: Ciprian Ciubotariu <cheepeero@gmx.net>
Authored: Tue Oct 27 22:31:09 2015 +0200
Committer: Ciprian Ciubotariu <cheepeero@gmx.net>
Committed: Tue Oct 27 22:31:09 2015 +0200

----------------------------------------------------------------------
 karaf/itest/pom.xml                                 |  3 +--
 .../test/java/org/apache/brooklyn/AssemblyTest.java | 16 +++++++---------
 2 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dc6e5aaa/karaf/itest/pom.xml
----------------------------------------------------------------------
diff --git a/karaf/itest/pom.xml b/karaf/itest/pom.xml
index 2055f44..f9f8319 100644
--- a/karaf/itest/pom.xml
+++ b/karaf/itest/pom.xml
@@ -33,7 +33,7 @@
         <!-- Pax Exam Dependencies -->
         <dependency>
             <groupId>org.ops4j.pax.exam</groupId>
-            <artifactId>pax-exam-junit4</artifactId>
+            <artifactId>pax-exam-testng</artifactId>
             <version>${pax.exam.version}</version>
             <scope>test</scope>
         </dependency>
@@ -153,7 +153,6 @@
             <type>zip</type>
             <scope>test</scope>
         </dependency>
-
     </dependencies>
 
     <build>

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/dc6e5aaa/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 ea620ab..180d4d2 100644
--- a/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
+++ b/karaf/itest/src/test/java/org/apache/brooklyn/AssemblyTest.java
@@ -18,9 +18,6 @@
  */
 package org.apache.brooklyn;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.junit.Assert.assertThat;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.features;
@@ -28,6 +25,8 @@ import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDist
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder;
 import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel;
 import static org.ops4j.pax.exam.MavenUtils.asInProject;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 import java.io.File;
 
@@ -35,17 +34,16 @@ import javax.inject.Inject;
 
 import org.apache.karaf.features.BootFinished;
 import org.apache.karaf.features.FeaturesService;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
 import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
 import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel;
 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.Test;
 
 /**
  * Tests the apache-brooklyn karaf runtime assembly.
@@ -100,18 +98,18 @@ public class AssemblyTest {
 
     @Test
     public void shouldHaveBundleContext() {
-        assertThat(bc, is(notNullValue()));
+        assertNotNull(bc);
     }
 
     @Test
     public void checkEventFeature() throws Exception {
-        assertThat(featuresService.isInstalled(featuresService.getFeature("eventadmin")),
is(true));
+        assertTrue(featuresService.isInstalled(featuresService.getFeature("eventadmin")));
     }
 
     @Test
     public void checkBrooklynCoreFeature() throws Exception {
         featuresService.installFeature("brooklyn-core");
-        assertThat(featuresService.isInstalled(featuresService.getFeature("brooklyn-core")),
is(true));
+        assertTrue(featuresService.isInstalled(featuresService.getFeature("brooklyn-core")));
     }
 
 }


Mime
View raw message