From f1bfc2af0a60043b6552305d4b2aac84993525e2 Mon Sep 17 00:00:00 2001
From: youtaol <youtaol@localhost>
Date: Fri, 24 Feb 2012 16:42:06 +0800
Subject: [PATCH] Change some code of SendMapsActivityTest and
 SendMapsActivity.

---
 .../mytracks/io/maps/SendMapsActivity.java    | 15 +++------
 .../io/maps/SendMapsActivityTest.java         | 33 ++++---------------
 2 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsActivity.java
index 64265ff85..c500c96f6 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsActivity.java
@@ -46,7 +46,8 @@ public class SendMapsActivity extends AbstractSendActivity {
 
   @Override
   protected void startNextActivity(boolean success, boolean isCancel) {
-    setSendResult(sendRequest, success);
+    sendRequest.setMapsSuccess(success);
+
     Class<?> next = getNextClass(sendRequest, isCancel);
     
     Intent intent = new Intent(this, next).putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
@@ -55,19 +56,13 @@ public class SendMapsActivity extends AbstractSendActivity {
   }
   
   @VisibleForTesting
-  void setSendResult(SendRequest sendRequest, boolean success) {
-    sendRequest.setMapsSuccess(success);
-  }
-  
-  @SuppressWarnings("hiding")
-  @VisibleForTesting
-  Class<?> getNextClass(SendRequest sendRequest, boolean isCancel) {
+  Class<?> getNextClass(SendRequest request, boolean isCancel) {
     if (isCancel) {
       return UploadResultActivity.class;
     } else {
-      if (sendRequest.isSendFusionTables()) {
+      if (request.isSendFusionTables()) {
         return SendFusionTablesActivity.class;
-      } else if (sendRequest.isSendDocs()) {
+      } else if (request.isSendDocs()) {
         return SendDocsActivity.class;
       } else {
         return UploadResultActivity.class;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsActivityTest.java
index 637641ea3..d2646609a 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsActivityTest.java
@@ -39,33 +39,14 @@ public class SendMapsActivityTest extends AndroidTestCase {
     sendMapsActivity = new SendMapsActivity();
   }
 
-  /**
-   * Tests the method
-   * {@link SendMapsActivity#setSendResult(SendRequest, boolean)} then input
-   * value is true.
-   */
-  public void testSetSendResult_true() {
-    sendMapsActivity.setSendResult(sendRequest, true);
-    assertEquals(true, sendRequest.isMapsSuccess());
-  }
-
-  /**
-   * Tests the method
-   * {@link SendMapsActivity#setSendResult(SendRequest, boolean)} then input
-   * value is false.
-   */
-  public void testSetSendResult_false() {
-    sendMapsActivity.setSendResult(sendRequest, false);
-    assertEquals(false, sendRequest.isMapsSuccess());
-  }
-
   /**
    * Tests the method
    * {@link SendMapsActivity#getNextClass(SendRequest, boolean)}. Sets the flags
-   * to send fusion tables and cancel to false and false.
+   * of "sendFusionTables","sendDocs" and "cancel" to true, true and false.
    */
   public void testGetNextClass_notCancelSendFusionTables() {
     sendRequest.setSendFusionTables(true);
+    sendRequest.setSendDocs(true);
     Class<?> next = sendMapsActivity.getNextClass(sendRequest, false);
     assertEquals(SendFusionTablesActivity.class, next);
   }
@@ -73,8 +54,8 @@ public class SendMapsActivityTest extends AndroidTestCase {
   /**
    * Tests the method
    * {@link SendMapsActivity#getNextClass(SendRequest, boolean)}. Sets the flags
-   * to send docs, fusion tables and cancel to false, true and false.
-   */
+   * of "sendFusionTables","sendDocs" and "cancel" to false, true and false.
+  */
   public void testGetNextClass_notCancelSendDocs() {
     sendRequest.setSendFusionTables(false);
     sendRequest.setSendDocs(true);
@@ -85,7 +66,7 @@ public class SendMapsActivityTest extends AndroidTestCase {
   /**
    * Tests the method
    * {@link SendMapsActivity#getNextClass(SendRequest, boolean)}. Sets the flags
-   * to send docs, fusion tables and cancel to false, false and false.
+   * of "sendFusionTables","sendDocs" and "cancel" to false, false and false.
    */
   public void testGetNextClass_notCancelNotSend() {
     sendRequest.setSendFusionTables(false);
@@ -97,7 +78,7 @@ public class SendMapsActivityTest extends AndroidTestCase {
   /**
    * Tests the method
    * {@link SendMapsActivity#getNextClass(SendRequest, boolean)}. Sets the flags
-   * to send docs, fusion tables and cancel to true, true and true.
+   * of "sendFusionTables","sendDocs" and "cancel" to true, true and true.
    */
   public void testGetNextClass_cancelSendDocs() {
     sendRequest.setSendFusionTables(true);
@@ -106,4 +87,4 @@ public class SendMapsActivityTest extends AndroidTestCase {
     assertEquals(UploadResultActivity.class, next);
   }
 
-}
+}
\ No newline at end of file