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 11:57:56 UTC

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

Author: cschneider
Date: Wed Sep 26 09:57:55 2012
New Revision: 1390362

URL: http://svn.apache.org/viewvc?rev=1390362&view=rev
Log:
KARAF-1872 Adding assertion for the Karaf version

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

Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.java?rev=1390362&r1=1390361&r2=1390362&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/Backward224Test.java Wed Sep 26 09:57:55 2012
@@ -16,10 +16,13 @@
  */
 package org.apache.karaf.tooling.exam.regression;
 
-import static junit.framework.Assert.assertTrue;
 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.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Option;
@@ -27,48 +30,38 @@ import org.ops4j.pax.exam.junit.Configur
 import org.ops4j.pax.exam.junit.ExamReactorStrategy;
 import org.ops4j.pax.exam.junit.JUnit4TestRunner;
 import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
 
 @RunWith(JUnit4TestRunner.class)
 @ExamReactorStrategy(AllConfinedStagedReactorFactory.class)
 public class Backward224Test {
+    @Inject
+    private BundleContext ctx;
+
+    private static final String version = "2.2.4";
 
     @Configuration
     public Option[] config() {
         return new Option[]{ karafDistributionConfiguration().frameworkUrl(
-            maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("zip").version("2.2.4"))
-            .karafVersion("2.2.4").name("Apache Karaf") };
+            maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("zip").version(version))
+            .karafVersion(version).name("Apache Karaf") };
     }
 
     @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);
+        Bundle shellBundle = getShellBundle();
+        Assert.assertEquals(version, shellBundle.getVersion().toString());
     }
 
-    @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);
+    private Bundle getShellBundle() {
+        Bundle[] bundles = ctx.getBundles();
+        for (Bundle bundle : bundles) {
+            if ("org.apache.karaf.shell.osgi".equals(bundle.getSymbolicName())) {
+                return bundle;
+            }
+        }
+        throw new RuntimeException("Shell bundle not found");
     }
 
 }