You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by cs...@apache.org on 2012/09/26 10:00:06 UTC

svn commit: r1390311 - /karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/EquinoxFrameworkTest.java

Author: cschneider
Date: Wed Sep 26 08:00:05 2012
New Revision: 1390311

URL: http://svn.apache.org/viewvc?rev=1390311&view=rev
Log:
KARAF-1870 Add assertion to KarafWithBundleTest

Modified:
    karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/EquinoxFrameworkTest.java

Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/EquinoxFrameworkTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/EquinoxFrameworkTest.java?rev=1390311&r1=1390310&r2=1390311&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/EquinoxFrameworkTest.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/EquinoxFrameworkTest.java Wed Sep 26 08:00:05 2012
@@ -17,11 +17,16 @@
 
 package org.apache.karaf.tooling.exam.regression;
 
-import static junit.framework.Assert.assertTrue;
 import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.editConfigurationFilePut;
 import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.CoreOptions.maven;
 
+import javax.inject.Inject;
+
+import junit.framework.Assert;
+
+import org.apache.karaf.system.FrameworkType;
+import org.apache.karaf.system.SystemService;
 import org.apache.karaf.tooling.exam.options.configs.CustomProperties;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -34,6 +39,9 @@ import org.ops4j.pax.exam.spi.reactors.A
 @RunWith(JUnit4TestRunner.class)
 @ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
 public class EquinoxFrameworkTest {
+    
+    @Inject
+    SystemService systemService;
 
     @Configuration
     public Option[] config() {
@@ -45,33 +53,7 @@ public class EquinoxFrameworkTest {
 
     @Test
     public void test() throws Exception {
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        System.out.println("===========================================");
-        assertTrue(true);
+        Assert.assertEquals(FrameworkType.equinox, systemService.getFramework());
     }
 
-    @Test
-    public void test2() throws Exception {
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        System.out.println("XXXXXXXXXXXXXXXXXXXXXXXXxx");
-        assertTrue(true);
-    }
 }