From 41df668c7be461f461b3d70951dee7634ded868f Mon Sep 17 00:00:00 2001
From: Andreas Gampe <agampe@google.com>
Date: Tue, 2 Sep 2014 21:17:03 -0700
Subject: NativeBridge: Refactor for new initialization flow

Setup becomes Load, have explicit Initialize and Unload.

(cherry picked from commit 035bd7541ed909344348b6a4e17a7ef01a434653)

Change-Id: I5a20de1cb68dd1802937b369b14c50c9c1031c67
---
 libnativebridge/tests/UnavailableNativeBridge_test.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'libnativebridge/tests/UnavailableNativeBridge_test.cpp')

diff --git a/libnativebridge/tests/UnavailableNativeBridge_test.cpp b/libnativebridge/tests/UnavailableNativeBridge_test.cpp
index 27d1233..ec96c32 100644
--- a/libnativebridge/tests/UnavailableNativeBridge_test.cpp
+++ b/libnativebridge/tests/UnavailableNativeBridge_test.cpp
@@ -20,9 +20,10 @@ namespace android {
 
 TEST_F(NativeBridgeTest, NoNativeBridge) {
     EXPECT_EQ(false, NativeBridgeAvailable());
-    // This should lead to an error for trying to initialize a not-setup
-    // native bridge.
+    // Try to initialize. This should fail as we are not set up.
+    EXPECT_EQ(false, InitializeNativeBridge());
     EXPECT_EQ(true, NativeBridgeError());
+    EXPECT_EQ(false, NativeBridgeAvailable());
 }
 
 }  // namespace android
-- 
cgit v1.1