From 24110ba17870aa48a85751367922a87415a550d4 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Tue, 10 Feb 2015 12:57:17 +0100 Subject: [PATCH] Updated unit tests --- .../android/lib/common/OwnCloudAccount.java | 15 +++++++-- .../network/AdvancedSslSocketFactory.java | 3 ++ .../test/SimpleFactoryManagerTest.java | 28 ++++++++++------ .../test/SingleSessionManagerTest.java | 33 ++++++++++++------- 4 files changed, 55 insertions(+), 24 deletions(-) diff --git a/src/com/owncloud/android/lib/common/OwnCloudAccount.java b/src/com/owncloud/android/lib/common/OwnCloudAccount.java index 1b339af8..302678e4 100644 --- a/src/com/owncloud/android/lib/common/OwnCloudAccount.java +++ b/src/com/owncloud/android/lib/common/OwnCloudAccount.java @@ -54,6 +54,11 @@ public class OwnCloudAccount { if (savedAccount == null) { throw new IllegalArgumentException("Parameter 'savedAccount' cannot be null"); } + + if (context == null) { + throw new IllegalArgumentException("Parameter 'context' cannot be null"); + } + mSavedAccount = savedAccount; mSavedAccountName = savedAccount.name; mBaseUri = Uri.parse(AccountUtils.getBaseUrlForAccount(context, mSavedAccount)); @@ -73,8 +78,14 @@ public class OwnCloudAccount { throws AccountNotFoundException, AuthenticatorException, IOException, OperationCanceledException { - mCredentials = AccountUtils.getCredentialsForAccount(context, mSavedAccount); - } + if (context == null) { + throw new IllegalArgumentException("Parameter 'context' cannot be null"); + } + + if (mSavedAccount != null) { + mCredentials = AccountUtils.getCredentialsForAccount(context, mSavedAccount); + } + } /* public OwnCloudAccount(Account savedAccount, Context context) diff --git a/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java b/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java index 99c05e68..4580331b 100644 --- a/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java +++ b/src/com/owncloud/android/lib/common/network/AdvancedSslSocketFactory.java @@ -92,6 +92,7 @@ public class AdvancedSslSocketFactory implements SecureProtocolSocketFactory { /** * @see ProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int) */ + @Override public Socket createSocket(String host, int port, InetAddress clientHost, int clientPort) throws IOException, UnknownHostException { @@ -157,6 +158,7 @@ public class AdvancedSslSocketFactory implements SecureProtocolSocketFactory { * @throws UnknownHostException if the IP address of the host cannot be * determined */ + @Override public Socket createSocket(final String host, final int port, final InetAddress localAddress, final int localPort, final HttpConnectionParams params) throws IOException, @@ -187,6 +189,7 @@ public class AdvancedSslSocketFactory implements SecureProtocolSocketFactory { /** * @see ProtocolSocketFactory#createSocket(java.lang.String,int) */ + @Override public Socket createSocket(String host, int port) throws IOException, UnknownHostException { Log_OC.d(TAG, "Creating SSL Socket with remote " + host + ":" + port); diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java index 3254c589..05a72003 100644 --- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java +++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SimpleFactoryManagerTest.java @@ -94,23 +94,31 @@ public class SimpleFactoryManagerTest extends AndroidTestCase { } public void testGetClientFor() { - OwnCloudClient client = mSFMgr.getClientFor(mValidAccount, getContext()); + try { + OwnCloudClient client = mSFMgr.getClientFor(mValidAccount, getContext()); - assertNotSame("Got same client instances for same account", - client, mSFMgr.getClientFor(mValidAccount, getContext())); + assertNotSame("Got same client instances for same account", + client, mSFMgr.getClientFor(mValidAccount, getContext())); - assertNotSame("Got same client instances for different accounts", - client, mSFMgr.getClientFor(mAnonymousAccount, getContext())); + assertNotSame("Got same client instances for different accounts", + client, mSFMgr.getClientFor(mAnonymousAccount, getContext())); + } catch (Exception e) { + throw new AssertionFailedError("Exception getting client for account: " + e.getMessage()); + } // TODO harder tests } public void testRemoveClientFor() { - OwnCloudClient client = mSFMgr.getClientFor(mValidAccount, getContext()); - mSFMgr.removeClientFor(mValidAccount); - assertNotSame("Got same client instance after removing it from manager", - client, mSFMgr.getClientFor(mValidAccount, getContext())); - + try { + OwnCloudClient client = mSFMgr.getClientFor(mValidAccount, getContext()); + mSFMgr.removeClientFor(mValidAccount); + assertNotSame("Got same client instance after removing it from manager", + client, mSFMgr.getClientFor(mValidAccount, getContext())); + + } catch (Exception e) { + throw new AssertionFailedError("Exception getting client for account: " + e.getMessage()); + } // TODO harder tests } diff --git a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java index 8e0799ae..2a084ae6 100644 --- a/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java +++ b/test_client/tests/src/com/owncloud/android/lib/test_project/test/SingleSessionManagerTest.java @@ -93,22 +93,31 @@ public class SingleSessionManagerTest extends AndroidTestCase { } public void testGetClientFor() { - OwnCloudClient client1 = mSSMgr.getClientFor(mValidAccount, getContext()); - OwnCloudClient client2 = mSSMgr.getClientFor(mAnonymousAccount, getContext()); - - assertNotSame("Got same client instances for different accounts", - client1, client2); - assertSame("Got different client instances for same account", - client1, mSSMgr.getClientFor(mValidAccount, getContext())); - + try { + OwnCloudClient client1 = mSSMgr.getClientFor(mValidAccount, getContext()); + OwnCloudClient client2 = mSSMgr.getClientFor(mAnonymousAccount, getContext()); + + assertNotSame("Got same client instances for different accounts", + client1, client2); + assertSame("Got different client instances for same account", + client1, mSSMgr.getClientFor(mValidAccount, getContext())); + + } catch (Exception e) { + throw new AssertionFailedError("Exception getting client for account: " + e.getMessage()); + } + // TODO harder tests } public void testRemoveClientFor() { - OwnCloudClient client1 = mSSMgr.getClientFor(mValidAccount, getContext()); - mSSMgr.removeClientFor(mValidAccount); - assertNotSame("Got same client instance after removing it from manager", - client1, mSSMgr.getClientFor(mValidAccount, getContext())); + try { + OwnCloudClient client1 = mSSMgr.getClientFor(mValidAccount, getContext()); + mSSMgr.removeClientFor(mValidAccount); + assertNotSame("Got same client instance after removing it from manager", + client1, mSSMgr.getClientFor(mValidAccount, getContext())); + } catch (Exception e) { + throw new AssertionFailedError("Exception getting client for account: " + e.getMessage()); + } // TODO harder tests }