From 95034e36b19588f9e088948fb88503ea668b4621 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 26 Oct 2017 17:44:13 +0200
Subject: [PATCH] fix unit test

---
 .../SecurityTokenConnection.java              |  3 ++-
 .../SecurityTokenConnectionTest.java          | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
index 5fe3f57cf..70fff4866 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
@@ -210,7 +210,8 @@ public class SecurityTokenConnection {
         }
     }
 
-    private void determineTokenType() throws IOException {
+    @VisibleForTesting
+    void determineTokenType() throws IOException {
         tokenType = mTransport.getTokenTypeIfAvailable();
         if (tokenType != null) {
             return;
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java
index 76ceb5b47..e79b3add3 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java
@@ -8,9 +8,12 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.InOrder;
+import org.mockito.internal.verification.VerificationModeFactory;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.shadows.ShadowLog;
 import org.sufficientlysecure.keychain.KeychainTestRunner;
+import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType;
+import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TransportType;
 import org.sufficientlysecure.keychain.util.Passphrase;
 
 import static org.mockito.Matchers.eq;
@@ -23,19 +26,25 @@ import static org.mockito.Mockito.when;
 @RunWith(KeychainTestRunner.class)
 public class SecurityTokenConnectionTest {
 
+    private Transport transport;
+
     @Before
     public void setUp() throws Exception {
         ShadowLog.stream = System.out;
+
+        transport = mock(Transport.class);
+        when(transport.getTransportType()).thenReturn(TransportType.USB);
+        when(transport.getTokenTypeIfAvailable()).thenReturn(TokenType.YUBIKEY_NEO);
     }
 
     @Test
     public void test_connectToDevice() throws Exception {
-        Transport transport = mock(Transport.class);
         SecurityTokenConnection securityTokenConnection =
                 new SecurityTokenConnection(transport, new Passphrase("123456"), new OpenPgpCommandApduFactory());
-
-        String[] dialog = { "00a4040006d27600012401", "9000",
-                "00ca006e00",
+        String[] dialog = {
+                "00a4040006d27600012401", // select openpgp applet
+                "9000",
+                "00ca006e00", // get application related data
                 "6e81de4f10d27600012401020000060364311500005f520f0073000080000000000000000000007381b7c00af" +
                         "00000ff04c000ff00ffc106010800001103c206010800001103c306010800001103c407007f7f7f03030" +
                         "3c53c4ec5fee25c4e89654d58cad8492510a89d3c3d8468da7b24e15bfc624c6a792794f15b7599915f7" +
@@ -55,7 +64,6 @@ public class SecurityTokenConnectionTest {
 
     @Test
     public void test_getTokenInfo() throws Exception {
-        Transport transport = mock(Transport.class);
         SecurityTokenConnection securityTokenConnection =
                 new SecurityTokenConnection(transport, new Passphrase("123456"), new OpenPgpCommandApduFactory());
         OpenPgpCapabilities openPgpCapabilities = new OpenPgpCapabilities(
@@ -68,6 +76,7 @@ public class SecurityTokenConnectionTest {
                                 "000000000cd0c59cd0f2a59cd0af059cd0c95"
                                 ));
         securityTokenConnection.setConnectionCapabilities(openPgpCapabilities);
+        securityTokenConnection.determineTokenType();
 
         String[] dialog = {
                 "00ca006500",
@@ -98,6 +107,5 @@ public class SecurityTokenConnectionTest {
             CommandApdu command = CommandApdu.fromBytes(Hex.decode(dialog[i]));
             inOrder.verify(transport).transceive(eq(command));
         }
-        inOrder.verifyNoMoreInteractions();
     }
 }
\ No newline at end of file