summaryrefslogtreecommitdiffstats
path: root/libnativebridge/tests
diff options
context:
space:
mode:
authorCalin Juravle <calin@google.com>2014-10-29 17:32:31 +0000
committerCalin Juravle <calin@google.com>2014-10-29 17:32:31 +0000
commit83c29aea2f72d10fd2ba027a239f8b4edf8c23c8 (patch)
tree3048ad71565968803cfe4ecdfa0627ba89146e55 /libnativebridge/tests
parent7d5484b0fc8904c51641f38c60bdbbf4c223b1ea (diff)
parent4de4e6defce30e7693cea04e9553ee3bb1e72f88 (diff)
downloadsystem_core-83c29aea2f72d10fd2ba027a239f8b4edf8c23c8.zip
system_core-83c29aea2f72d10fd2ba027a239f8b4edf8c23c8.tar.gz
system_core-83c29aea2f72d10fd2ba027a239f8b4edf8c23c8.tar.bz2
resolved conflicts for merge of 4de4e6de to lmp-mr1-dev-plus-aosp
Change-Id: Ie5c1c814ccd819a592d834879173edb8af15a52d
Diffstat (limited to 'libnativebridge/tests')
-rw-r--r--libnativebridge/tests/CompleteFlow_test.cpp3
1 files changed, 3 insertions, 0 deletions
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 @@ TEST_F(NativeBridgeTest, CompleteFlow) {
// Unload
UnloadNativeBridge();
+
ASSERT_FALSE(NativeBridgeAvailable());
ASSERT_FALSE(NativeBridgeError());
// Clean-up code_cache
ASSERT_EQ(0, rmdir(kCodeCache));
+
+ ASSERT_FALSE(NativeBridgeError());
}
} // namespace android