commit 6803c3e6c0d80f6cf79ca6338341a9fa423a763a
author Narayan Kamath <narayan@google.com> Wed Oct 08 15:56:20 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 08 15:56:20 2014 +0000
tree fa8c9b70cbd3d7c268edfcff295714aefa097a7d
parent fe002eb6f1af270d34284c939c8b05068a79fdd1
parent 593a2e1667f8923dff875268169bb5dfa4c67bef

am 593a2e16: Fix FileTest.

* commit '593a2e1667f8923dff875268169bb5dfa4c67bef':
  Fix FileTest.

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java
index ea7b2ea..5cc88f4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java
@@ -903,10 +903,9 @@
     public void test_getParent() {
         File f = new File("p.tst");
         assertNull("Incorrect path returned", f.getParent());
-        f = new File(System.getProperty("user.home"), "p.tst");
+        f = new File("/user/home/p.tst");
         assertEquals("Incorrect path returned",
-                System.getProperty("user.home"), f.getParent());
-        f.delete();
+                "/user/home", f.getParent());
 
         File f1 = new File("/directory");
         assertEquals("Wrong parent test 1", File.separator, f1.getParent());