From 1540b4bdf52358b1cea5d92ad86de9ab564918f4 Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 24 Jul 2015 18:15:56 -0700 Subject: Change bridges access through method This will help with unit testing. --- app/src/main/java/org/connectbot/ConsoleActivity.java | 11 +---------- app/src/main/java/org/connectbot/HostListActivity.java | 2 +- app/src/main/java/org/connectbot/service/TerminalManager.java | 11 ++++++++++- 3 files changed, 12 insertions(+), 12 deletions(-) (limited to 'app/src') diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index 77f8a3f..e7a8f7d 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -145,9 +145,6 @@ public class ConsoleActivity extends Activity { // let manager know about our event handling services bound.disconnectHandler = disconnectHandler; - - Log.d(TAG, String.format("Connected to TerminalManager and found bridges.size=%d", bound.bridges.size())); - bound.setResizeAllowed(true); // clear out any existing bridges and record requested index @@ -169,7 +166,7 @@ public class ConsoleActivity extends Activity { } // create views for all bridges on this service - for (TerminalBridge bridge : bound.bridges) { + for (TerminalBridge bridge : bound.getBridges()) { final int currentIndex = addNewTerminalView(bridge); @@ -182,12 +179,6 @@ public class ConsoleActivity extends Activity { } public void onServiceDisconnected(ComponentName className) { - // tell each bridge to forget about our prompt handler - synchronized (bound.bridges) { - for (TerminalBridge bridge : bound.bridges) - bridge.promptHelper.setHandler(null); - } - flip.removeAllViews(); updateEmptyVisible(); bound = null; diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index 7946e9a..2fd9560 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -447,7 +447,7 @@ public class HostListActivity extends ListActivity { // Don't lose hosts that are connected via shortcuts but not in the database. if (bound != null) { - for (TerminalBridge bridge : bound.bridges) { + for (TerminalBridge bridge : bound.getBridges()) { if (!hosts.contains(bridge.host)) hosts.add(0, bridge.host); } diff --git a/app/src/main/java/org/connectbot/service/TerminalManager.java b/app/src/main/java/org/connectbot/service/TerminalManager.java index 8e7187f..1688d2a 100644 --- a/app/src/main/java/org/connectbot/service/TerminalManager.java +++ b/app/src/main/java/org/connectbot/service/TerminalManager.java @@ -70,7 +70,7 @@ import android.util.Log; public class TerminalManager extends Service implements BridgeDisconnectedListener, OnSharedPreferenceChangeListener { public final static String TAG = "CB.TerminalManager"; - public List bridges = new LinkedList(); + private List bridges = new LinkedList(); public Map> mHostBridgeMap = new HashMap>(); public Map> mNicknameBridgeMap = @@ -471,6 +471,10 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen } } + public List getBridges() { + return bridges; + } + public class TerminalBinder extends Binder { public TerminalManager getService() { return TerminalManager.this; @@ -518,6 +522,11 @@ public class TerminalManager extends Service implements BridgeDisconnectedListen if (bridges.size() == 0) { stopWithDelay(); + } else { + // tell each bridge to forget about their previous prompt handler + for (TerminalBridge bridge : bridges) { + bridge.promptHelper.setHandler(null); + } } return true; -- cgit v1.2.3 From d5e1a15d7e10b50bc84d5ce738404f36cca9795f Mon Sep 17 00:00:00 2001 From: Kenny Root Date: Fri, 24 Jul 2015 18:24:27 -0700 Subject: Add HostListActivity unit test --- .../java/org/connectbot/HostListActivityTest.java | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 app/src/test/java/org/connectbot/HostListActivityTest.java (limited to 'app/src') diff --git a/app/src/test/java/org/connectbot/HostListActivityTest.java b/app/src/test/java/org/connectbot/HostListActivityTest.java new file mode 100644 index 0000000..ebfeed6 --- /dev/null +++ b/app/src/test/java/org/connectbot/HostListActivityTest.java @@ -0,0 +1,57 @@ +/* + * ConnectBot: simple, powerful, open-source SSH client for Android + * Copyright 2015 Kenny Root, Jeffrey Sharkey + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.connectbot; + +import org.connectbot.service.TerminalManager; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +import android.content.ComponentName; +import android.content.Intent; +import android.os.Build; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; +import static org.robolectric.Shadows.shadowOf; + +@RunWith(RobolectricGradleTestRunner.class) +@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.KITKAT, packageName = "org.connectbot") +public class HostListActivityTest { + private void mockBindToService(TerminalManager terminalManager) { + TerminalManager.TerminalBinder stubBinder = mock(TerminalManager.TerminalBinder.class); + when(stubBinder.getService()).thenReturn(terminalManager); + shadowOf(RuntimeEnvironment.application).setComponentNameAndServiceForBindService(new ComponentName("org.connectbot", TerminalManager.class.getName()), stubBinder); + } + + @Test + public void bindsToTerminalManager() { + TerminalManager terminalManager = spy(TerminalManager.class); + mockBindToService(terminalManager); + + HostListActivity activity = Robolectric.buildActivity(HostListActivity.class).create().start().get(); + + Intent serviceIntent = new Intent(activity, TerminalManager.class); + assertThat(shadowOf(activity).getNextStartedService()).isEqualTo(serviceIntent); + } +} \ No newline at end of file -- cgit v1.2.3