natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OSGI: new names for CDC profiles too 

git-svn-id: https://svn.apache.org/repos/asf/ant/ivy/core/trunk@1553708 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nicolas Lalevee 2013-12-27 17:56:38 +00:00
parent 9c06ff87de
commit 198d448cea
2 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/java/org/apache/ivy/osgi/core/jvm-packages.properties
View File

@ -26,11 +26,13 @@ OSGi/Minimum-1.1.pkglist =
OSGi/Minimum-1.2.aliases = OSGI_MINIMUM-1.2
OSGi/Minimum-1.2.pkglist =
CDC-1.0_Foundation-1.0.pkglist = \
CDC-1.0/Foundation-1.0.aliases = CDC-1.0_Foundation-1.0
CDC-1.0/Foundation-1.0.pkglist = \
javax.microedition.io
CDC-1.1_Foundation-1.1.extends = CDC-1.0_Foundation-1.0
CDC-1.1_Foundation-1.1.pkglist = \
CDC-1.1/Foundation-1.1.aliases = CDC-1.1_Foundation-1.1
CDC-1.1/Foundation-1.1.extends = CDC-1.0/Foundation-1.0
CDC-1.1/Foundation-1.1.pkglist = \
javax.microedition.pki,\
javax.security.auth.x500

42
test/java/org/apache/ivy/osgi/core/ExecutionEnvironmentProfileLoaderTest.java
View File

@ -27,26 +27,28 @@ public class ExecutionEnvironmentProfileLoaderTest extends TestCase {
public void testLoad() throws Exception {
Map<String, ExecutionEnvironmentProfile> profiles = ExecutionEnvironmentProfileProvider.loadDefaultProfileList();
assertEquals(19, profiles.size());
assertEquals(21, profiles.size());
assertEquals(0, ((ExecutionEnvironmentProfile) profiles.get("OSGI_MINIMUM-1.0")).getPkgNames().size());
assertEquals(0, ((ExecutionEnvironmentProfile) profiles.get("OSGi/Minimum-1.0")).getPkgNames().size());
assertEquals(0, ((ExecutionEnvironmentProfile) profiles.get("OSGI_MINIMUM-1.1")).getPkgNames().size());
assertEquals(0, ((ExecutionEnvironmentProfile) profiles.get("OSGi/Minimum-1.1")).getPkgNames().size());
assertEquals(0, ((ExecutionEnvironmentProfile) profiles.get("OSGI_MINIMUM-1.2")).getPkgNames().size());
assertEquals(0, ((ExecutionEnvironmentProfile) profiles.get("OSGi/Minimum-1.2")).getPkgNames().size());
assertEquals(1, ((ExecutionEnvironmentProfile) profiles.get("CDC-1.0_Foundation-1.0")).getPkgNames().size());
assertEquals(3, ((ExecutionEnvironmentProfile) profiles.get("CDC-1.1_Foundation-1.1")).getPkgNames().size());
assertEquals(24, ((ExecutionEnvironmentProfile) profiles.get("J2SE-1.2")).getPkgNames().size());
assertEquals(24, ((ExecutionEnvironmentProfile) profiles.get("JavaSE-1.2")).getPkgNames().size());
assertEquals(40, ((ExecutionEnvironmentProfile) profiles.get("J2SE-1.3")).getPkgNames().size());
assertEquals(40, ((ExecutionEnvironmentProfile) profiles.get("JavaSE-1.3")).getPkgNames().size());
assertEquals(96, ((ExecutionEnvironmentProfile) profiles.get("J2SE-1.4")).getPkgNames().size());
assertEquals(96, ((ExecutionEnvironmentProfile) profiles.get("JavaSE-1.4")).getPkgNames().size());
assertEquals(122, ((ExecutionEnvironmentProfile) profiles.get("J2SE-1.5")).getPkgNames().size());
assertEquals(122, ((ExecutionEnvironmentProfile) profiles.get("J2SE-1.5")).getPkgNames().size());
assertEquals(158, ((ExecutionEnvironmentProfile) profiles.get("JavaSE-1.6")).getPkgNames().size());
assertEquals(159, ((ExecutionEnvironmentProfile) profiles.get("JavaSE-1.7")).getPkgNames().size());
assertEquals(159, ((ExecutionEnvironmentProfile) profiles.get("JavaSE-1.8")).getPkgNames().size());
assertEquals(0, profiles.get("OSGI_MINIMUM-1.0").getPkgNames().size());
assertEquals(0, profiles.get("OSGi/Minimum-1.0").getPkgNames().size());
assertEquals(0, profiles.get("OSGI_MINIMUM-1.1").getPkgNames().size());
assertEquals(0, profiles.get("OSGi/Minimum-1.1").getPkgNames().size());
assertEquals(0, profiles.get("OSGI_MINIMUM-1.2").getPkgNames().size());
assertEquals(0, profiles.get("OSGi/Minimum-1.2").getPkgNames().size());
assertEquals(1, profiles.get("CDC-1.0_Foundation-1.0").getPkgNames().size());
assertEquals(1, profiles.get("CDC-1.0/Foundation-1.0").getPkgNames().size());
assertEquals(3, profiles.get("CDC-1.1_Foundation-1.1").getPkgNames().size());
assertEquals(3, profiles.get("CDC-1.1/Foundation-1.1").getPkgNames().size());
assertEquals(24, profiles.get("J2SE-1.2").getPkgNames().size());
assertEquals(24, profiles.get("JavaSE-1.2").getPkgNames().size());
assertEquals(40, profiles.get("J2SE-1.3").getPkgNames().size());
assertEquals(40, profiles.get("JavaSE-1.3").getPkgNames().size());
assertEquals(96, profiles.get("J2SE-1.4").getPkgNames().size());
assertEquals(96, profiles.get("JavaSE-1.4").getPkgNames().size());
assertEquals(122, profiles.get("J2SE-1.5").getPkgNames().size());
assertEquals(122, profiles.get("J2SE-1.5").getPkgNames().size());
assertEquals(158, profiles.get("JavaSE-1.6").getPkgNames().size());
assertEquals(159, profiles.get("JavaSE-1.7").getPkgNames().size());
assertEquals(159, profiles.get("JavaSE-1.8").getPkgNames().size());
}
}