Update test project to Robotium 3.0.

This commit is contained in:
Sebastian Kaspari 2011-11-27 00:00:25 +01:00
parent 29e102b5d0
commit a4bc0ada80
6 changed files with 16 additions and 22 deletions

View File

@ -2,9 +2,9 @@
<classpath>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry combineaccessrules="false" kind="src" path="/Yaaic"/>
<classpathentry kind="lib" path="libs/robotium-solo-2.0.2.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
<classpathentry kind="lib" path="libs/robotium-solo-3.0.jar"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>

Binary file not shown.

Binary file not shown.

View File

@ -58,8 +58,10 @@ public class ChannelScenarios extends ActivityInstrumentationTestCase2
@Override
protected void setUp()
{
solo = new Solo(getInstrumentation(), getActivity());
helper = new ScenarioHelper(solo);
if (solo == null) {
solo = new Solo(getInstrumentation(), getActivity());
helper = new ScenarioHelper(solo);
}
helper.createTestServer();
helper.connectToServer();
@ -74,11 +76,7 @@ public class ChannelScenarios extends ActivityInstrumentationTestCase2
helper.disconnectFromServer();
helper.deleteTestServer();
try {
solo.finalize();
} catch (Throwable t) {
Log.d("Yaaic/ChannelScenarios", t.getMessage());
}
solo.finishOpenedActivities();
}
/**

View File

@ -58,8 +58,10 @@ public class ConnectionScenarios extends ActivityInstrumentationTestCase2
@Override
protected void setUp()
{
solo = new Solo(getInstrumentation(), getActivity());
helper = new ScenarioHelper(solo);
if (solo == null) {
solo = new Solo(getInstrumentation(), getActivity());
helper = new ScenarioHelper(solo);
}
helper.createTestServer();
helper.connectToServer();
@ -74,11 +76,7 @@ public class ConnectionScenarios extends ActivityInstrumentationTestCase2
helper.disconnectFromServer();
helper.deleteTestServer();
try {
solo.finalize();
} catch (Throwable t) {
Log.d("Yaaic/ChannelScenarios", t.getMessage());
}
solo.finishOpenedActivities();
}
/**

View File

@ -60,8 +60,10 @@ public class ServerListScenarios extends ActivityInstrumentationTestCase2
@Override
protected void setUp()
{
solo = new Solo(getInstrumentation(), getActivity());
helper = new ScenarioHelper(solo);
if (solo == null) {
solo = new Solo(getInstrumentation(), getActivity());
helper = new ScenarioHelper(solo);
}
}
/**
@ -70,11 +72,7 @@ public class ServerListScenarios extends ActivityInstrumentationTestCase2
@Override
protected void tearDown()
{
try {
solo.finalize();
} catch (Throwable t) {
Log.d("Yaaic/ChannelScenarios", t.getMessage());
}
solo.finishOpenedActivities();
}
/**