diff options
| author | Pascal Rapicault | 2005-01-14 23:09:03 +0000 |
|---|---|---|
| committer | Pascal Rapicault | 2005-01-14 23:09:03 +0000 |
| commit | 084513f6aff2a4ea5c7810e8f750ba9fdbac9d2a (patch) | |
| tree | d49557736c582eaadab7aff6b7bfa6f37361700f /bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java | |
| parent | eefdaa77742440a14d0ea00039f3c3370e8421b7 (diff) | |
| download | rt.equinox.framework-084513f6aff2a4ea5c7810e8f750ba9fdbac9d2a.tar.gz rt.equinox.framework-084513f6aff2a4ea5c7810e8f750ba9fdbac9d2a.tar.xz rt.equinox.framework-084513f6aff2a4ea5c7810e8f750ba9fdbac9d2a.zip | |
Merge from the osgi layering branch
Diffstat (limited to 'bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java')
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java index 09522fcc7..176bcd760 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/services/resolver/VersionRangeTests.java @@ -11,52 +11,52 @@ package org.eclipse.osgi.tests.services.resolver; import junit.framework.*; -import org.eclipse.osgi.service.resolver.Version; import org.eclipse.osgi.service.resolver.VersionRange; +import org.osgi.framework.Version; public class VersionRangeTests extends TestCase { public void testSingleVersionRange() { VersionRange range; - range = new VersionRange("[1.0.0, 1.0.0.\0000)"); - assertEquals("0.1", new Version("1.0"), range.getMinimum()); - assertTrue("0.9", !range.isIncluded(new Version("0.9"))); - assertTrue("1.0", range.isIncluded(new Version("1"))); - assertTrue("1.1", range.isIncluded(new Version("1.0"))); - assertTrue("1.2", range.isIncluded(new Version("1.0.0"))); - assertTrue("2.1", !range.isIncluded(new Version("1.0.0.0"))); - assertTrue("2.2", !range.isIncluded(new Version("1.0.1"))); - assertTrue("2.3", !range.isIncluded(new Version("1.1"))); - assertTrue("2.4", !range.isIncluded(new Version("2"))); + range = new VersionRange("[1.0.0, 1.0.0.-)"); + assertEquals("0.1", Version.parseVersion("1.0"), range.getMinimum()); + assertTrue("0.9", !range.isIncluded(Version.parseVersion("0.9"))); + assertTrue("1.0", range.isIncluded(Version.parseVersion("1"))); + assertTrue("1.1", range.isIncluded(Version.parseVersion("1.0"))); + assertTrue("1.2", range.isIncluded(Version.parseVersion("1.0.0"))); + assertTrue("2.1", !range.isIncluded(Version.parseVersion("1.0.0.0"))); + assertTrue("2.2", !range.isIncluded(Version.parseVersion("1.0.1"))); + assertTrue("2.3", !range.isIncluded(Version.parseVersion("1.1"))); + assertTrue("2.4", !range.isIncluded(Version.parseVersion("2"))); } public void testInvertedRange() { VersionRange range; range = new VersionRange("[2.0.0, 1.0.0]"); - assertTrue("1.0", !range.isIncluded(new Version("1"))); - assertTrue("1.1", !range.isIncluded(new Version("1.5"))); - assertTrue("1.2", !range.isIncluded(new Version("2.0"))); - assertTrue("1.3", !range.isIncluded(new Version("2.5"))); - assertTrue("1.4", !range.isIncluded(new Version("0.5"))); + assertTrue("1.0", !range.isIncluded(Version.parseVersion("1"))); + assertTrue("1.1", !range.isIncluded(Version.parseVersion("1.5"))); + assertTrue("1.2", !range.isIncluded(Version.parseVersion("2.0"))); + assertTrue("1.3", !range.isIncluded(Version.parseVersion("2.5"))); + assertTrue("1.4", !range.isIncluded(Version.parseVersion("0.5"))); } public void testGreaterThan() { // any version equal or greater than 1.0 is ok VersionRange lowerBound = new VersionRange("1.0.0"); - assertTrue("1.0", !lowerBound.isIncluded(new Version("0.9"))); - assertTrue("1.1", lowerBound.isIncluded(new Version("1.0"))); - assertTrue("1.2", lowerBound.isIncluded(new Version("1.9.9.x"))); - assertTrue("1.3", lowerBound.isIncluded(new Version("999.999.999.foo"))); + assertTrue("1.0", !lowerBound.isIncluded(Version.parseVersion("0.9"))); + assertTrue("1.1", lowerBound.isIncluded(Version.parseVersion("1.0"))); + assertTrue("1.2", lowerBound.isIncluded(Version.parseVersion("1.9.9.x"))); + assertTrue("1.3", lowerBound.isIncluded(Version.parseVersion("999.999.999.foo"))); } public void testLowerThan() { // any version lower than 2.0 is ok VersionRange upperBound = new VersionRange("[0,2.0)"); - assertTrue("1.0", upperBound.isIncluded(new Version("0.0"))); - assertTrue("1.1", upperBound.isIncluded(new Version("0.9"))); - assertTrue("1.2", upperBound.isIncluded(new Version("1.0"))); - assertTrue("1.3", upperBound.isIncluded(new Version("1.9.9.x"))); - assertTrue("1.4", !upperBound.isIncluded(new Version("2.0"))); - assertTrue("1.5", !upperBound.isIncluded(new Version("2.1"))); + assertTrue("1.0", upperBound.isIncluded(Version.parseVersion("0.0"))); + assertTrue("1.1", upperBound.isIncluded(Version.parseVersion("0.9"))); + assertTrue("1.2", upperBound.isIncluded(Version.parseVersion("1.0"))); + assertTrue("1.3", upperBound.isIncluded(Version.parseVersion("1.9.9.x"))); + assertTrue("1.4", !upperBound.isIncluded(Version.parseVersion("2.0"))); + assertTrue("1.5", !upperBound.isIncluded(Version.parseVersion("2.1"))); } public static Test suite() { |