commit 72d6cc0ccd382fced3700bbacc2efdf4e01fe65a
author Benedict Wong <benedictwong@google.com> Wed Jul 03 11:19:21 2019 -0700
committer Benedict Wong <benedictwong@google.com> Wed Jul 03 11:22:46 2019 -0700
tree 31834d38c91b76bc3c04df3afa2a368ca17a5681
parent 5c5f1c8064ac733ab569fac8f3496357e55017d0

Cleanup createChildAndGetChildSessionSmCallback

This commit injects a child and the relevant callbacks, without having
to rely on the IkeSessionStateMachine's internal logic in tests that are
testing other parts of the state machine.

Bug: 134082740
Test: FrameworksIkeTests passing, new tests added
Change-Id: I9a8ece841274e667d627eb75320307b546501bd6

src/java/com/android/ike/ikev2/IkeSessionStateMachine.java

diff --git a/src/java/com/android/ike/ikev2/IkeSessionStateMachine.java b/src/java/com/android/ike/ikev2/IkeSessionStateMachine.java
index 2e4b3a0..2aeeeb7 100644
--- a/src/java/com/android/ike/ikev2/IkeSessionStateMachine.java
+++ b/src/java/com/android/ike/ikev2/IkeSessionStateMachine.java
@@ -576,7 +576,8 @@
     }
 
     /** Callback for ChildSessionStateMachine to notify IkeSessionStateMachine. */
-    private class ChildSessionSmCallback
+    @VisibleForTesting
+    class ChildSessionSmCallback
             implements ChildSessionStateMachine.IChildSessionSmCallback {
         @Override
         public void onChildSaCreated(int remoteSpi, ChildSessionStateMachine childSession) {

tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java

diff --git a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
index cbfa635..85d19ed 100644
--- a/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
+++ b/tests/iketests/src/java/com/android/ike/ikev2/IkeSessionStateMachineTest.java
@@ -984,29 +984,10 @@
             throws Exception {
         registerChildStateMachine(childCallback, child);
 
-        mIkeSessionStateMachine.sendMessage(
-                IkeSessionStateMachine.CMD_EXECUTE_LOCAL_REQ,
-                new ChildLocalRequest(
-                        IkeSessionStateMachine.CMD_LOCAL_REQUEST_CREATE_CHILD,
-                        childCallback,
-                        mChildSessionOptions));
-        mLooper.dispatchAll();
-
-        verify(mMockChildSessionFactoryHelper)
-                .makeChildSessionStateMachine(
-                        eq(mLooper.getLooper()),
-                        eq(mContext),
-                        eq(mChildSessionOptions),
-                        eq(mUserCbHandler),
-                        eq(childCallback),
-                        mChildSessionSmCbCaptor.capture());
-        IChildSessionSmCallback cb = mChildSessionSmCbCaptor.getValue();
+        IChildSessionSmCallback cb = mIkeSessionStateMachine.new ChildSessionSmCallback();
         cb.onChildSaCreated(remoteSpi, child);
-        cb.onProcedureFinished(child);
         mLooper.dispatchAll();
 
-        assertTrue(
-                mIkeSessionStateMachine.getCurrentState() instanceof IkeSessionStateMachine.Idle);
         return cb;
     }