flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Ignore timeouts in setups() and teardowns() to work around response time of test server

Browse Source
This commit is contained in:
David A. Velasco 2014-11-12 14:28:21 +01:00
parent 0149ee813d
commit 1f27c0f318
11 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateFolderTest.java
View File

@ -130,7 +130,7 @@ public class CreateFolderTest extends ActivityInstrumentationTestCase2<TestActiv
RemoteOperationResult removeResult = null; RemoteOperationResult removeResult = null;
while (it.hasNext()) { while (it.hasNext()) {
removeResult = mActivity.removeFile(it.next()); removeResult = mActivity.removeFile(it.next());
if (!removeResult.isSuccess()) { if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, removeResult); Utils.logAndThrow(LOG_TAG, removeResult);
} }
} }

3
test_client/tests/src/com/owncloud/android/lib/test_project/test/CreateShareTest.java
View File

@ -27,6 +27,7 @@ package com.owncloud.android.lib.test_project.test;
import java.io.File; import java.io.File;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.lib.test_project.TestActivity; import com.owncloud.android.lib.test_project.TestActivity;
@ -80,7 +81,7 @@ public class CreateShareTest extends ActivityInstrumentationTestCase2<TestActivi
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
RemoteOperationResult removeResult = mActivity.removeFile(FILE_TO_SHARE); RemoteOperationResult removeResult = mActivity.removeFile(FILE_TO_SHARE);
if (!removeResult.isSuccess()) { if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, removeResult); Utils.logAndThrow(LOG_TAG, removeResult);
} }
super.tearDown(); super.tearDown();

3
test_client/tests/src/com/owncloud/android/lib/test_project/test/DeleteFileTest.java
View File

@ -27,6 +27,7 @@ package com.owncloud.android.lib.test_project.test;
import java.io.File; import java.io.File;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.test_project.TestActivity; import com.owncloud.android.lib.test_project.TestActivity;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
@ -66,7 +67,7 @@ public class DeleteFileTest extends ActivityInstrumentationTestCase2<TestActivit
Log.v(LOG_TAG, "Starting global set up"); Log.v(LOG_TAG, "Starting global set up");
RemoteOperationResult result = mActivity.createFolder(FOLDER_PATH, true); RemoteOperationResult result = mActivity.createFolder(FOLDER_PATH, true);
if (!result.isSuccess()) { if (!result.isSuccess() && result.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, result); Utils.logAndThrow(LOG_TAG, result);
} }

2
test_client/tests/src/com/owncloud/android/lib/test_project/test/DownloadFileTest.java
View File

@ -136,7 +136,7 @@ public class DownloadFileTest extends ActivityInstrumentationTestCase2<TestActiv
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
if (mDownloadedFilePath != null) { if (mDownloadedFilePath != null) {
RemoteOperationResult removeResult = mActivity.removeFile(mDownloadedFilePath); RemoteOperationResult removeResult = mActivity.removeFile(mDownloadedFilePath);
if (!removeResult.isSuccess()) { if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, removeResult); Utils.logAndThrow(LOG_TAG, removeResult);
} }
} }

5
test_client/tests/src/com/owncloud/android/lib/test_project/test/GetSharesTest.java
View File

@ -27,6 +27,7 @@ package com.owncloud.android.lib.test_project.test;
import java.io.File; import java.io.File;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.lib.test_project.TestActivity; import com.owncloud.android.lib.test_project.TestActivity;
@ -68,7 +69,7 @@ public class GetSharesTest extends ActivityInstrumentationTestCase2<TestActivity
} }
result = mActivity.createShare(SHARED_FILE, ShareType.PUBLIC_LINK, "", false, "", 1); result = mActivity.createShare(SHARED_FILE, ShareType.PUBLIC_LINK, "", false, "", 1);
if (!result.isSuccess()) { if (!result.isSuccess() && result.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, result); Utils.logAndThrow(LOG_TAG, result);
} }
@ -87,7 +88,7 @@ public class GetSharesTest extends ActivityInstrumentationTestCase2<TestActivity
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
RemoteOperationResult removeResult = mActivity.removeFile(SHARED_FILE); RemoteOperationResult removeResult = mActivity.removeFile(SHARED_FILE);
if (!removeResult.isSuccess()) { if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, removeResult); Utils.logAndThrow(LOG_TAG, removeResult);
} }
super.tearDown(); super.tearDown();

2
test_client/tests/src/com/owncloud/android/lib/test_project/test/MoveFileTest.java
View File

