summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2009-09-04 18:14:24 -0700
committerElliott Hughes <enh@google.com>2009-09-04 18:14:24 -0700
commit6ba092c6df91e6ea2477d9142fde14af30bba327 (patch)
tree76c3b1ec107f12d9f128cfcd4dcc5748a1bf07fc
parent1a4665df03a2d8034a9dce600746d3317fa400e3 (diff)
downloadlibcore-6ba092c6df91e6ea2477d9142fde14af30bba327.zip
libcore-6ba092c6df91e6ea2477d9142fde14af30bba327.tar.gz
libcore-6ba092c6df91e6ea2477d9142fde14af30bba327.tar.bz2
Fix Package.isCompatibleWith.
Note that this doesn't help us because to Dalvik, all packages have version "0.0". Bug: 2099697
-rw-r--r--luni-kernel/src/main/java/java/lang/Package.java5
-rw-r--r--luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/luni-kernel/src/main/java/java/lang/Package.java b/luni-kernel/src/main/java/java/lang/Package.java
index 2817404..4d98959 100644
--- a/luni-kernel/src/main/java/java/lang/Package.java
+++ b/luni-kernel/src/main/java/java/lang/Package.java
@@ -268,8 +268,8 @@ public class Package implements AnnotatedElement {
*/
public boolean isCompatibleWith(String version)
throws NumberFormatException {
- String[] requested = version.split(".");
- String[] provided = specVersion.split(".");
+ String[] requested = version.split("\\.");
+ String[] provided = specVersion.split("\\.");
for (int i = 0; i < Math.min(requested.length, provided.length); i++) {
int reqNum = Integer.parseInt(requested[i]);
@@ -318,4 +318,3 @@ public class Package implements AnnotatedElement {
return "package " + name;
}
}
-
diff --git a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
index cb35324..283c1db 100644
--- a/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
+++ b/luni/src/test/java/org/apache/harmony/luni/tests/java/lang/PackageTest.java
@@ -312,7 +312,7 @@ public class PackageTest extends junit.framework.TestCase {
method = "isCompatibleWith",
args = {java.lang.String.class}
)
- @KnownFailure("isCompatibleWith returns incorrect value.")
+ @KnownFailure("Dalvik packages are always version '0.0'.")
public void test_isCompatibleWithLjava_lang_String() throws Exception {
Package p = getTestPackage("hyts_c.jar", "p.C");