From 64ddaf8d9ab7b2a10cba854d4577a3e792731f73 Mon Sep 17 00:00:00 2001
From: masensio <masensio@solidgear.es>
Date: Wed, 18 Dec 2013 09:02:56 +0100
Subject: [PATCH] OC-2333: Complete Unit Tests

---
 .../test/UploadFileTest.java                       | 16 +++++++-
 .../oc_framework_test_project/TestActivity.java    | 13 +++++--
 .../android/operations/UploadFileOperation.java    | 44 +++++++++++-----------
 3 files changed, 46 insertions(+), 27 deletions(-)

diff --git a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/UploadFileTest.java b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/UploadFileTest.java
index 6aabf5b0..67103718 100644
--- a/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/UploadFileTest.java
+++ b/oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/UploadFileTest.java
@@ -31,7 +31,6 @@ import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
 
 import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
-import com.owncloud.android.oc_framework.operations.RemoteOperationResult.ResultCode;
 import com.owncloud.android.oc_framework_test_project.TestActivity;
 
 /**
@@ -49,6 +48,8 @@ public class UploadFileTest extends ActivityInstrumentationTestCase2<TestActivit
 	private final String mFileToUploadWithChunks = "fileToUploadChunks.MP4";
 	private final String mMimeTypeWithChunks = "video/mp4";
 	
+	private final String mFileNotFound = "fileNotFound.png";
+	
 	private final String mStoragePath = "/owncloud/tmp/uploadTest";
 	private String mPath;
 	
@@ -144,4 +145,17 @@ public class UploadFileTest extends ActivityInstrumentationTestCase2<TestActivit
 		assertTrue(result.isSuccess());
 	}
 	
+	/**
+	 * Test Upload Not Found File
+	 */
+	public void testUploadFileNotFound() {
+
+		String storagePath = mPath + "/" + mFileNotFound;
+		//String remotePath = "/uploadTest" + mCurrentDate + "/" + mFileToUpload;
+		String remotePath = "/" + mFileNotFound;
+		
+		RemoteOperationResult result = mActivity.uploadFile(storagePath, remotePath, mMimeType);
+		assertFalse(result.isSuccess());
+	}
+	
 }
diff --git a/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java b/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
index f259ec47..c42aca2e 100644
--- a/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
+++ b/oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
@@ -1,10 +1,9 @@
 package com.owncloud.android.oc_framework_test_project;
 
-import java.io.File;
-
 import com.owncloud.android.oc_framework.network.webdav.OwnCloudClientFactory;
 import com.owncloud.android.oc_framework.network.webdav.WebdavClient;
 import com.owncloud.android.oc_framework.operations.RemoteOperationResult;
+import com.owncloud.android.oc_framework.operations.remote.ChunkedUploadRemoteFileOperation;
 import com.owncloud.android.oc_framework.operations.remote.CreateRemoteFolderOperation;
 import com.owncloud.android.oc_framework.operations.remote.ReadRemoteFolderOperation;
 import com.owncloud.android.oc_framework.operations.remote.RemoveRemoteFileOperation;
@@ -13,7 +12,6 @@ import com.owncloud.android.oc_framework.operations.remote.UploadRemoteFileOpera
 
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Environment;
 import android.app.Activity;
 import android.view.Menu;
 
@@ -28,6 +26,7 @@ public class TestActivity extends Activity {
 	private static final String mServerUri = "https://beta.owncloud.com/owncloud/remote.php/webdav";
 	private static final String mUser = "testandroid";
 	private static final String mPass = "testandroid";
+	private static final boolean mChunked = true;
 	
 	//private Account mAccount = null;
 	private WebdavClient mClient;
@@ -117,8 +116,14 @@ public class TestActivity extends Activity {
 	 * @return
 	 */
 	public RemoteOperationResult uploadFile(String storagePath, String remotePath, String mimeType) {
+
+		UploadRemoteFileOperation uploadOperation;
+		if (mChunked) {
+            uploadOperation = new ChunkedUploadRemoteFileOperation(storagePath, remotePath, mimeType);
+        } else {
+            uploadOperation = new UploadRemoteFileOperation(storagePath, remotePath, mimeType);
+        }
 		
-		UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(storagePath, remotePath, mimeType);
 		RemoteOperationResult result = uploadOperation.execute(mClient);
 		
 		return result;
diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java
index 7501fa12..b0b9466f 100644
--- a/src/com/owncloud/android/operations/UploadFileOperation.java
+++ b/src/com/owncloud/android/operations/UploadFileOperation.java
@@ -372,28 +372,28 @@ public class UploadFileOperation extends RemoteOperation {
         mFile = newFile;
     }
 
-    public boolean isSuccess(int status) {
-        return ((status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT));
-    }
-
-    protected int uploadFile(WebdavClient client) throws HttpException, IOException, OperationCancelledException {
-        int status = -1;
-        try {
-            File f = new File(mFile.getStoragePath());
-            mEntity  = new FileRequestEntity(f, getMimeType());
-            synchronized (mDataTransferListeners) {
-                ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(mDataTransferListeners);
-            }
-            mPutMethod.setRequestEntity(mEntity);
-            status = client.executeMethod(mPutMethod);
-            client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
-
-        } finally {
-            mPutMethod.releaseConnection(); // let the connection available for
-                                            // other methods
-        }
-        return status;
-    }
+//    public boolean isSuccess(int status) {
+//        return ((status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED || status == HttpStatus.SC_NO_CONTENT));
+//    }
+//
+//    protected int uploadFile(WebdavClient client) throws HttpException, IOException, OperationCancelledException {
+//        int status = -1;
+//        try {
+//            File f = new File(mFile.getStoragePath());
+//            mEntity  = new FileRequestEntity(f, getMimeType());
+//            synchronized (mDataTransferListeners) {
+//                ((ProgressiveDataTransferer)mEntity).addDatatransferProgressListeners(mDataTransferListeners);
+//            }
+//            mPutMethod.setRequestEntity(mEntity);
+//            status = client.executeMethod(mPutMethod);
+//            client.exhaustResponse(mPutMethod.getResponseBodyAsStream());
+//
+//        } finally {
+//            mPutMethod.releaseConnection(); // let the connection available for
+//                                            // other methods
+//        }
+//        return status;
+//    }
 
     /**
      * Checks if remotePath does not exist in the server and returns it, or adds
-- 
2.11.0