@W-20798759: [MSDK] Add ability to programmatically update servers list (Code Coverage 100%)

Author: JohnsonEricAtSalesforce

libs/SalesforceSDK/src/com/salesforce/androidsdk/config/LoginServerManager.java

@@ -351,17 +351,16 @@ public void reorderCustomLoginServer(
 
 		// Determine the last non-custom login server index.
 		final List<LoginServer> servers = getLoginServers();
-		int lastNonCustomIndex = -1;
+		int firstCustomLoginServerIndex = -1;
 		for (int i = servers.size() - 1; i >= 0; i--) {
-			if (!servers.get(i).isCustom) {
-				lastNonCustomIndex = i;
-				break;
+			if (servers.get(i).isCustom) {
+				firstCustomLoginServerIndex = i;
 			}
 		}
 
 		// Adjust the re-ordered custom login server index to be within bounds.
-		if (updatedIndex <= lastNonCustomIndex) {
-			updatedIndex = lastNonCustomIndex + 1;
+		if (updatedIndex <= firstCustomLoginServerIndex) {
+			updatedIndex = firstCustomLoginServerIndex;
 		} else if (updatedIndex >= servers.size()) {
 			updatedIndex = servers.size() - 1;
 		}

libs/test/SalesforceSDKTest/src/com/salesforce/androidsdk/auth/LoginServerManagerTest.java

@@ -387,6 +387,7 @@ public void testReplaceAndReOrderCustomLoginServer() {
 		Assert.assertFalse(loginServerManager.getLoginServers().contains(originalCustomLoginServer));
 		Assert.assertFalse(loginServerManager.getLoginServers().contains(otherCustomLoginServer));
 
+
 		// Add the original and other custom login server.
 		loginServerManager.addCustomLoginServer(originalName, originalUrl);
 		loginServerManager.addCustomLoginServer(otherName, otherUrl);
@@ -395,25 +396,30 @@ public void testReplaceAndReOrderCustomLoginServer() {
 		Assert.assertEquals(originalCustomLoginServer, loginServerManager.getLoginServers().get(loginServerManager.getLoginServers().size() - 2));
 		Assert.assertEquals(otherCustomLoginServer, loginServerManager.getLoginServers().get(loginServerManager.getLoginServers().size() - 1));
 
+
 		// Prepare for negative tests.
 		final LoginServer production = new LoginServer("Production", "https://login.salesforce.com", false);
-		final LoginServer productionMismatch = new LoginServer("Production", "https://login.salesforce.com", true);
+		final LoginServer productionMismatch = new LoginServer("Production?", "https://login.salesforce.com", true);
 		final LoginServer productionReplacement = new LoginServer("Production Replaced", "https://login.salesforce.com", false);
+		final LoginServer productionReplacementMismatch = new LoginServer("Production Replaced?", "https://login.salesforce.com", true);
 
 		// Attempt the prohibited replacement of a non-custom login server where the original matches.
 		loginServerManager.replaceCustomLoginServer(production, productionReplacement);
 		Assert.assertTrue(loginServerManager.getLoginServers().contains(production));
 		Assert.assertFalse(loginServerManager.getLoginServers().contains(productionReplacement));
 
+
 		// Attempt the prohibited replacement of a non-custom login server where the original doesn't exit.
-		loginServerManager.replaceCustomLoginServer(productionMismatch, productionReplacement);
+		loginServerManager.replaceCustomLoginServer(productionMismatch, productionReplacementMismatch);
 		Assert.assertTrue(loginServerManager.getLoginServers().contains(production));
 		Assert.assertFalse(loginServerManager.getLoginServers().contains(productionReplacement));
 
+
 		// Attempt the prohibited reordering of a non-custom login server.
 		loginServerManager.reorderCustomLoginServer(0, 1);
 		Assert.assertEquals(loginServerManager.getLoginServers().get(0), production);
 
+
 		// Replace the original custom login server with a non-custom server.
 		loginServerManager.replaceCustomLoginServer(originalCustomLoginServer, nonCustomLoginServer);
 
@@ -422,6 +428,7 @@ public void testReplaceAndReOrderCustomLoginServer() {
 		Assert.assertEquals(originalCustomLoginServer, loginServerManager.getLoginServers().get(loginServerManager.getLoginServers().size() - 2));
 		Assert.assertEquals(otherCustomLoginServer, loginServerManager.getLoginServers().get(loginServerManager.getLoginServers().size() - 1));
 
+
 		// Replace the original custom login server.
 		loginServerManager.replaceCustomLoginServer(originalCustomLoginServer, updatedCustomLoginServer);
 
@@ -431,6 +438,33 @@ public void testReplaceAndReOrderCustomLoginServer() {
 		// Verify the updated and other custom login servers are present.
 		Assert.assertEquals(updatedCustomLoginServer, loginServerManager.getLoginServers().get(loginServerManager.getLoginServers().size() - 2));
 		Assert.assertEquals(otherCustomLoginServer, loginServerManager.getLoginServers().get(loginServerManager.getLoginServers().size() - 1));
+
+		// Attempt to move the updated custom login server above the non-custom login servers.
+		loginServerManager.reorderCustomLoginServer(loginServerManager.getLoginServers().indexOf(updatedCustomLoginServer), 0);
+
+		// Verify the updated custom login server is actually immediately following the last non-custom login server.
+		final List<LoginServer> loginServers = loginServerManager.getLoginServers();
+		int lastNonCustomIndex = -1;
+		for (int i = 0; i < loginServers.size(); i++) {
+			final LoginServer loginServer = loginServers.get(i);
+			if (!loginServer.isCustom) {
+				lastNonCustomIndex = i;
+			}
+		}
+		Assert.assertEquals(loginServers.get(lastNonCustomIndex + 1), updatedCustomLoginServer);
+
+
+ 		// Attempt to move the updated custom login server one greater than the upper bounds of the login servers list.
+		loginServerManager.reorderCustomLoginServer(loginServerManager.getLoginServers().indexOf(updatedCustomLoginServer), loginServerManager.getLoginServers().size());
+
+		// Attempt to move the updated custom login server more than one greater than the upper bounds of the login servers list.
+		loginServerManager.reorderCustomLoginServer(loginServerManager.getLoginServers().indexOf(updatedCustomLoginServer), loginServerManager.getLoginServers().size() + 1);
+
+		// Attempt to move the updated custom login server more than one less than the upper bounds of the login servers list.
+		loginServerManager.reorderCustomLoginServer(loginServerManager.getLoginServers().indexOf(updatedCustomLoginServer), loginServerManager.getLoginServers().size() - 1);
+
+		// Verify the updated custom login server is now the last login server in the list.
+		Assert.assertEquals(loginServerManager.getLoginServers().getLast(), updatedCustomLoginServer);
 	}
 
 	private void assertProduction(LoginServer server) {