Fix tests

he9lin · Apr 15, 2012 · 8737e38 · 8737e38
1 parent bf273a3
commit 8737e38
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/src/jieqoo/android/KASS/integration/test/UserBrowsesOffersTests.java b/src/jieqoo/android/KASS/integration/test/UserBrowsesOffersTests.java
@@ -25,9 +25,8 @@ public final void testBrowsesOffers() throws JSONException {
 		signoutUser();
 		createUser();
 		JSONObject offer = createOffer(listing.getString("id"));
-		solo.clickOnScreen(Fixtures.ACTIVITY_X, Fixtures.MENU_Y);
-		// Click on sellings
-		solo.clickOnScreen(300, 50);
+		clickOnMyActivityMainTab();
+		solo.clickOnText("我要卖");
 		assertTrue(solo.searchText(listing.getString("title")));
 		assertTrue(solo.searchText(offer.getString("price")));
 		assertTrue(solo.searchText("等待确认"));

diff --git a/src/jieqoo/android/KASS/integration/test/UserBrowsesWantsTests.java b/src/jieqoo/android/KASS/integration/test/UserBrowsesWantsTests.java
@@ -20,8 +20,8 @@ public UserBrowsesWantsTests() {
 	}
 
 	private void refreshMyActivity() {
-		solo.clickOnScreen(Fixtures.BROWSE_X, Fixtures.MENU_Y);
-		solo.clickOnView(solo.getView(R.id.main_rbtn_MyActivity));
+		clickOnBrowseMainTab();
+		clickOnMyActivityMainTab();
 	}
 
 	public final void testBrowsesListings() throws JSONException {

diff --git a/src/jieqoo/android/KASS/integration/test/UserMakesOfferTests.java b/src/jieqoo/android/KASS/integration/test/UserMakesOfferTests.java
@@ -46,6 +46,7 @@ public final void testUserMakesOfferWithoutLogin() throws JSONException {
 		solo.enterText(1, userJSON.getString("password"));
 
 		clickOnSigninButton();
+		solo.waitForActivity("ListingActivity");
 		solo.assertCurrentActivity("ListingActivity", ListingActivity.class);
 	}
 

diff --git a/src/jieqoo/android/KASS/integration/test/UserSendsMessageOnOfferTests.java b/src/jieqoo/android/KASS/integration/test/UserSendsMessageOnOfferTests.java
@@ -32,8 +32,7 @@ public final void testUserModifyPrice() throws JSONException {
 
 		clickOnMyActivityMainTab();
 
-		// Click on sellings
-		solo.clickOnScreen(300, 50);
+		solo.clickOnText("我要卖");
 		solo.clickOnText(listing.getString("title"));
 		assertTrue(solo.searchText("37.37"));
 		solo.assertCurrentActivity("Should be on offer page", ProvideActivity.class);
@@ -58,10 +57,9 @@ public final void testUserSendsMessage() throws JSONException {
 		createUser();
 		createOffer(listing.getString("id"));
 
-		solo.clickOnScreen(Fixtures.ACTIVITY_X, Fixtures.MENU_Y); // my activity
+		clickOnMyActivityMainTab();
 
-		// Click on sellings
-		solo.clickOnScreen(300, 50);
+		solo.clickOnText("我要卖");
 		solo.clickOnText(listing.getString("title"));
 		assertTrue(solo.searchText("37.37"));
 		solo.assertCurrentActivity("Should be on offer page", ProvideActivity.class);

diff --git a/src/jieqoo/android/KASS/models/test/AccountTests.java b/src/jieqoo/android/KASS/models/test/AccountTests.java
@@ -3,14 +3,16 @@
  */
 package jieqoo.android.KASS.models.test;
 
-import org.json.JSONException;
-import org.json.JSONObject;
-
+import jieqoo.android.KASS.Main;
 import jieqoo.android.KASS.models.Account;
+import jieqoo.android.KASS.models.IntentMeta;
 import jieqoo.android.KASS.models.RESTListener;
 import jieqoo.android.KASS.test.Factory;
 import junit.framework.TestCase;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 /**
  * @author linhe
  * 
@@ -114,4 +116,13 @@ public void onError(Object response) {
 		assertFalse(Factory.acquireAuth());
 		assertTrue(called);
 	}
+
+	public final void testRegisterAndConsumeAfterAuthenticationIntention() {
+		IntentMeta im = new IntentMeta(Main.class);
+		account.registerAfterAuthenticationIntention(im);
+		IntentMeta im2 = account.consumeAfterAuthenticationIntention();
+		assertNotNull(im2);
+		assertEquals(Main.class, im2.getActivityClass());
+		assertNull(account.consumeAfterAuthenticationIntention());
+	}
 }