diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivity.java
index 052561d90..92bac1af4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivity.java
@@ -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;
+        }
+      }
+  }
 }
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivityTest.java
new file mode 100644
index 000000000..09b095a5f
--- /dev/null
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/fusiontables/SendFusionTablesActivityTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.google.android.apps.mytracks.io.fusiontables;
+
+import com.google.android.apps.mytracks.io.docs.SendDocsActivity;
+import com.google.android.apps.mytracks.io.sendtogoogle.SendRequest;
+import com.google.android.apps.mytracks.io.sendtogoogle.UploadResultActivity;
+
+import android.test.AndroidTestCase;
+
+/**
+ * Tests the {@link SendFusionTablesActivity}.
+ * 
+ * @author Youtao Liu
+ */
+public class SendFusionTablesActivityTest extends AndroidTestCase {
+
+  private SendFusionTablesActivity sendFusionTablesActivity;
+  private SendRequest sendRequest;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    sendRequest = new SendRequest(1L, true, false, true);
+    sendFusionTablesActivity = new SendFusionTablesActivity();
+  }
+
+  /**
+   * Tests the method
+   * {@link SendFusionTablesActivity#getNextClass(SendRequest, boolean)}. Sets
+   * the flags of "sendDocs" and "cancel" to false and false.
+   */
+  public void testGetNextClass_notCancelNotSendDocs() {
+    sendRequest.setSendDocs(false);
+    Class<?> next = sendFusionTablesActivity.getNextClass(sendRequest, false);
+    assertEquals(UploadResultActivity.class, next);
+  }
+
+  /**
+   * Tests the method
+   * {@link SendFusionTablesActivity#getNextClass(SendRequest, boolean)}. Sets
+   * the flags of "sendDocs" and "cancel" to true and false.
+   */
+  public void testGetNextClass_notCancelSendDocs() {
+    sendRequest.setSendDocs(true);
+    Class<?> next = sendFusionTablesActivity.getNextClass(sendRequest, false);
+    assertEquals(SendDocsActivity.class, next);
+  }
+
+  /**
+   * Tests the method
+   * {@link SendFusionTablesActivity#getNextClass(SendRequest,boolean)}. Sets
+   * the flags of "sendDocs" and "cancel" to true and true.
+   */
+  public void testGetNextClass_cancelSendDocs() {
+    sendRequest.setSendDocs(true);
+    Class<?> next = sendFusionTablesActivity.getNextClass(sendRequest, true);
+    assertEquals(UploadResultActivity.class, next);
+  }
+
+  /**
+   * Tests the method
+   * {@link SendFusionTablesActivity#getNextClass(SendRequest,boolean)}. Sets
+   * the flags of "sendDocs" and "cancel" to false and true.
+   */
+  public void testGetNextClass_cancelNotSendDocs() {
+    sendRequest.setSendDocs(false);
+    Class<?> next = sendFusionTablesActivity.getNextClass(sendRequest, true);
+    assertEquals(UploadResultActivity.class, next);
+  }
+
+}