From 60f34d89ba9ea971b336312d20aeb66ab5e483f1 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Thu, 10 Nov 2011 18:40:26 -0800
Subject: [PATCH] Fix unit test for ResultDialogFactoryTest - change to the
 MyTracks activity because the SendActivity doesn't have a   window to display
 the dialog.

---
 .../sendtogoogle/ResultDialogFactoryTest.java | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactoryTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactoryTest.java
index 888f4abaa..0d76e2a1f 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactoryTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactoryTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.apps.mytracks.io.sendtogoogle;
 
+import com.google.android.apps.mytracks.MyTracks;
 import com.google.android.maps.mytracks.R;
 
 import android.app.AlertDialog;
@@ -32,9 +33,9 @@ import java.util.List;
  *
  * @author Matthew Simmons
  */
-public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<SendActivity> {
+public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<MyTracks> {
   public ResultDialogFactoryTest() {
-    super(SendActivity.class);
+    super(MyTracks.class);
   }
 
   private List<SendResult> makeResults(SendResult... results) {
@@ -49,12 +50,20 @@ public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<Se
     @Override
     public void onClick(DialogInterface dialog, int which) {}
   };
-
+  
+  private MyTracks myTracks;
+  
+  protected void setUp() throws Exception {
+    super.setUp();    
+    myTracks = getActivity();
+  };
+  
   public void testSuccess_noShare() {
     List<SendResult> results = makeResults(new SendResult(SendType.MYMAPS, true),
         new SendResult(SendType.DOCS, true));
 
-    AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results, clickListener, null, null);
+    AlertDialog dialog = ResultDialogFactory.makeDialog(
+        myTracks, results, clickListener, null, null);
     dialog.show();
 
     ListView listView = (ListView) dialog.findViewById(R.id.send_to_google_result_list);
@@ -82,11 +91,11 @@ public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<Se
   }
 
   public void testSuccess_share() {
-    List<SendResult> results = makeResults(new SendResult(SendType.MYMAPS, true),
-        new SendResult(SendType.DOCS, true));
+    List<SendResult> results = makeResults(
+        new SendResult(SendType.MYMAPS, true), new SendResult(SendType.DOCS, true));
 
-    AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results,
-        clickListener, clickListener, null);
+    AlertDialog dialog = ResultDialogFactory.makeDialog(
+        myTracks, results, clickListener, clickListener, null);
     dialog.show();
 
     assertEquals(View.VISIBLE, dialog.getButton(AlertDialog.BUTTON_POSITIVE).getVisibility());
@@ -97,7 +106,8 @@ public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<Se
     List<SendResult> results = makeResults(new SendResult(SendType.MYMAPS, true),
         new SendResult(SendType.DOCS, false));
 
-    AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results, clickListener, null, null);
+    AlertDialog dialog = ResultDialogFactory.makeDialog(
+        myTracks, results, clickListener, null, null);
     dialog.show();
 
     assertEquals(View.GONE,
@@ -110,8 +120,8 @@ public class ResultDialogFactoryTest extends ActivityInstrumentationTestCase2<Se
     List<SendResult> results = makeResults(new SendResult(SendType.MYMAPS, true),
         new SendResult(SendType.DOCS, false));
 
-    AlertDialog dialog = ResultDialogFactory.makeDialog(getActivity(), results,
-        clickListener, clickListener, null);
+    AlertDialog dialog = ResultDialogFactory.makeDialog(
+        myTracks, results, clickListener, clickListener, null);
     dialog.show();
 
     assertEquals(View.VISIBLE, dialog.getButton(AlertDialog.BUTTON_POSITIVE).getVisibility());