Add test case for SendFusionTablesActivity and change some code of SendFusionTablesActivity

2012-03-01 12:13:17 +08:00
parent bdf04d64d8
commit 7145ba25b4
2 changed files with 101 additions and 10 deletions
@@ -21,6 +21,7 @@ import com.google.android.apps.mytracks.io.sendtogoogle.AbstractSendAsyncTask;
 import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
 import com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity;
 import com.google.android.maps.mytracks.R;
+import com.google.common.annotations.VisibleForTesting;

 import android.content.Intent;

@@ -45,18 +46,23 @@ public class SendFusionTablesActivity extends AbstractSendActivity {
  protected void startNextActivity(boolean success, boolean isCancel) {
    sendRequest.setFusionTablesSuccess(success);

-    Class<?> next;
-    if (isCancel) {
-      next = UploadResultActivity.class;
-    } else {
-      if (sendRequest.isSendDocs()) {
-        next = SendDocsActivity.class;
-      } else {
-        next = UploadResultActivity.class;
-      }
-    }
+    Class<?> next = getNextClass(sendRequest, isCancel);
+    
    Intent intent = new Intent(this, next).putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
    startActivity(intent);
    finish();
  }
+  
+  @VisibleForTesting
+  Class<?> getNextClass(SendRequest request, boolean isCancel) {
+  if (isCancel) {
+        return UploadResultActivity.class;
+      } else {
+        if (request.isSendDocs()) {
+          return SendDocsActivity.class;
+        } else {
+          return UploadResultActivity.class;
+        }
+      }
+  }
 }