Fix unit test (43f6fe93) · Commits · e / os / nextcloud-android-lib

sample_client/res/values/setup.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,4 +27,5 @@
	<string name="server_base_url"></string>		<string name="server_base_url"></string>
	<string name="username"></string>		<string name="username"></string>
	<string name="password"></string>		<string name="password"></string>
			<string name ="user_agent">Android-ownCloud</string>
	</resources>		</resources>

sample_client/src/com/owncloud/android/lib/sampleclient/MainActivity.java

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -79,7 +79,8 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
	mHandler = new Handler();		mHandler = new Handler();

	Uri serverUri = Uri.parse(getString(R.string.server_base_url));		Uri serverUri = Uri.parse(getString(R.string.server_base_url));
	mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);		mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true,
			getString(R.string.user_agent));
	mClient.setCredentials(		mClient.setCredentials(
	OwnCloudCredentialsFactory.newBasicCredentials(		OwnCloudCredentialsFactory.newBasicCredentials(
	getString(R.string.username),		getString(R.string.username),
	@@ -149,7 +150,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,

	private void startRefresh() {		private void startRefresh() {
	ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);		ReadRemoteFolderOperation refreshOperation = new ReadRemoteFolderOperation(FileUtils.PATH_SEPARATOR);
	refreshOperation.execute(mClient, this, mHandler);		refreshOperation.execute(mClient, getString(R.string.user_agent), this, mHandler);
	}		}

	private void startUpload() {		private void startUpload() {
	@@ -159,7 +160,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
	String mimeType = getString(R.string.sample_file_mimetype);		String mimeType = getString(R.string.sample_file_mimetype);
	UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType);		UploadRemoteFileOperation uploadOperation = new UploadRemoteFileOperation(fileToUpload.getAbsolutePath(), remotePath, mimeType);
	uploadOperation.addDatatransferProgressListener(this);		uploadOperation.addDatatransferProgressListener(this);
	uploadOperation.execute(mClient, this, mHandler);		uploadOperation.execute(mClient, getString(R.string.user_agent), this, mHandler);
	}		}

	private void startRemoteDeletion() {		private void startRemoteDeletion() {
	@@ -167,7 +168,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
	File fileToUpload = upFolder.listFiles()[0];		File fileToUpload = upFolder.listFiles()[0];
	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();		String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);		RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
	removeOperation.execute(mClient, this, mHandler);		removeOperation.execute(mClient, getString(R.string.user_agent), this, mHandler);
	}		}

	private void startDownload() {		private void startDownload() {
	@@ -178,7 +179,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
	String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();		String remotePath = FileUtils.PATH_SEPARATOR + fileToUpload.getName();
	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());		DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remotePath, downFolder.getAbsolutePath());
	downloadOperation.addDatatransferProgressListener(this);		downloadOperation.addDatatransferProgressListener(this);
	downloadOperation.execute(mClient, this, mHandler);		downloadOperation.execute(mClient, getString(R.string.user_agent), this, mHandler);
	}		}

	@SuppressWarnings("deprecation")		@SuppressWarnings("deprecation")

test_client/res/values/setup.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,4 +28,5 @@
	<string name="server_base_url"></string>		<string name="server_base_url"></string>
	<string name="username"></string>		<string name="username"></string>
	<string name="password"></string>		<string name="password"></string>
			<string name ="user_agent">Android-ownCloud</string>
	</resources>		</resources>

test_client/src/com/owncloud/android/lib/test_project/TestActivity.java

+14 −11

