svn commit: r1330721 - in /karaf/trunk/tooling/exam: container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java regression/src/test/java/org/apache/karaf/tooling/exam/regression/UseFeatureInsteadOfDeployFolderTest.java

[pi...@apache.org]

Author: pieber
Date: Thu Apr 26 08:59:58 2012
New Revision: 1330721

URL: http://svn.apache.org/viewvc?rev=1330721&view=rev
Log:
[KARAF-1402] Corrected the order in test framework generated features.xml

Signed-off-by: Andreas Pieber <an...@gmail.com>

Modified:
    karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
    karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UseFeatureInsteadOfDeployFolderTest.java

Modified: karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java?rev=1330721&r1=1330720&r2=1330721&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java (original)
+++ karaf/trunk/tooling/exam/container/src/main/java/org/apache/karaf/tooling/exam/container/internal/ExamFeaturesFile.java Thu Apr 26 08:59:58 2012
@@ -36,7 +36,7 @@ public class ExamFeaturesFile {
     public ExamFeaturesFile(String featuresXml) {
         this(featuresXml, Constants.DEFAULT_START_LEVEL);
     }
-    
+
     public ExamFeaturesFile(String extension, int startLevel) {
         featuresXml =
             "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -46,6 +46,7 @@ public class ExamFeaturesFile {
                     + "<feature name=\"exam\" version=\""
                     + Info.getPaxExamVersion()
                     + "\">\n"
+                    + extension + "\n"
                     + "<bundle start-level='"+startLevel+"'>mvn:org.ops4j.pax.exam/pax-exam-extender-service/"
                     + Info.getPaxExamVersion()
                     + "</bundle>\n"
@@ -61,7 +62,6 @@ public class ExamFeaturesFile {
                     + "<bundle start-level='"+startLevel+"'>mvn:org.apache.geronimo.specs/geronimo-atinject_1.0_spec/" + getInjectionVersion()
                     + "</bundle>\n"
                     + "<bundle start-level='"+startLevel+"'>mvn:org.ops4j.pax.exam/pax-exam-inject/" + Info.getPaxExamVersion() + "</bundle>\n"
-                    + extension + "\n"
                     + "</feature>\n"
                     + "</features>";
     }

Modified: karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UseFeatureInsteadOfDeployFolderTest.java
URL: http://svn.apache.org/viewvc/karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UseFeatureInsteadOfDeployFolderTest.java?rev=1330721&r1=1330720&r2=1330721&view=diff
==============================================================================
--- karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UseFeatureInsteadOfDeployFolderTest.java (original)
+++ karaf/trunk/tooling/exam/regression/src/test/java/org/apache/karaf/tooling/exam/regression/UseFeatureInsteadOfDeployFolderTest.java Thu Apr 26 08:59:58 2012
@@ -17,9 +17,13 @@
 
 package org.apache.karaf.tooling.exam.regression;
 
-import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
 import static org.apache.karaf.tooling.exam.options.KarafDistributionOption.karafDistributionConfiguration;
 import static org.ops4j.pax.exam.CoreOptions.maven;
+import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
+import static org.ops4j.pax.exam.CoreOptions.provision;
+
+import javax.inject.Inject;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -28,32 +32,31 @@ 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 UseFeatureInsteadOfDeployFolderTest {
 
+    @Inject
+    private BundleContext bc;
+
     @Configuration
     public Option[] config() {
         return new Option[]{ karafDistributionConfiguration().frameworkUrl(
             maven().groupId("org.apache.karaf").artifactId("apache-karaf").type("zip").versionAsInProject())
-            .useDeployFolder(false) };
+            .useDeployFolder(false), provision(mavenBundle("org.slf4j", "slf4j-api", "1.6.1")) };
     }
 
     @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);
+        for (Bundle b : bc.getBundles()) {
+            if (b.getSymbolicName().equals("slf4j.api")) {
+                return;
+            }
+        }
+        fail("slf4j-api is not provisioned");
     }
 
 }