Author: reto
Date: Thu Feb 25 10:34:32 2010
New Revision: 916228
URL: http://svn.apache.org/viewvc?rev=916228&view=rev
Log:
testing with more recent felix version, hopefully 2.0.4 will be added soon, so
security can be added
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java?rev=916228&r1=916227&r2=916228&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
Thu Feb 25 10:34:32 2010
@@ -34,17 +34,14 @@
import java.util.logging.Level;
import java.util.logging.Logger;
import junit.framework.Assert;
-import org.apache.clerezza.platform.scripting.scriptmanager.ScriptManager;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.web.resources.jquery.JQuery;
import org.apache.clerezza.web.resources.scripts.Scripts;
import org.junit.Before;
import org.junit.Test;
import org.ops4j.pax.exam.Inject;
-import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
-import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
/**
@@ -188,15 +185,13 @@
public void registerServices()
throws Exception {
webServerExist = waitForWebserver();
- if (webServerExist) {
- Thread.sleep(10000);
- }
+ Assert.assertTrue("webserver running on port "+testHttpPort,
webServerExist);
+ Thread.sleep(10000);
}
@Test
public void checkTcManagerService()
throws Exception {
- Assert.assertTrue(webServerExist);
Object service = waitFor(TcManager.class, 20000);
Assert.assertTrue(service != null);
@@ -205,7 +200,6 @@
@Test
public void checkJaxRsServices()
throws Exception {
- Assert.assertTrue(webServerExist);
Object service = waitFor(JQuery.class, 20000);
Assert.assertTrue(service != null);
service = waitFor(Scripts.class, 20000);
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=916228&r1=916227&r2=916228&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Thu Feb 25
10:34:32 2010
@@ -429,6 +429,13 @@
<artifactId>pax-exam</artifactId>
<version>1.2.1-SNAPSHOT</version>
</dependency>
+ <!-- this is a dependecy of pax-exam, enforcing latest
version
+ to get latest felix -->
+ <dependency>
+ <groupId>org.ops4j.pax.runner</groupId>
+ <artifactId>pax-runner-no-jcl</artifactId>
+ <version>1.5.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
