moparisthebest/Yaaic
1
0
Fork 0
mirror of https://github.com/moparisthebest/Yaaic synced 2024-11-22 08:52:18 -05:00
Code Issues Releases Wiki Activity

ServerListScenarios.testAddingAndRemovingServer(): Don't assert on number of items in list (because of "add server" item) but on existing or non-existing server name in list.

Browse Source
This commit is contained in:
Sebastian Kaspari 2012-11-06 20:59:45 +01:00
parent be49f407bb
commit e2eb4a39f0
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/src/org/yaaic/test/scenario/ServerListScenarios.java
View File

@ -20,12 +20,10 @@ along with Yaaic. If not, see <http://www.gnu.org/licenses/>.
*/ */
package org.yaaic.test.scenario; package org.yaaic.test.scenario;
import org.yaaic.R; import org.yaaic.R;
import org.yaaic.activity.ServersActivity;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
import android.util.Log;
import android.view.View; import android.view.View;
import android.widget.EditText; import android.widget.EditText;
@ -50,10 +48,7 @@ public class ServerListScenarios extends ActivityInstrumentationTestCase2
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public ServerListScenarios() throws ClassNotFoundException public ServerListScenarios() throws ClassNotFoundException
{ {
super( super("org.yaaic", ServersActivity.class);
"org.yaaic",
Class.forName("org.yaaic.activity.ServersActivity")
);
} }
/** /**
@ -96,7 +91,8 @@ public class ServerListScenarios extends ActivityInstrumentationTestCase2
// Delete Testserver if already exists // Delete Testserver if already exists
helper.deleteTestServer(); helper.deleteTestServer();
int numberOfServersBefore = solo.getCurrentListViews().get(0).getCount(); // Assert server does not exist
assertFalse(solo.searchText("RobotiumTest"));
// Add server // Add server
View view = solo.getView(R.id.add); View view = solo.getView(R.id.add);
@ -122,8 +118,6 @@ public class ServerListScenarios extends ActivityInstrumentationTestCase2
solo.assertCurrentActivity("Switched back to ServersActivity", "ServersActivity"); solo.assertCurrentActivity("Switched back to ServersActivity", "ServersActivity");
// Assert new server exists // Assert new server exists
int numberOfServersAfter = solo.getCurrentListViews().get(0).getCount();
assertEquals(numberOfServersBefore + 1, numberOfServersAfter);
assertTrue(solo.searchText("RobotiumTest")); assertTrue(solo.searchText("RobotiumTest"));
// Remove new server again // Remove new server again
@ -133,10 +127,5 @@ public class ServerListScenarios extends ActivityInstrumentationTestCase2
solo.waitForActivity("ServersActivity", 1000); solo.waitForActivity("ServersActivity", 1000);
solo.assertCurrentActivity("Switched back to ServersActivity", "ServersActivity"); solo.assertCurrentActivity("Switched back to ServersActivity", "ServersActivity");
// Assert server is gone again
numberOfServersAfter = solo.getCurrentListViews().get(0).getCount();
assertEquals(numberOfServersBefore, numberOfServersAfter);
assertFalse(solo.searchText("RobotiumTest"));
} }
} }