[Thread] add FakeOtDaemon#isInitialized

add FakeOtDaemon#isInitialized to indicated whether ot-daemon has been
started/initialized.

Bug: 328538612
Change-Id: I4528718864654c49cc0c8d00c4200f891c7a248b

2 files changed, 28 insertions, 31 deletions

diff --git a/src/android/java/com/android/server/thread/openthread/testing/FakeOtDaemon.java b/src/android/java/com/android/server/thread/openthread/testing/FakeOtDaemon.java
index 2a28ed1f..ef579f79 100644
--- a/src/android/java/com/android/server/thread/openthread/testing/FakeOtDaemon.java
+++ b/src/android/java/com/android/server/thread/openthread/testing/FakeOtDaemon.java
@@ -70,7 +70,8 @@ public final class FakeOtDaemon extends IOtDaemon.Stub {
     private final Handler mHandler;
     private final OtDaemonState mState;
     private final BackboneRouterState mBbrState;
-    private int mThreadEnabled = OT_STATE_ENABLED;
+    private boolean mIsInitialized = false;
+    private int mThreadEnabled = OT_STATE_DISABLED;
     private int mChannelMasksReceiverOtError = OT_ERROR_NONE;
     private int mSupportedChannelMask = 0x07FFF800; // from channel 11 to 26
     private int mPreferredChannelMask = 0;
@@ -126,6 +127,7 @@ public final class FakeOtDaemon extends IOtDaemon.Stub {
             INsdPublisher nsdPublisher,
             MeshcopTxtAttributes overriddenMeshcopTxts)
             throws RemoteException {
+        mIsInitialized = true;
         mTunFd = tunFd;
         mThreadEnabled = enabled ? OT_STATE_ENABLED : OT_STATE_DISABLED;
         mNsdPublisher = nsdPublisher;
@@ -136,17 +138,9 @@ public final class FakeOtDaemon extends IOtDaemon.Stub {
         mOverriddenMeshcopTxts.modelName = overriddenMeshcopTxts.modelName;
     }
 
-    @Override
-    public void setThreadEnabled(boolean enabled, IOtStatusReceiver receiver) {
-        mHandler.post(
-                () -> {
-                    mThreadEnabled = enabled ? OT_STATE_ENABLED : OT_STATE_DISABLED;
-                    try {
-                        receiver.onSuccess();
-                    } catch (RemoteException e) {
-                        throw new AssertionError(e);
-                    }
-                });
+    /** Returns {@code true} if {@link initialize} has been called to initialize this object. */
+    public boolean isInitialized() {
+        return mIsInitialized;
     }
 
     public int getEnabledState() {
@@ -181,6 +175,19 @@ public final class FakeOtDaemon extends IOtDaemon.Stub {
     }
 
     @Override
+    public void setThreadEnabled(boolean enabled, IOtStatusReceiver receiver) {
+        mHandler.post(
+                () -> {
+                    mThreadEnabled = enabled ? OT_STATE_ENABLED : OT_STATE_DISABLED;
+                    try {
+                        receiver.onSuccess();
+                    } catch (RemoteException e) {
+                        throw new AssertionError(e);
+                    }
+                });
+    }
+
+    @Override
     public void registerStateCallback(IOtDaemonCallback callback, long listenerId)
             throws RemoteException {
         mCallback = callback;
diff --git a/tests/android/java/com/android/server/thread/openthread/testing/FakeOtDaemonTest.java b/tests/android/java/com/android/server/thread/openthread/testing/FakeOtDaemonTest.java
index 312d4915..cc6179d1 100644
--- a/tests/android/java/com/android/server/thread/openthread/testing/FakeOtDaemonTest.java
+++ b/tests/android/java/com/android/server/thread/openthread/testing/FakeOtDaemonTest.java
@@ -112,21 +112,7 @@ public final class FakeOtDaemonTest {
     }
 
     @Test
-    public void initialize_succeed_tunFdIsSet() throws Exception {
-        mFakeOtDaemon.initialize(mMockTunFd, true, mMockNsdPublisher, mOverriddenMeshcopTxts);
-
-        assertThat(mFakeOtDaemon.getTunFd()).isEqualTo(mMockTunFd);
-    }
-
-    @Test
-    public void initialize_succeed_NsdPublisherIsSet() throws Exception {
-        mFakeOtDaemon.initialize(mMockTunFd, true, mMockNsdPublisher, mOverriddenMeshcopTxts);
-
-        assertThat(mFakeOtDaemon.getNsdPublisher()).isEqualTo(mMockNsdPublisher);
-    }
-
-    @Test
-    public void initialize_succeed_vendorAndModelNameAreSet() throws Exception {
+    public void initialize_succeed_argumentsAreSet() throws Exception {
         mOverriddenMeshcopTxts.vendorName = TEST_VENDOR_NAME;
         mOverriddenMeshcopTxts.vendorOui = TEST_VENDOR_OUI;
         mOverriddenMeshcopTxts.modelName = TEST_MODEL_NAME;
@@ -138,6 +124,10 @@ public final class FakeOtDaemonTest {
         assertThat(meshcopTxts.vendorName).isEqualTo(TEST_VENDOR_NAME);
         assertThat(meshcopTxts.vendorOui).isEqualTo(TEST_VENDOR_OUI);
         assertThat(meshcopTxts.modelName).isEqualTo(TEST_MODEL_NAME);
+        assertThat(mFakeOtDaemon.getTunFd()).isEqualTo(mMockTunFd);
+        assertThat(mFakeOtDaemon.getEnabledState()).isEqualTo(OT_STATE_ENABLED);
+        assertThat(mFakeOtDaemon.getNsdPublisher()).isEqualTo(mMockNsdPublisher);
+        assertThat(mFakeOtDaemon.isInitialized()).isTrue();
     }
 
     @Test
@@ -235,12 +225,12 @@ public final class FakeOtDaemonTest {
     }
 
     @Test
-    public void setThreadEnabled_disableThread_succeed() throws Exception {
-        assertThat(mFakeOtDaemon.getEnabledState()).isEqualTo(OT_STATE_ENABLED);
+    public void setThreadEnabled_enableThread_succeed() throws Exception {
+        assertThat(mFakeOtDaemon.getEnabledState()).isEqualTo(OT_STATE_DISABLED);
 
         final AtomicBoolean succeedRef = new AtomicBoolean(false);
         mFakeOtDaemon.setThreadEnabled(
-                false,
+                true,
                 new IOtStatusReceiver.Default() {
                     @Override
                     public void onSuccess() {
@@ -250,7 +240,7 @@ public final class FakeOtDaemonTest {
         mTestLooper.dispatchAll();
 
         assertThat(succeedRef.get()).isTrue();
-        assertThat(mFakeOtDaemon.getEnabledState()).isEqualTo(OT_STATE_DISABLED);
+        assertThat(mFakeOtDaemon.getEnabledState()).isEqualTo(OT_STATE_ENABLED);
     }
 
     @Test