removed un-used code and imports

synapticloop · synapticloop · commit f11cd09797fe · 2016-07-02T13:39:53.000+01:00
diff --git a/src/main/java/synapticloop/b2/request/BaseB2Request.java b/src/main/java/synapticloop/b2/request/BaseB2Request.java
@@ -1,5 +1,7 @@
 package synapticloop.b2.request;
 
+import static org.apache.http.entity.ContentType.*;
+
 /*
  * Copyright (c) 2016 Synapticloop.
  * 
@@ -216,7 +218,7 @@ protected CloseableHttpResponse executePost() throws B2ApiException, IOException
 		String postData = convertPostData();
 		HttpPost httpPost = new HttpPost(uri);
 
-		httpPost.setEntity(new StringEntity(postData));
+		httpPost.setEntity(new StringEntity(postData, APPLICATION_JSON));
 		CloseableHttpResponse httpResponse = this.execute(httpPost);
 
 		switch(httpResponse.getStatusLine().getStatusCode()) {
diff --git a/src/test/java/synapticloop/b2/exception/B2ApiExceptionTest.java b/src/test/java/synapticloop/b2/exception/B2ApiExceptionTest.java
@@ -2,10 +2,8 @@
 
 import static org.junit.Assert.*;
 
-import org.junit.Before;
 import org.junit.Test;
 
-
 public class B2ApiExceptionTest {
 
 	@Test
diff --git a/src/test/java/synapticloop/b2/request/B2CreateAndDeleteBucketRequestTest.java b/src/test/java/synapticloop/b2/request/B2CreateAndDeleteBucketRequestTest.java
@@ -9,7 +9,6 @@
 import org.junit.Test;
 
 import synapticloop.b2.BucketType;
-import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.helper.B2TestHelper;
 import synapticloop.b2.response.B2AuthorizeAccountResponse;
 import synapticloop.b2.response.B2BucketResponse;
diff --git a/src/test/java/synapticloop/b2/request/B2DeleteFileVersionRequestTest.java b/src/test/java/synapticloop/b2/request/B2DeleteFileVersionRequestTest.java
@@ -1,20 +1,23 @@
 package synapticloop.b2.request;
 
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileWriter;
+
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Test;
-import synapticloop.b2.exception.B2ApiException;
+
 import synapticloop.b2.helper.B2TestHelper;
-import synapticloop.b2.response.*;
+import synapticloop.b2.response.B2AuthorizeAccountResponse;
+import synapticloop.b2.response.B2BucketResponse;
+import synapticloop.b2.response.B2DeleteFileVersionResponse;
+import synapticloop.b2.response.B2DownloadFileResponse;
+import synapticloop.b2.response.B2FileResponse;
+import synapticloop.b2.response.B2GetUploadUrlResponse;
 import synapticloop.b2.util.ChecksumHelper;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
 public class B2DeleteFileVersionRequestTest {
 
 	@Test
diff --git a/src/test/java/synapticloop/b2/request/B2DownloadFileRequestTest.java b/src/test/java/synapticloop/b2/request/B2DownloadFileRequestTest.java
@@ -1,19 +1,22 @@
 package synapticloop.b2.request;
 
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileWriter;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Test;
-import synapticloop.b2.exception.B2ApiException;
+
 import synapticloop.b2.helper.B2TestHelper;
-import synapticloop.b2.response.*;
+import synapticloop.b2.response.B2BucketResponse;
+import synapticloop.b2.response.B2DeleteFileVersionResponse;
+import synapticloop.b2.response.B2DownloadFileResponse;
+import synapticloop.b2.response.B2FileResponse;
+import synapticloop.b2.response.B2GetUploadUrlResponse;
 import synapticloop.b2.util.ChecksumHelper;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-
-import static org.junit.Assert.assertEquals;
-
 public class B2DownloadFileRequestTest {
 	private B2BucketResponse randomPrivateBucket = null;
 	private B2FileResponse b2FileResponse = null;
diff --git a/src/test/java/synapticloop/b2/request/B2GetFileInfoRequestTest.java b/src/test/java/synapticloop/b2/request/B2GetFileInfoRequestTest.java
@@ -5,7 +5,6 @@
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Test;
 
-import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.helper.B2TestHelper;
 import synapticloop.b2.response.B2AuthorizeAccountResponse;
 import synapticloop.b2.response.B2BucketResponse;
diff --git a/src/test/java/synapticloop/b2/request/B2GetUploadUrlRequestTest.java b/src/test/java/synapticloop/b2/request/B2GetUploadUrlRequestTest.java
@@ -1,15 +1,14 @@
 package synapticloop.b2.request;
+
 import static org.junit.Assert.*;
 
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Test;
 
-import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.helper.B2TestHelper;
 import synapticloop.b2.response.B2BucketResponse;
 import synapticloop.b2.response.B2GetUploadUrlResponse;
 
-
 public class B2GetUploadUrlRequestTest {
 
 	@Test
diff --git a/src/test/java/synapticloop/b2/request/B2HeadFileRequestTest.java b/src/test/java/synapticloop/b2/request/B2HeadFileRequestTest.java
@@ -1,14 +1,13 @@
 package synapticloop.b2.request;
+
 import static org.junit.Assert.*;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Test;
 
-import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.helper.B2TestHelper;
 import synapticloop.b2.response.B2BucketResponse;
 import synapticloop.b2.response.B2DownloadFileResponse;
diff --git a/src/test/java/synapticloop/b2/request/B2HideFileRequestTest.java b/src/test/java/synapticloop/b2/request/B2HideFileRequestTest.java
@@ -6,7 +6,6 @@
 import org.junit.Before;
 import org.junit.Test;
 
-import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.helper.B2TestHelper;
 import synapticloop.b2.response.B2BucketResponse;
 import synapticloop.b2.response.B2FileResponse;
@@ -17,7 +16,6 @@
 public class B2HideFileRequestTest {
 
 	private B2BucketResponse randomPrivateBucket = null;
-	private B2FileResponse b2FileResponse = null;
 	private B2FileResponse b2FileResponseWithPath = null;
 	private B2HideFileResponse b2HideFileResponse = null;
 
diff --git a/src/test/java/synapticloop/b2/request/B2ListBucketsRequestTest.java b/src/test/java/synapticloop/b2/request/B2ListBucketsRequestTest.java
@@ -2,14 +2,12 @@
 
 import static org.junit.Assert.*;
 
-import java.io.IOException;
 import java.util.List;
 
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Before;
 import org.junit.Test;
 
-import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.helper.B2TestHelper;
 import synapticloop.b2.response.B2AuthorizeAccountResponse;
 import synapticloop.b2.response.B2BucketResponse;
diff --git a/src/test/java/synapticloop/b2/request/B2StartLargeFileRequestTest.java b/src/test/java/synapticloop/b2/request/B2StartLargeFileRequestTest.java
@@ -14,7 +14,6 @@
 import synapticloop.b2.response.B2AuthorizeAccountResponse;
 import synapticloop.b2.response.B2BucketResponse;
 import synapticloop.b2.response.B2FileResponse;
-import synapticloop.b2.response.B2FinishLargeFileResponse;
 import synapticloop.b2.response.B2ListFilesResponse;
 import synapticloop.b2.response.B2ListPartsResponse;
 import synapticloop.b2.response.B2StartLargeFileResponse;
@@ -48,7 +47,7 @@ public void getResponse() throws Exception {
 		assertTrue(b2ListPartsResponse.getFiles().isEmpty());
 
 		try {
-			final B2FinishLargeFileResponse b2FinishLargeFileResponse = new B2FinishLargeFileRequest(client, b2AuthorizeAccountResponse,
+			new B2FinishLargeFileRequest(client, b2AuthorizeAccountResponse,
 					b2StartLargeFileResponse.getFileId(), new String[0]).getResponse();
 			fail();
 		}
diff --git a/src/test/java/synapticloop/b2/request/B2UpdateBucketRequestTest.java b/src/test/java/synapticloop/b2/request/B2UpdateBucketRequestTest.java
@@ -3,11 +3,9 @@
 import static org.junit.Assert.*;
 
 import org.apache.http.impl.client.HttpClients;
-import org.junit.Before;
 import org.junit.Test;
 
 import synapticloop.b2.BucketType;
-import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.helper.B2TestHelper;
 import synapticloop.b2.response.B2AuthorizeAccountResponse;
 import synapticloop.b2.response.B2BucketResponse;
diff --git a/src/test/java/synapticloop/b2/request/B2UploadAndDeleteFileRequestTest.java b/src/test/java/synapticloop/b2/request/B2UploadAndDeleteFileRequestTest.java
@@ -1,21 +1,23 @@
 package synapticloop.b2.request;
 
+import static org.junit.Assert.*;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.util.HashMap;
+import java.util.Map;
+
 import org.apache.http.impl.client.HttpClients;
 import org.junit.Test;
+
+import synapticloop.b2.exception.B2ApiException;
 import synapticloop.b2.helper.B2TestHelper;
 import synapticloop.b2.response.B2BucketResponse;
 import synapticloop.b2.response.B2DeleteFileVersionResponse;
 import synapticloop.b2.response.B2FileResponse;
 import synapticloop.b2.response.B2GetUploadUrlResponse;
 import synapticloop.b2.util.ChecksumHelper;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-
 
 public class B2UploadAndDeleteFileRequestTest {
 
@@ -44,6 +46,39 @@ public void testFileUpload() throws Exception {
 		B2TestHelper.deleteBucket(privateBucket.getBucketId());
 	}
 
+	@Test
+	public void testFileUploadFailureTestMode() throws Exception {
+		B2BucketResponse privateBucket = B2TestHelper.createRandomPrivateBucket();
+		B2GetUploadUrlResponse b2GetUploadUrlResponse = B2TestHelper.getUploadUrl(privateBucket.getBucketId());
+		File file = File.createTempFile("backblaze-api-test", ".txt");
+		FileWriter fileWriter = new FileWriter(file);
+		fileWriter.write("hello world!");
+		fileWriter.flush();
+		fileWriter.close();
+		while (true) {
+			try {
+				final B2UploadFileRequest request = new B2UploadFileRequest(HttpClients.createDefault(),
+						B2TestHelper.getB2AuthorizeAccountResponse(), b2GetUploadUrlResponse, file.getName(), file,
+						ChecksumHelper.calculateSha1(file));
+				request.addHeader("X-Bz-Test-Mode", "fail_some_uploads");
+				B2FileResponse b2UploadFileResponse = request.getResponse();
+
+				String fileName = b2UploadFileResponse.getFileName();
+				String fileId = b2UploadFileResponse.getFileId();
+
+				// now we need to delete the file as well to clean up after ourselves
+
+				B2DeleteFileVersionResponse b2DeleteFileVersionResponse = new B2DeleteFileVersionRequest(HttpClients.createDefault(), B2TestHelper.getB2AuthorizeAccountResponse(), fileName, fileId).getResponse();
+				assertEquals(fileName, b2DeleteFileVersionResponse.getFileName());
+				assertEquals(fileId, b2DeleteFileVersionResponse.getFileId());
+			} catch (B2ApiException e) {
+				assertEquals(503, e.getStatus());
+				break;
+			}
+		}
+
+		B2TestHelper.deleteBucket(privateBucket.getBucketId());
+	}
 	@Test
 	public void testFileUploadWithInfo() throws Exception {
 		B2BucketResponse privateBucket = B2TestHelper.createRandomPrivateBucket();
diff --git a/src/test/java/synapticloop/b2/request/B2UploadPartRequestTest.java b/src/test/java/synapticloop/b2/request/B2UploadPartRequestTest.java
@@ -14,7 +14,6 @@
 import synapticloop.b2.response.B2AuthorizeAccountResponse;
 import synapticloop.b2.response.B2BucketResponse;
 import synapticloop.b2.response.B2FileResponse;
-import synapticloop.b2.response.B2FinishLargeFileResponse;
 import synapticloop.b2.response.B2GetUploadPartUrlResponse;
 import synapticloop.b2.response.B2ListPartsResponse;
 import synapticloop.b2.response.B2StartLargeFileResponse;
@@ -52,7 +51,7 @@ public void getResponse() throws Exception {
 		assertEquals(2, b2ListPartsResponse.getFiles().size());
 
 		try {
-			final B2FinishLargeFileResponse b2FinishLargeFileResponse = new B2FinishLargeFileRequest(client, b2AuthorizeAccountResponse,
+			new B2FinishLargeFileRequest(client, b2AuthorizeAccountResponse,
 					b2StartLargeFileResponse.getFileId(), new String[]{"430ce34d020724ed75a196dfc2ad67c77772d169", "430ce34d020724ed75a196dfc2ad67c77772d169"}).getResponse();
 			fail();
 		} catch (B2ApiException e) {
