karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Change some code of SendMapsActivityTest and SendMapsActivity.

Browse Source
This commit is contained in:
youtaol
2012-02-24 16:42:06 +08:00
parent 7cfe8c3dd8
commit f1bfc2af0a
2 changed files with 12 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracks/src/com/google/android/apps/mytracks/io/maps/SendMapsActivity.java
+5 -10
View File
@@ -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;
MyTracksTest/src/com/google/android/apps/mytracks/io/maps/SendMapsActivityTest.java
+7 -26
View File
@@ -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);
}
}
}