You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2010/02/18 11:49:10 UTC
svn commit: r911322 - in
/incubator/aries/trunk/application/application-itests: pom.xml
src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
src/test/resources/obr/repository.xml
Author: not
Date: Thu Feb 18 10:49:09 2010
New Revision: 911322
URL: http://svn.apache.org/viewvc?rev=911322&view=rev
Log:
ARIES-174 Fix itests for OBR
Modified:
incubator/aries/trunk/application/application-itests/pom.xml
incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
incubator/aries/trunk/application/application-itests/src/test/resources/obr/repository.xml
Modified: incubator/aries/trunk/application/application-itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/pom.xml?rev=911322&r1=911321&r2=911322&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/pom.xml (original)
+++ incubator/aries/trunk/application/application-itests/pom.xml Thu Feb 18 10:49:09 2010
@@ -92,6 +92,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>1.4.3</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java?rev=911322&r1=911321&r2=911322&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java (original)
+++ incubator/aries/trunk/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java Thu Feb 18 10:49:09 2010
@@ -18,14 +18,19 @@
*/
package org.apache.aries.application.runtime.itests;
+import static org.ops4j.pax.exam.CoreOptions.equinox;
+import static org.ops4j.pax.exam.CoreOptions.options;
+import static org.ops4j.pax.exam.CoreOptions.systemProperty;
+
+import java.io.BufferedReader;
import java.io.File;
import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.InputStreamReader;
-import org.apache.aries.application.management.ApplicationContext;
import org.apache.aries.application.management.AriesApplication;
import org.apache.aries.application.management.AriesApplicationManager;
import org.apache.aries.application.utils.filesystem.FileSystem;
-import org.apache.aries.sample.HelloWorld;
import org.apache.aries.unittest.fixture.ArchiveFixture;
import org.apache.aries.unittest.fixture.ArchiveFixture.ZipFixture;
import org.junit.Before;
@@ -33,14 +38,10 @@
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.Option;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
+import org.osgi.service.obr.Capability;
+import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
-
-import static org.junit.Assert.assertEquals;
-import static org.ops4j.pax.exam.CoreOptions.equinox;
-import static org.ops4j.pax.exam.CoreOptions.options;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-import static org.ops4j.pax.exam.CoreOptions.waitForFrameworkStartup;
-import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
+import org.osgi.service.obr.Resource;
@RunWith(JUnit4TestRunner.class)
public class OBRAppManagerTest extends AbstractIntegrationTest {
@@ -82,15 +83,48 @@
fout = new FileOutputStream("test.eba");
testEba.writeOut(fout);
fout.close();
-
+
+ StringBuilder repositoryXML = new StringBuilder();
+
+ BufferedReader reader = new BufferedReader(new InputStreamReader(OBRAppManagerTest.class.getResourceAsStream("/obr/repository.xml")));
+ String line;
+
+ while ((line = reader.readLine()) != null) {
+ repositoryXML.append(line);
+ repositoryXML.append("\r\n");
+ }
+
+ String repo = repositoryXML.toString().replaceAll("bundle_location", new File("bundle.jar").getAbsolutePath());
+
+ System.out.println(repo);
+
+ FileWriter writer = new FileWriter("repository.xml");
+ writer.write(repo);
+ writer.close();
+
createdApplications = true;
}
@Test
public void testAppWithApplicationManifest() throws Exception {
RepositoryAdmin repositoryAdmin = getOsgiService(RepositoryAdmin.class);
- repositoryAdmin.addRepository(OBRAppManagerTest.class.getClassLoader().getResource("obr/repository.xml"));
+
+ repositoryAdmin.addRepository(new File("repository.xml").toURI().toURL());
+ Repository[] repos = repositoryAdmin.listRepositories();
+
+ for (Repository repo : repos) {
+ Resource[] resources = repo.getResources();
+
+ for (Resource r : resources) {
+ Capability[] cs = r.getCapabilities();
+
+ for (Capability c : cs) {
+ System.out.println(c.getName() + " : " + c.getProperties());
+ }
+ }
+ }
+
AriesApplicationManager manager = getOsgiService(AriesApplicationManager.class);
AriesApplication app = manager.createApplication(FileSystem.getFSRoot(new File("test.eba")));
//installing requires a valid url for the bundle in repository.xml.
Modified: incubator/aries/trunk/application/application-itests/src/test/resources/obr/repository.xml
URL: http://svn.apache.org/viewvc/incubator/aries/trunk/application/application-itests/src/test/resources/obr/repository.xml?rev=911322&r1=911321&r2=911322&view=diff
==============================================================================
--- incubator/aries/trunk/application/application-itests/src/test/resources/obr/repository.xml (original)
+++ incubator/aries/trunk/application/application-itests/src/test/resources/obr/repository.xml Thu Feb 18 10:49:09 2010
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<repository name="Geronimo Framework, Configs :: J2EE System">
- <resource version="1.3.0.3" uri="mvn:org.apache.aries.sample/org.apache.aries.sample/1.0"
+ <resource version="1.3.0.3" uri="file:/bundle_location"
symbolicname="org.apache.aries.sample"
presentationname="org.apache.aries.sample" id="1266103855623">
<description>sample</description>
<license>http://www.apache.org/licenses/LICENSE-2.0.txt</license>
<capability name="bundle">
<p v="org.apache.aries.sample" n="symbolicname"/>
- <p v="1.0" t="version" n="version"/>
+ <p v="1.3.0" t="version" n="version"/>
<p v="2" t="version" n="manifestversion"/>
</capability>
<capability name="package">
<p v="org.apache.aries.sample.impl" n="package"/>
<p v="1.0" t="version" n="version"/>
+ <p n='mandatory' v=''/>
</capability>
</resource>