@ -245,7 +245,7 @@ public class MoveFileTest extends ActivityInstrumentationTestCase2<TestActivity>
RemoteOperationResult result = null; RemoteOperationResult result = null;
for (String folderPath : FOLDERS_IN_FIXTURE) { for (String folderPath : FOLDERS_IN_FIXTURE) {
result = TestActivity.createFolder(folderPath, true, mClient); result = TestActivity.createFolder(folderPath, true, mClient);
if (!result.isSuccess()) { if (!result.isSuccess() && result.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, result); Utils.logAndThrow(LOG_TAG, result);
} }
} }

3
test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFileTest.java
View File

@ -26,6 +26,7 @@ package com.owncloud.android.lib.test_project.test;
import java.io.File; import java.io.File;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.test_project.TestActivity; import com.owncloud.android.lib.test_project.TestActivity;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
@ -78,7 +79,7 @@ public class ReadFileTest extends ActivityInstrumentationTestCase2<TestActivity
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
RemoteOperationResult removeResult = mActivity.removeFile(FILE_PATH); RemoteOperationResult removeResult = mActivity.removeFile(FILE_PATH);
if (!removeResult.isSuccess()) { if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, removeResult); Utils.logAndThrow(LOG_TAG, removeResult);
} }

3
test_client/tests/src/com/owncloud/android/lib/test_project/test/ReadFolderTest.java
View File

@ -27,6 +27,7 @@ package com.owncloud.android.lib.test_project.test;
import java.io.File; import java.io.File;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.test_project.TestActivity; import com.owncloud.android.lib.test_project.TestActivity;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
@ -94,7 +95,7 @@ public class ReadFolderTest extends ActivityInstrumentationTestCase2<TestActivit
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
RemoteOperationResult removeResult = mActivity.removeFile(FOLDER_PATH); RemoteOperationResult removeResult = mActivity.removeFile(FOLDER_PATH);
if (!removeResult.isSuccess()) { if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, removeResult); Utils.logAndThrow(LOG_TAG, removeResult);
} }

3
test_client/tests/src/com/owncloud/android/lib/test_project/test/RemoveShareTest.java
View File

@ -29,6 +29,7 @@ import java.io.File;
import com.owncloud.android.lib.resources.shares.OCShare; import com.owncloud.android.lib.resources.shares.OCShare;
import com.owncloud.android.lib.resources.shares.ShareType; import com.owncloud.android.lib.resources.shares.ShareType;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.test_project.TestActivity; import com.owncloud.android.lib.test_project.TestActivity;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
@ -85,7 +86,7 @@ public class RemoveShareTest extends ActivityInstrumentationTestCase2<TestActivi
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
RemoteOperationResult removeResult = mActivity.removeFile(FILE_TO_UNSHARE); RemoteOperationResult removeResult = mActivity.removeFile(FILE_TO_UNSHARE);
if (!removeResult.isSuccess()) { if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, removeResult); Utils.logAndThrow(LOG_TAG, removeResult);
} }
super.tearDown(); super.tearDown();

2
test_client/tests/src/com/owncloud/android/lib/test_project/test/RenameFileTest.java
View File

@ -77,7 +77,7 @@ public class RenameFileTest extends ActivityInstrumentationTestCase2<TestActivit
Log.v(LOG_TAG, "Starting global set up"); Log.v(LOG_TAG, "Starting global set up");
RemoteOperationResult result = mActivity.createFolder(OLD_FOLDER_NAME, true); RemoteOperationResult result = mActivity.createFolder(OLD_FOLDER_NAME, true);
if (!result.isSuccess()) { if (!result.isSuccess() && result.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, result); Utils.logAndThrow(LOG_TAG, result);
} }

5
test_client/tests/src/com/owncloud/android/lib/test_project/test/UploadFileTest.java
View File

@ -29,6 +29,7 @@ import java.io.File;
import android.test.ActivityInstrumentationTestCase2; import android.test.ActivityInstrumentationTestCase2;
import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult;
import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode;
import com.owncloud.android.lib.test_project.TestActivity; import com.owncloud.android.lib.test_project.TestActivity;
/** /**
@ -115,9 +116,9 @@ public class UploadFileTest extends ActivityInstrumentationTestCase2<TestActivit
@Override @Override
protected void tearDown() throws Exception { protected void tearDown() throws Exception {
if (mUploadedFilePath != null && !mUploadedFilePath.equals(FILE_NOT_FOUND_PATH)) { if (mUploadedFilePath != null) {
RemoteOperationResult removeResult = mActivity.removeFile(mUploadedFilePath); RemoteOperationResult removeResult = mActivity.removeFile(mUploadedFilePath);
if (!removeResult.isSuccess()) { if (!removeResult.isSuccess() && removeResult.getCode() != ResultCode.TIMEOUT) {
Utils.logAndThrow(LOG_TAG, removeResult); Utils.logAndThrow(LOG_TAG, removeResult);
} }
} }