[jboss-osgi-commits] JBoss-OSGI SVN: r97745 - in projects/jboss-osgi/projects/runtime/framework/trunk/src/test: resources and 1 other directories.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-12-11 12:01:25 -0500 (Fri, 11 Dec 2009)
New Revision: 97745

Added:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bundles/metadata/
Removed:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/
Modified:
   projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/metadata/AbstractManifestTestCase.java
   projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/metadata/HeaderValuesTestCase.java
Log:
Start work on Bundle Validity

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/metadata/AbstractManifestTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/metadata/AbstractManifestTestCase.java	2009-12-11 16:43:45 UTC (rev 97744)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/metadata/AbstractManifestTestCase.java	2009-12-11 17:01:25 UTC (rev 97745)
@@ -26,12 +26,14 @@
 import java.net.URL;
 import java.util.jar.Manifest;
 
+import org.jboss.osgi.testing.OSGiTestHelper;
 import org.jboss.test.BaseTestCase;
 
 /**
  * Uses Manifest.mf file for actual tests.
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
+ * @author Thomas.Diesler at jboss.com
  */
 public abstract class AbstractManifestTestCase extends BaseTestCase
 {
@@ -44,11 +46,12 @@
    {
       if (prefix == null)
          prefix = "";
-      return prefix + "Manifest.mf";
+      return "bundles/metadata/" + prefix + "Manifest.mf";
    }
 
    protected Manifest getManifest(String name) throws IOException
    {
+
       InputStream is = getManifestInputStream(name);
       try
       {
@@ -62,7 +65,7 @@
 
    protected InputStream getManifestInputStream(String name) throws IOException
    {
-      URL url = getResource(name);
+      URL url = new OSGiTestHelper().getResourceURL(name);
       if (url == null)
          fail(name + " not found");
       return url.openStream();

Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/metadata/HeaderValuesTestCase.java
===================================================================
--- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/metadata/HeaderValuesTestCase.java	2009-12-11 16:43:45 UTC (rev 97744)
+++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/java/org/jboss/test/osgi/bundle/metadata/HeaderValuesTestCase.java	2009-12-11 17:01:25 UTC (rev 97745)
@@ -238,11 +238,4 @@
          assertEquals(vr1, vr2);
       }
    }
-
-   public void testIllegalManifest() throws Exception
-   {
-      getManifest(createName("Illegal"));
-      // TDO
-   }
-
 }

Copied: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bundles/metadata (from rev 97743, projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/org/jboss/test/osgi/bundle/metadata)