Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 230a75ec authored by Brett Chabot's avatar Brett Chabot Committed by Android Git Automerger
Browse files

am d583a015: Merge change 25078 into eclair

Merge commit 'd583a015' into eclair-plus-aosp

* commit 'd583a015':
  Fix FileObserverTest#testRun.
parents fca752b9 d583a015
Loading
Loading
Loading
Loading
+39 −7
Original line number Original line Diff line number Diff line
@@ -85,6 +85,7 @@ public class FileObserverTest extends AndroidTestCase {
            waitForEvent(); // modify
            waitForEvent(); // modify


            mTestFile.delete();
            mTestFile.delete();
            waitForEvent(); // modify
            waitForEvent(); // delete
            waitForEvent(); // delete


            mObserver.stopWatching();
            mObserver.stopWatching();
@@ -111,10 +112,41 @@ public class FileObserverTest extends AndroidTestCase {


            while (it.hasNext()) {
            while (it.hasNext()) {
                Map map = it.next();
                Map map = it.next();
                Log.i("FileObserverTest", "event: " + map.get("event").toString() + " path: " + map.get("path"));
                Log.i("FileObserverTest", "event: " + getEventString((Integer)map.get("event")) + " path: " + map.get("path"));
            }
            }


            mObserver.events.clear();
            mObserver.events.clear();
        }
        }
    }
    }

    private String getEventString(int event) {
        switch (event) {
            case  FileObserver.ACCESS:
                return "ACCESS";
            case FileObserver.MODIFY:
                return "MODIFY";
            case FileObserver.ATTRIB:
                return "ATTRIB";
            case FileObserver.CLOSE_WRITE:
                return "CLOSE_WRITE";
            case FileObserver.CLOSE_NOWRITE:
                return "CLOSE_NOWRITE";
            case FileObserver.OPEN:
                return "OPEN";
            case FileObserver.MOVED_FROM:
                return "MOVED_FROM";
            case FileObserver.MOVED_TO:
                return "MOVED_TO";
            case FileObserver.CREATE:
                return "CREATE";
            case FileObserver.DELETE:
                return "DELETE";
            case FileObserver.DELETE_SELF:
                return "DELETE_SELF";
            case FileObserver.MOVE_SELF:
                return "MOVE_SELF";
            default:
                return "UNKNOWN";
        }
    }
}
}