bring the project up to the latest release version of robolectric

mosabua · Aug 12, 2011 · f14d3ac · f14d3ac
1 parent f103a5b
commit f14d3ac
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 8 deletions.
diff --git a/lib/test/robolectric-1.0-RC4-jar-with-dependencies.jar b/lib/test/robolectric-1.0-RC4-jar-with-dependencies.jar
diff --git a/pom.xml b/pom.xml
@@ -30,7 +30,7 @@
         <dependency>
             <groupId>com.pivotallabs</groupId>
             <artifactId>robolectric</artifactId>
-            <version>0.9.8</version>
+            <version>1.0-RC4</version>
             <scope>test</scope>
         </dependency>
 

diff --git a/src/test/java/com/pivotallabs/api/ApiGatewayTest.java b/src/test/java/com/pivotallabs/api/ApiGatewayTest.java
@@ -2,7 +2,7 @@
 
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.RobolectricTestRunner;
-import com.xtremelabs.robolectric.util.HttpRequestInfo;
+import com.xtremelabs.robolectric.tester.org.apache.http.HttpRequestInfo;
 import org.apache.http.HttpRequest;
 import org.apache.http.auth.AuthScope;
 import org.apache.http.client.CredentialsProvider;

diff --git a/src/test/java/com/pivotallabs/api/HttpTest.java b/src/test/java/com/pivotallabs/api/HttpTest.java
@@ -3,7 +3,7 @@
 import com.google.inject.internal.Maps;
 import com.xtremelabs.robolectric.Robolectric;
 import com.xtremelabs.robolectric.RobolectricTestRunner;
-import com.xtremelabs.robolectric.util.HttpRequestInfo;
+import com.xtremelabs.robolectric.tester.org.apache.http.HttpRequestInfo;
 import com.xtremelabs.robolectric.util.Strings;
 import org.apache.http.HttpRequest;
 import org.apache.http.auth.AuthScope;

diff --git a/src/test/java/com/pivotallabs/tracker/RecentActivityActivityTest.java b/src/test/java/com/pivotallabs/tracker/RecentActivityActivityTest.java
@@ -9,8 +9,8 @@
 import com.pivotallabs.api.ApiRequest;
 import com.pivotallabs.api.TestApiGateway;
 import com.xtremelabs.robolectric.RobolectricTestRunner;
-import com.xtremelabs.robolectric.view.TestMenu;
-import com.xtremelabs.robolectric.view.TestMenuItem;
+import com.xtremelabs.robolectric.tester.android.view.TestMenu;
+import com.xtremelabs.robolectric.tester.android.view.TestMenuItem;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

diff --git a/src/test/java/com/pivotallabs/tracker/SignInDialogTest.java b/src/test/java/com/pivotallabs/tracker/SignInDialogTest.java
@@ -15,6 +15,7 @@
 import org.junit.runner.RunWith;
 
 import static com.xtremelabs.robolectric.Robolectric.clickOn;
+import static com.xtremelabs.robolectric.Robolectric.shadowOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
@@ -120,10 +121,10 @@ public void shouldShowAlertDialogWhenUnSuccessfullySignedIn() throws Exception {
 
         apiGateway.simulateResponse(401, "Access Denied");
 
-        ShadowAlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
+        AlertDialog alertDialog = ShadowAlertDialog.getLatestAlertDialog();
         assertThat(alertDialog.isShowing(), equalTo(true));
-        assertThat(alertDialog.getTitle(), equalTo("Error"));
-        assertThat(alertDialog.getMessage(), equalTo("Username/Password combination is not recognized."));
+        assertThat((String)shadowOf(alertDialog).getTitle(), equalTo("Error"));
+        assertThat(shadowOf(alertDialog).getMessage(), equalTo("Username/Password combination is not recognized."));
         assertNotNull(alertDialog.getButton(AlertDialog.BUTTON_POSITIVE));
     }