Original line number	Original line	Diff line number	Diff line
	@@ -72,6 +72,7 @@ public class TestActivity extends Activity {
	private String mServerUri;		private String mServerUri;
	private String mUser;		private String mUser;
	private String mPass;		private String mPass;
			private static String mUserAgent;

	private static final int BUFFER_SIZE = 1024;		private static final int BUFFER_SIZE = 1024;

	@@ -90,6 +91,7 @@ public class TestActivity extends Activity {
	mServerUri = getString(R.string.server_base_url);		mServerUri = getString(R.string.server_base_url);
	mUser = getString(R.string.username);		mUser = getString(R.string.username);
	mPass = getString(R.string.password);		mPass = getString(R.string.password);
			mUserAgent = getString(R.string.user_agent);

	Protocol pr = Protocol.getProtocol("https");		Protocol pr = Protocol.getProtocol("https");
	if (pr == null \|\| !(pr.getSocketFactory() instanceof SelfSignedConfidentSslSocketFactory)) {		if (pr == null \|\| !(pr.getSocketFactory() instanceof SelfSignedConfidentSslSocketFactory)) {
	@@ -104,7 +106,8 @@ public class TestActivity extends Activity {
	}		}
	}		}

	mClient = new OwnCloudClient(Uri.parse(mServerUri), NetworkUtils.getMultiThreadedConnManager());		mClient = new OwnCloudClient(Uri.parse(mServerUri), NetworkUtils.getMultiThreadedConnManager(),
			mUserAgent);
	mClient.setDefaultTimeouts(		mClient.setDefaultTimeouts(
	OwnCloudClientFactory.DEFAULT_DATA_TIMEOUT,		OwnCloudClientFactory.DEFAULT_DATA_TIMEOUT,
	OwnCloudClientFactory.DEFAULT_CONNECTION_TIMEOUT);		OwnCloudClientFactory.DEFAULT_CONNECTION_TIMEOUT);
	@@ -156,7 +159,7 @@ public class TestActivity extends Activity {

	CreateRemoteFolderOperation createOperation =		CreateRemoteFolderOperation createOperation =
	new CreateRemoteFolderOperation(remotePath, createFullPath);		new CreateRemoteFolderOperation(remotePath, createFullPath);
	RemoteOperationResult result = createOperation.execute(client);		RemoteOperationResult result = createOperation.execute(client, mUserAgent);

	return result;		return result;
	}		}
	@@ -174,7 +177,7 @@ public class TestActivity extends Activity {
	public RemoteOperationResult renameFile(String oldName, String oldRemotePath, String newName, boolean isFolder) {		public RemoteOperationResult renameFile(String oldName, String oldRemotePath, String newName, boolean isFolder) {

	RenameRemoteFileOperation renameOperation = new RenameRemoteFileOperation(oldName, oldRemotePath, newName, isFolder);		RenameRemoteFileOperation renameOperation = new RenameRemoteFileOperation(oldName, oldRemotePath, newName, isFolder);
	RemoteOperationResult result = renameOperation.execute(mClient);		RemoteOperationResult result = renameOperation.execute(mClient, mUserAgent);

	return result;		return result;
	}		}
	@@ -187,7 +190,7 @@ public class TestActivity extends Activity {
	*/		*/
	public RemoteOperationResult removeFile(String remotePath) {		public RemoteOperationResult removeFile(String remotePath) {
	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);		RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
	RemoteOperationResult result = removeOperation.execute(mClient);		RemoteOperationResult result = removeOperation.execute(mClient, mUserAgent);
	return result;		return result;
	}		}

	@@ -199,7 +202,7 @@ public class TestActivity extends Activity {
	*/		*/
	public static RemoteOperationResult removeFile(String remotePath, OwnCloudClient client) {		public static RemoteOperationResult removeFile(String remotePath, OwnCloudClient client) {
	RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);		RemoveRemoteFileOperation removeOperation = new RemoveRemoteFileOperation(remotePath);
	RemoteOperationResult result = removeOperation.execute(client);		RemoteOperationResult result = removeOperation.execute(client, mUserAgent);
	return result;		return result;
	}		}

	@@ -213,7 +216,7 @@ public class TestActivity extends Activity {
	public RemoteOperationResult readFile(String remotePath) {		public RemoteOperationResult readFile(String remotePath) {

	ReadRemoteFolderOperation readOperation= new ReadRemoteFolderOperation(remotePath);		ReadRemoteFolderOperation readOperation= new ReadRemoteFolderOperation(remotePath);
	RemoteOperationResult result = readOperation.execute(mClient);		RemoteOperationResult result = readOperation.execute(mClient, mUserAgent);

	return result;		return result;
	}		}
	@@ -232,7 +235,7 @@ public class TestActivity extends Activity {
	folder.mkdirs();		folder.mkdirs();

	DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remoteFile.getRemotePath(), folder.getAbsolutePath());		DownloadRemoteFileOperation downloadOperation = new DownloadRemoteFileOperation(remoteFile.getRemotePath(), folder.getAbsolutePath());
	RemoteOperationResult result = downloadOperation.execute(mClient);		RemoteOperationResult result = downloadOperation.execute(mClient, mUserAgent);

	return result;		return result;
	}		}
	@@ -273,7 +276,7 @@ public class TestActivity extends Activity {
	);		);
	}		}

	RemoteOperationResult result = uploadOperation.execute(client);		RemoteOperationResult result = uploadOperation.execute(client, mUserAgent);
	return result;		return result;
	}		}

	@@ -284,7 +287,7 @@ public class TestActivity extends Activity {
	public RemoteOperationResult getShares(){		public RemoteOperationResult getShares(){

	GetRemoteSharesOperation getOperation = new GetRemoteSharesOperation();		GetRemoteSharesOperation getOperation = new GetRemoteSharesOperation();
	RemoteOperationResult result = getOperation.execute(mClient);		RemoteOperationResult result = getOperation.execute(mClient, mUserAgent);

	return result;		return result;
	}		}
	@@ -312,7 +315,7 @@ public class TestActivity extends Activity {
	String password, int permissions){		String password, int permissions){

	CreateRemoteShareOperation createOperation = new CreateRemoteShareOperation(path, shareType, shareWith, publicUpload, password, permissions);		CreateRemoteShareOperation createOperation = new CreateRemoteShareOperation(path, shareType, shareWith, publicUpload, password, permissions);
	RemoteOperationResult result = createOperation.execute(mClient);		RemoteOperationResult result = createOperation.execute(mClient, mUserAgent);

	return result;		return result;
	}		}
	@@ -326,7 +329,7 @@ public class TestActivity extends Activity {

	public RemoteOperationResult removeShare(int idShare) {		public RemoteOperationResult removeShare(int idShare) {
	RemoveRemoteShareOperation removeOperation = new RemoveRemoteShareOperation(idShare);		RemoveRemoteShareOperation removeOperation = new RemoveRemoteShareOperation(idShare);
	RemoteOperationResult result = removeOperation.execute(mClient);		RemoteOperationResult result = removeOperation.execute(mClient, mUserAgent);

	return result;		return result;

test_client/tests/res/values/strings.xml

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -26,5 +26,6 @@
	<resources>		<resources>

	<string name="app_name">Oc_framework-testTest</string>		<string name="app_name">Oc_framework-testTest</string>
			<string name ="user_agent">Android-ownCloud</string>

	</resources>		</resources>