commit 83c29aea2f72d10fd2ba027a239f8b4edf8c23c8
author Calin Juravle <calin@google.com> Wed Oct 29 17:32:31 2014 +0000
committer Calin Juravle <calin@google.com> Wed Oct 29 17:32:31 2014 +0000
tree 3048ad71565968803cfe4ecdfa0627ba89146e55
parent 7d5484b0fc8904c51641f38c60bdbbf4c223b1ea
parent 4de4e6defce30e7693cea04e9553ee3bb1e72f88

resolved conflicts for merge of 4de4e6de to lmp-mr1-dev-plus-aosp

Change-Id: Ie5c1c814ccd819a592d834879173edb8af15a52d

libnativebridge/tests/CompleteFlow_test.cpp

diff --git a/libnativebridge/tests/CompleteFlow_test.cpp b/libnativebridge/tests/CompleteFlow_test.cpp
index cf06d2c..05f5304 100644
--- a/libnativebridge/tests/CompleteFlow_test.cpp
+++ b/libnativebridge/tests/CompleteFlow_test.cpp
@@ -36,11 +36,14 @@
 
     // Unload
     UnloadNativeBridge();
+
     ASSERT_FALSE(NativeBridgeAvailable());
     ASSERT_FALSE(NativeBridgeError());
 
     // Clean-up code_cache
     ASSERT_EQ(0, rmdir(kCodeCache));
+
+    ASSERT_FALSE(NativeBridgeError());
 }
 
 }  // namespace android