Change code style of UploadResultActivityTest.

This commit is contained in:
youtaol
2012-06-12 10:33:18 +08:00
parent 56475a943f
commit d9f951230f
@@ -30,9 +30,8 @@ import android.widget.TextView;
* *
* @author Youtao Liu * @author Youtao Liu
*/ */
public class UploadResultActivityTest public class UploadResultActivityTest extends
extends ActivityInstrumentationTestCase2<UploadResultActivity> { ActivityInstrumentationTestCase2<UploadResultActivity> {
private UploadResultActivity uploadResultActivity; private UploadResultActivity uploadResultActivity;
private TextView errorFooter; private TextView errorFooter;
@@ -44,6 +43,9 @@ public class UploadResultActivityTest
private ImageView fusionTablesResultIcon; private ImageView fusionTablesResultIcon;
private ImageView docsResultIcon; private ImageView docsResultIcon;
private String successTitle;
private String errorTitle;
/** /**
* This method is necessary for ActivityInstrumentationTestCase2. * This method is necessary for ActivityInstrumentationTestCase2.
*/ */
@@ -64,9 +66,9 @@ public class UploadResultActivityTest
assertEquals(View.VISIBLE, fusionTablesResult.getVisibility()); assertEquals(View.VISIBLE, fusionTablesResult.getVisibility());
assertEquals(View.VISIBLE, docsResult.getVisibility()); assertEquals(View.VISIBLE, docsResult.getVisibility());
assertEquals(uploadResultActivity.getString(R.string.generic_success_title), mapsResultIcon.getContentDescription()); assertEquals(successTitle, mapsResultIcon.getContentDescription());
assertEquals(uploadResultActivity.getString(R.string.generic_success_title), fusionTablesResultIcon.getContentDescription()); assertEquals(successTitle, fusionTablesResultIcon.getContentDescription());
assertEquals(uploadResultActivity.getString(R.string.generic_success_title), docsResultIcon.getContentDescription()); assertEquals(successTitle, docsResultIcon.getContentDescription());
} }
/** /**
@@ -83,9 +85,9 @@ public class UploadResultActivityTest
assertEquals(View.VISIBLE, fusionTablesResult.getVisibility()); assertEquals(View.VISIBLE, fusionTablesResult.getVisibility());
assertEquals(View.VISIBLE, docsResult.getVisibility()); assertEquals(View.VISIBLE, docsResult.getVisibility());
assertEquals(uploadResultActivity.getString(R.string.generic_error_title), mapsResultIcon.getContentDescription()); assertEquals(errorTitle, mapsResultIcon.getContentDescription());
assertEquals(uploadResultActivity.getString(R.string.generic_error_title), fusionTablesResultIcon.getContentDescription()); assertEquals(errorTitle, fusionTablesResultIcon.getContentDescription());
assertEquals(uploadResultActivity.getString(R.string.generic_error_title), docsResultIcon.getContentDescription()); assertEquals(errorTitle, docsResultIcon.getContentDescription());
} }
/** /**
@@ -105,8 +107,8 @@ public class UploadResultActivityTest
assertEquals(View.GONE, fusionTablesResult.getVisibility()); assertEquals(View.GONE, fusionTablesResult.getVisibility());
assertEquals(View.VISIBLE, docsResult.getVisibility()); assertEquals(View.VISIBLE, docsResult.getVisibility());
assertEquals(uploadResultActivity.getString(R.string.generic_success_title), mapsResultIcon.getContentDescription()); assertEquals(successTitle, mapsResultIcon.getContentDescription());
assertEquals(uploadResultActivity.getString(R.string.generic_error_title), docsResultIcon.getContentDescription()); assertEquals(errorTitle, docsResultIcon.getContentDescription());
} }
/** /**
@@ -132,6 +134,8 @@ public class UploadResultActivityTest
intent.putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest); intent.putExtra(SendRequest.SEND_REQUEST_KEY, sendRequest);
setActivityIntent(intent); setActivityIntent(intent);
uploadResultActivity = this.getActivity(); uploadResultActivity = this.getActivity();
successTitle = uploadResultActivity.getString(R.string.generic_success_title);
errorTitle = uploadResultActivity.getString(R.string.generic_error_title);
} }
/** /**
@@ -144,8 +148,7 @@ public class UploadResultActivityTest
successFooter = (TextView) view.findViewById(R.id.upload_result_success_footer); successFooter = (TextView) view.findViewById(R.id.upload_result_success_footer);
mapsResult = (LinearLayout) view.findViewById(R.id.upload_result_maps_result); mapsResult = (LinearLayout) view.findViewById(R.id.upload_result_maps_result);
fusionTablesResult = (LinearLayout) view.findViewById( fusionTablesResult = (LinearLayout) view.findViewById(R.id.upload_result_fusion_tables_result);
R.id.upload_result_fusion_tables_result);
docsResult = (LinearLayout) view.findViewById(R.id.upload_result_docs_result); docsResult = (LinearLayout) view.findViewById(R.id.upload_result_docs_result);
mapsResultIcon = (ImageView) view.findViewById(R.id.upload_result_maps_result_icon); mapsResultIcon = (ImageView) view.findViewById(R.id.upload_result_maps_result_icon);