am aae628b4: Test that we correctly back up an empty file.

Merge commit 'aae628b44518f0886a7f33b88c1131f47d853e70'

* commit 'aae628b44518f0886a7f33b88c1131f47d853e70':
  Test that we correctly back up an empty file.

3 files changed, 4 insertions, 1 deletions

diff --git a/tests/backup/src/com/android/backuptest/BackupTestAgent.java b/tests/backup/src/com/android/backuptest/BackupTestAgent.java
index 931dcb012fcc..6acd90c1993d 100644
--- a/tests/backup/src/com/android/backuptest/BackupTestAgent.java
+++ b/tests/backup/src/com/android/backuptest/BackupTestAgent.java
@@ -23,7 +23,8 @@ public class BackupTestAgent extends BackupHelperAgent
 {
     public void onCreate() {
         addHelper("data_files", new FileBackupHelper(this, BackupTestActivity.FILE_NAME));
-        addHelper("more_data_files", new FileBackupHelper(this, "another_file.txt", "3.txt"));
+        addHelper("more_data_files", new FileBackupHelper(this, "another_file.txt", "3.txt",
+                    "empty.txt"));
     }
 }
 
diff --git a/tests/backup/test_backup.sh b/tests/backup/test_backup.sh
index f6c73d855833..6ef5dffcad85 100755
--- a/tests/backup/test_backup.sh
+++ b/tests/backup/test_backup.sh
@@ -12,6 +12,7 @@ adb shell "rm /data/data/com.android.backuptest/files/* ; \
            echo -n first file > /data/data/com.android.backuptest/files/file.txt ; \
            echo -n asdf > /data/data/com.android.backuptest/files/another_file.txt ; \
            echo -n 3 > /data/data/com.android.backuptest/files/3.txt ; \
+           echo -n "" > /data/data/com.android.backuptest/files/empty.txt ; \
 "
 
 # say that the data has changed
diff --git a/tests/backup/test_restore.sh b/tests/backup/test_restore.sh
index 69da28cffcb3..f3d581e9292d 100755
--- a/tests/backup/test_restore.sh
+++ b/tests/backup/test_restore.sh
@@ -35,6 +35,7 @@ echo
 check_file file.txt "first file"
 check_file another_file.txt "asdf"
 check_file 3.txt "3"
+check_file empty.txt ""
 
 echo
 echo