You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2009/04/28 21:33:11 UTC
svn commit: r769507 - in
/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test: ./
recipes/ src/org/apache/felix/framework/test/
src/org/apache/felix/framework/test/fragment/b2/
src/org/apache/felix/framework/test/fragment/b4/ src/org/apache...
Author: rickhall
Date: Tue Apr 28 19:32:57 2009
New Revision: 769507
URL: http://svn.apache.org/viewvc?rev=769507&view=rev
Log:
Preparing some additional fragment tests.
Added:
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/Activator.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/misc/
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/misc/b1/
Modified:
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java
felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java
Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd?rev=769507&r1=769506&r2=769507&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/bnd.bnd Tue Apr 28 19:32:57 2009
@@ -5,6 +5,7 @@
resolver.b1.jar, resolver.b2.jar, resolver.b3.jar, resolver.b4.jar, \
resolver.b5.jar, resolver.b6.jar, resolver.b7.jar, \
fragment.b1.jar, fragment.b2.jar, fragment.b3.jar, \
+ fragment.b4.jar, \
org/apache/felix/framework/test/fragment/Message.properties=src/resource/Message.properties,org/apache/felix/framework/test/fragment/Message_fr.properties=src/resource/Message_fr.properties
-buildpath: \
@@ -12,6 +13,6 @@
org.osgi.foundation; version=1.2.0, \
junit.junit
--runproperties = report=true
+-runproperties = report=true, felix.fragment.validation=warning
Test-Cases = ${classes;extending;*FelixTestCase}
Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd?rev=769507&r1=769506&r2=769507&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b2.bnd Tue Apr 28 19:32:57 2009
@@ -1,4 +1,5 @@
Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b2
-resourceonly : true
Fragment-Host: org.apache.felix.framework.test.fragment.b1
+Export-Package: org.apache.felix.framework.test.fragment.b2
Include-Resource: org/apache/felix/framework/test/fragment/b1/Message_fr.properties=src/resource/Message_fr.properties
Added: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd?rev=769507&view=auto
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd (added)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/recipes/fragment.b4.bnd Tue Apr 28 19:32:57 2009
@@ -0,0 +1,3 @@
+Bundle-SymbolicName: org.apache.felix.framework.test.fragment.b4
+Private-Package: org.apache.felix.framework.test.fragment.b4
+Bundle-Activator: org.apache.felix.framework.test.fragment.b4.Activator
Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java?rev=769507&r1=769506&r2=769507&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/TestFragment.java Tue Apr 28 19:32:57 2009
@@ -22,18 +22,19 @@
import java.util.Locale;
import java.util.ResourceBundle;
import org.osgi.framework.Bundle;
+import org.osgi.service.packageadmin.ExportedPackage;
+import org.osgi.service.packageadmin.PackageAdmin;
public class TestFragment extends FelixTestCase
{
- private Bundle m_host = null;
- private Bundle m_fragment = null;
- private Bundle m_requirer = null;
- private ResourceBundle m_hostRB = null;
+ private Bundle m_bundleA = null;
+ private Bundle m_bundleB = null;
+ private Bundle m_bundleC = null;
- public void testFragment() throws Exception
+ public void testFragmentAttachment() throws Exception
{
InputStream is = null;
- ResourceBundle enRB, frRB;
+ ResourceBundle enRB, frRB, hostRB;
// Get local copies of english and french resource bundles.
enRB = ResourceBundle.getBundle(
@@ -48,19 +49,19 @@
try
{
is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_host = getBundleContext().installBundle("fragment.b1.jar", is);
- m_host.start();
- m_hostRB = (ResourceBundle) getBundleContext().getService(
+ m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
+ m_bundleA.start();
+ hostRB = (ResourceBundle) getBundleContext().getService(
getBundleContext().getServiceReference(ResourceBundle.class.getName()));
- if (!m_hostRB.getString("STARTING_SYSTEM").equals(enRB.getString("STARTING_SYSTEM")))
+ if (!hostRB.getString("STARTING_SYSTEM").equals(enRB.getString("STARTING_SYSTEM")))
{
throw new RuntimeException("Expected '" + enRB.getString("STARTING_SYSTEM")
- + "' received '" + m_hostRB.getString("STARTING_SYSTEM") + "'");
+ + "' received '" + hostRB.getString("STARTING_SYSTEM") + "'");
}
- if (!m_hostRB.getString("LOADING_SETTINGS").equals(enRB.getString("LOADING_SETTINGS")))
+ if (!hostRB.getString("LOADING_SETTINGS").equals(enRB.getString("LOADING_SETTINGS")))
{
throw new RuntimeException("Expected '" + enRB.getString("LOADING_SETTINGS")
- + "' received '" + m_hostRB.getString("LOADING_SETTINGS") + "'");
+ + "' received '" + hostRB.getString("LOADING_SETTINGS") + "'");
}
}
finally
@@ -76,21 +77,21 @@
try
{
is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_host = getBundleContext().installBundle("fragment.b1.jar", is);
+ m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
is = this.getClass().getClassLoader().getResourceAsStream("fragment.b2.jar");
- m_fragment = getBundleContext().installBundle("fragment.b2.jar", is);
- m_host.start();
- m_hostRB = (ResourceBundle) getBundleContext().getService(
+ m_bundleB = getBundleContext().installBundle("fragment.b2.jar", is);
+ m_bundleA.start();
+ hostRB = (ResourceBundle) getBundleContext().getService(
getBundleContext().getServiceReference(ResourceBundle.class.getName()));
- if (!m_hostRB.getString("STARTING_SYSTEM").equals(frRB.getString("STARTING_SYSTEM")))
+ if (!hostRB.getString("STARTING_SYSTEM").equals(frRB.getString("STARTING_SYSTEM")))
{
throw new RuntimeException("Expected '" + frRB.getString("STARTING_SYSTEM")
- + "' received '" + m_hostRB.getString("STARTING_SYSTEM") + "'");
+ + "' received '" + hostRB.getString("STARTING_SYSTEM") + "'");
}
- if (!m_hostRB.getString("LOADING_SETTINGS").equals(frRB.getString("LOADING_SETTINGS")))
+ if (!hostRB.getString("LOADING_SETTINGS").equals(frRB.getString("LOADING_SETTINGS")))
{
throw new RuntimeException("Expected '" + frRB.getString("LOADING_SETTINGS")
- + "' received '" + m_hostRB.getString("LOADING_SETTINGS") + "'");
+ + "' received '" + hostRB.getString("LOADING_SETTINGS") + "'");
}
}
finally
@@ -106,22 +107,22 @@
try
{
is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_host = getBundleContext().installBundle("fragment.b1.jar", is);
+ m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
is = this.getClass().getClassLoader().getResourceAsStream("fragment.b2.jar");
- m_fragment = getBundleContext().installBundle("fragment.b2.jar", is);
- getPackageAdmin().resolveBundles(new Bundle[] { m_fragment });
- m_host.start();
- m_hostRB = (ResourceBundle) getBundleContext().getService(
+ m_bundleB = getBundleContext().installBundle("fragment.b2.jar", is);
+ getPackageAdmin().resolveBundles(new Bundle[] { m_bundleB });
+ m_bundleA.start();
+ hostRB = (ResourceBundle) getBundleContext().getService(
getBundleContext().getServiceReference(ResourceBundle.class.getName()));
- if (!m_hostRB.getString("STARTING_SYSTEM").equals(frRB.getString("STARTING_SYSTEM")))
+ if (!hostRB.getString("STARTING_SYSTEM").equals(frRB.getString("STARTING_SYSTEM")))
{
throw new RuntimeException("Expected '" + frRB.getString("STARTING_SYSTEM")
- + "' received '" + m_hostRB.getString("STARTING_SYSTEM") + "'");
+ + "' received '" + hostRB.getString("STARTING_SYSTEM") + "'");
}
- if (!m_hostRB.getString("LOADING_SETTINGS").equals(frRB.getString("LOADING_SETTINGS")))
+ if (!hostRB.getString("LOADING_SETTINGS").equals(frRB.getString("LOADING_SETTINGS")))
{
throw new RuntimeException("Expected '" + frRB.getString("LOADING_SETTINGS")
- + "' received '" + m_hostRB.getString("LOADING_SETTINGS") + "'");
+ + "' received '" + hostRB.getString("LOADING_SETTINGS") + "'");
}
}
finally
@@ -138,24 +139,24 @@
try
{
is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
- m_host = getBundleContext().installBundle("fragment.b1.jar", is);
+ m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
is = this.getClass().getClassLoader().getResourceAsStream("fragment.b2.jar");
- m_fragment = getBundleContext().installBundle("fragment.b2.jar", is);
+ m_bundleB = getBundleContext().installBundle("fragment.b2.jar", is);
is = this.getClass().getClassLoader().getResourceAsStream("fragment.b3.jar");
- m_requirer = getBundleContext().installBundle("fragment.b3.jar", is);
- getPackageAdmin().resolveBundles(new Bundle[] { m_requirer });
- m_host.start();
- m_hostRB = (ResourceBundle) getBundleContext().getService(
+ m_bundleC = getBundleContext().installBundle("fragment.b3.jar", is);
+ getPackageAdmin().resolveBundles(new Bundle[] { m_bundleC });
+ m_bundleA.start();
+ hostRB = (ResourceBundle) getBundleContext().getService(
getBundleContext().getServiceReference(ResourceBundle.class.getName()));
- if (!m_hostRB.getString("STARTING_SYSTEM").equals(frRB.getString("STARTING_SYSTEM")))
+ if (!hostRB.getString("STARTING_SYSTEM").equals(frRB.getString("STARTING_SYSTEM")))
{
throw new RuntimeException("Expected '" + frRB.getString("STARTING_SYSTEM")
- + "' received '" + m_hostRB.getString("STARTING_SYSTEM") + "'");
+ + "' received '" + hostRB.getString("STARTING_SYSTEM") + "'");
}
- if (!m_hostRB.getString("LOADING_SETTINGS").equals(frRB.getString("LOADING_SETTINGS")))
+ if (!hostRB.getString("LOADING_SETTINGS").equals(frRB.getString("LOADING_SETTINGS")))
{
throw new RuntimeException("Expected '" + frRB.getString("LOADING_SETTINGS")
- + "' received '" + m_hostRB.getString("LOADING_SETTINGS") + "'");
+ + "' received '" + hostRB.getString("LOADING_SETTINGS") + "'");
}
}
finally
@@ -164,44 +165,104 @@
}
}
+ public void testFragmentExports() throws Exception
+ {
+ InputStream is = null;
+
+ // Scenario #1
+ //
+ // Install host, fragment, and bundle importing fragment package.
+ // Start the importing bundle and verify that it is wired to the
+ // host bundle, not the fragment bundle.
+ try
+ {
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b1.jar");
+ m_bundleA = getBundleContext().installBundle("fragment.b1.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b2.jar");
+ m_bundleB = getBundleContext().installBundle("fragment.b2.jar", is);
+ is = this.getClass().getClassLoader().getResourceAsStream("fragment.b4.jar");
+ m_bundleC = getBundleContext().installBundle("fragment.b4.jar", is);
+ m_bundleC.start();
+
+ // Verify that importer has no wires to the fragment.
+ PackageAdmin pa = getPackageAdmin();
+ ExportedPackage[] eps = pa.getExportedPackages(m_bundleB);
+ if (eps != null)
+ {
+ for (int i = 0; i < eps.length; i++)
+ {
+ Bundle[] importers = eps[i].getImportingBundles();
+ for (int j = 0; (importers != null) && (j < importers.length); j++)
+ {
+ if (importers[j].equals(m_bundleC))
+ {
+ assertTrue("Importer should not be wired to fragment", false);
+ }
+ }
+ }
+ }
+
+ // Verify that importer has a wire to the host.
+ pa = getPackageAdmin();
+ eps = pa.getExportedPackages(m_bundleA);
+ assertNotNull("Host should export fragment packages", eps);
+ Bundle found = null;
+ for (int i = 0; i < eps.length; i++)
+ {
+ Bundle[] importers = eps[i].getImportingBundles();
+ for (int j = 0; (importers != null) && (j < importers.length); j++)
+ {
+ if (importers[j].equals(m_bundleC))
+ {
+ found = eps[i].getExportingBundle();
+ }
+ }
+ }
+ assertNotNull("Importer should be wired to host", found);
+ }
+ finally
+ {
+ cleanup();
+ }
+ }
+
private void cleanup()
{
- if (m_host != null)
+ if (m_bundleA != null)
{
try
{
- m_host.uninstall();
+ m_bundleA.uninstall();
}
catch (Exception ex)
{
// Ummm?
}
- m_host = null;
- m_hostRB = null;
+ m_bundleA = null;
}
- if (m_fragment != null)
+ if (m_bundleB != null)
{
try
{
- m_fragment.uninstall();
+ m_bundleB.uninstall();
}
catch (Exception ex)
{
// Ummm?
}
- m_fragment = null;
+ m_bundleB = null;
}
- if (m_requirer != null)
+ if (m_bundleC != null)
{
try
{
- m_requirer.uninstall();
+ m_bundleC.uninstall();
}
catch (Exception ex)
{
// Ummm?
}
- m_requirer = null;
+ m_bundleC = null;
}
refreshAndWait();
}
Modified: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java?rev=769507&r1=769506&r2=769507&view=diff
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java (original)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b2/FragmentClass.java Tue Apr 28 19:32:57 2009
@@ -22,6 +22,6 @@
{
public FragmentClass()
{
- System.out.println("Hello");
+ System.out.println("Fragment class created");
}
}
\ No newline at end of file
Added: felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/Activator.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/Activator.java?rev=769507&view=auto
==============================================================================
--- felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/Activator.java (added)
+++ felix/sandbox/rickhall/bnd-test/org.apache.felix.framework.test/src/org/apache/felix/framework/test/fragment/b4/Activator.java Tue Apr 28 19:32:57 2009
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.felix.framework.test.fragment.b4;
+
+import org.apache.felix.framework.test.fragment.b2.FragmentClass;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class Activator implements BundleActivator
+{
+ public void start(BundleContext arg0) throws Exception
+ {
+ new FragmentClass();
+ }
+
+ public void stop(BundleContext arg0) throws Exception
+ {
+ }
+}
\ No newline at end of file