Author: thomas.diesler(a)jboss.com
Date: 2010-03-10 11:06:33 -0500 (Wed, 10 Mar 2010)
New Revision: 102228
Modified:
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java
projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleAssemblyTestCase.java
Log:
Use assembleArchive instead of assembleBundle
Modified:
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java
===================================================================
---
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-10
15:53:48 UTC (rev 102227)
+++
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTest.java 2010-03-10
16:06:33 UTC (rev 102228)
@@ -199,19 +199,19 @@
}
/**
- * Delegates to {@link OSGiTestHelper#assembleBundle(String, String, Class...)}
+ * Delegates to {@link OSGiTestHelper#assembleArchive(String, String, Class...)}
*/
- public VirtualFile assembleBundle(String name, String resource, Class<?>...
packages) throws Exception
+ public VirtualFile assembleArchive(String name, String resource, Class<?>...
packages) throws Exception
{
- return getTestHelper().assembleBundle(name, resource, packages);
+ return getTestHelper().assembleArchive(name, resource, packages);
}
/**
- * Delegates to {@link OSGiTestHelper#assembleBundle(String, String[], Class...)}
+ * Delegates to {@link OSGiTestHelper#assembleArchive(String, String[], Class...)}
*/
- public VirtualFile assembleBundle(String name, String[] resources, Class<?>...
packages) throws Exception
+ public VirtualFile assembleArchive(String name, String[] resources, Class<?>...
packages) throws Exception
{
- return getTestHelper().assembleBundle(name, resources, packages);
+ return getTestHelper().assembleArchive(name, resources, packages);
}
/**
Modified:
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java
===================================================================
---
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2010-03-10
15:53:48 UTC (rev 102227)
+++
projects/jboss-osgi/projects/testing/trunk/src/main/java/org/jboss/osgi/testing/OSGiTestHelper.java 2010-03-10
16:06:33 UTC (rev 102228)
@@ -216,12 +216,12 @@
return framework;
}
- public VirtualFile assembleBundle(String name, String resource, Class<?>...
packages) throws Exception
+ public VirtualFile assembleArchive(String name, String resource, Class<?>...
packages) throws Exception
{
- return assembleBundle(name, new String[] { resource }, packages);
+ return assembleArchive(name, new String[] { resource }, packages);
}
- public VirtualFile assembleBundle(String name, String[] resources, Class<?>...
packages) throws IOException
+ public VirtualFile assembleArchive(String name, String[] resources, Class<?>...
packages) throws IOException
{
JavaArchive archive = Archives.create(name + ".jar", JavaArchive.class);
if (resources != null)
Modified:
projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleAssemblyTestCase.java
===================================================================
---
projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleAssemblyTestCase.java 2010-03-10
15:53:48 UTC (rev 102227)
+++
projects/jboss-osgi/projects/testing/trunk/src/test/java/org/jboss/test/osgi/testing/SimpleAssemblyTestCase.java 2010-03-10
16:06:33 UTC (rev 102228)
@@ -73,7 +73,7 @@
OSGiRuntime runtime = getDefaultRuntime();
try
{
- VirtualFile virtualFile = assembleBundle("example-simple",
"/simple", SimpleActivator.class);
+ VirtualFile virtualFile = assembleArchive("example-simple",
"/simple", SimpleActivator.class);
OSGiBundle bundle = runtime.installBundle(virtualFile);
assertBundleState(Bundle.INSTALLED, bundle.getState());
}