svn commit: r819309 - in /felix/trunk/sigil/common/core.tests: src/org/apache/felix/sigil/core/ test/ConfigTest/inheritance/ test/ConfigTest/inheritance/foo/

[ds...@apache.org]

Author: dsavage
Date: Sun Sep 27 13:44:58 2009
New Revision: 819309

URL: http://svn.apache.org/viewvc?rev=819309&view=rev
Log:
add test for variables with inheritance 

Added:
    felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/
    felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/foo/
    felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/foo/sigil.properties
    felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/sigil-defaults.properties
Modified:
    felix/trunk/sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java

Modified: felix/trunk/sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java?rev=819309&r1=819308&r2=819309&view=diff
==============================================================================
--- felix/trunk/sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java (original)
+++ felix/trunk/sigil/common/core.tests/src/org/apache/felix/sigil/core/ConfigTest.java Sun Sep 27 13:44:58 2009
@@ -22,7 +22,7 @@
 
 import java.io.IOException;
 import java.net.URI;
-import java.util.Set;
+import java.util.Collection;
 
 import junit.framework.TestCase;
 
@@ -40,7 +40,10 @@
 
     static final URI base = URI.create( "test/ConfigTest/sigil.properties" );
 
-
+    static {
+        System.setProperty( "bar.version", "2.0.0" );        
+    }
+    
     public ConfigTest( String name )
     {
         super( name );
@@ -54,14 +57,6 @@
         ISigilBundle bundle = project.getDefaultBundle();
         IBundleModelElement info = bundle.getBundleInfo();
 
-        checkImports( info.getImports() );
-
-        //IBundleModelElement requirements = project.getRequirements();
-    }
-
-
-    private void checkImports( Set<IPackageImport> imports )
-    {
         PackageImport foo = new PackageImport();
         foo.setPackageName( "foo" );
         foo.setVersions( VersionRange.parseVersionRange( "1.0.0" ) );
@@ -72,9 +67,37 @@
         baz.setPackageName( "baz" );
         baz.setVersions( VersionRange.parseVersionRange( "[3.0.0, 4.0.0)" ) );
 
+        Collection<IPackageImport> imports = info.getImports();
+        
         assertTrue( foo.toString(), imports.contains( foo ) );
         assertTrue( bar.toString(), imports.contains( bar ) );
         assertTrue( baz.toString(), imports.contains( baz ) );
+        //IBundleModelElement requirements = project.getRequirements();
+    }
+    
+    public void testInherited() throws IOException {
+        
+        IBldProject project = BldFactory.getProject( base.resolve( "inheritance/foo/sigil.properties" ) );
+
+        ISigilBundle bundle = project.getDefaultBundle();
+        IBundleModelElement info = bundle.getBundleInfo();
+
+        Collection<IPackageImport> imports = info.getImports();
+        assertEquals( 1, imports.size() );
+        IPackageImport i = imports.iterator().next();
+        assertEquals( "org.bar", i.getPackageName() );
+        assertEquals( VersionRange.parseVersionRange("2.0.0"), i.getVersions() );
+        
+//        project = BldFactory.getProject( base.resolve( "inheritance/foo/sigil.properties" ), true );
+//
+//        bundle = project.getDefaultBundle();
+//        info = bundle.getBundleInfo();
+//
+//        imports = info.getImports();
+//        assertEquals( 1, imports.size() );
+//        i = imports.iterator().next();
+//        assertEquals( "org.bar", i.getPackageName() );
+//        assertEquals( VersionRange.parseVersionRange("2.0.0"), i.getVersions() );
     }
 
 }

Added: felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/foo/sigil.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/foo/sigil.properties?rev=819309&view=auto
==============================================================================
--- felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/foo/sigil.properties (added)
+++ felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/foo/sigil.properties Sun Sep 27 13:44:58 2009
@@ -0,0 +1,2 @@
+-bundles: org.foo
+-imports: org.bar
\ No newline at end of file

Added: felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/sigil-defaults.properties
URL: http://svn.apache.org/viewvc/felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/sigil-defaults.properties?rev=819309&view=auto
==============================================================================
--- felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/sigil-defaults.properties (added)
+++ felix/trunk/sigil/common/core.tests/test/ConfigTest/inheritance/sigil-defaults.properties Sun Sep 27 13:44:58 2009
@@ -0,0 +1 @@
+package;org.bar.*:	${bar.version:-1.0.0}
\ No newline at end of file