Skip to content

Commit 11dabf5

Browse files
author
YangSen-qn
committed
delete useless import
1 parent 0586d7e commit 11dabf5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+47
-135
lines changed

‎library/src/androidTest/java/com/qiniu/android/BaseTest.java‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
import com.qiniu.android.utils.LogUtil;
66

7-
import junit.framework.TestCase;
8-
97
import java.util.Date;
108
import java.util.concurrent.CountDownLatch;
119
import java.util.concurrent.TimeUnit;
@@ -22,18 +20,19 @@ protected void setUp() throws Exception {
2220
}
2321

2422
private long maxWaitTimestamp = 0;
23+
2524
/**
2625
* waitCondition: 等待条件
2726
* maxWaitTime: 等待最大时长 单位-秒
2827
*/
29-
public void wait(WaitConditional waitConditional, float maxWaitTime){
28+
public void wait(WaitConditional waitConditional, float maxWaitTime) {
3029

3130
WaitConditional waitConditionalP = waitConditional;
32-
if (waitConditionalP == null){
31+
if (waitConditionalP == null) {
3332
waitConditionalP = new WaitCondition();
3433
}
3534

36-
this.maxWaitTimestamp = new Date().getTime() + (long)(maxWaitTime * 1000);
35+
this.maxWaitTimestamp = new Date().getTime() + (long) (maxWaitTime * 1000);
3736
while (waitConditionalP.shouldWait()) {
3837
long currentTimestamp = new Date().getTime();
3938
if (currentTimestamp > maxWaitTimestamp) {
@@ -55,13 +54,16 @@ public interface WaitConditional {
5554

5655
public static class WaitCondition implements WaitConditional {
5756
public boolean shouldWait = true;
58-
public boolean shouldWait(){
57+
58+
public boolean shouldWait() {
5959
return shouldWait;
60-
};
60+
}
61+
62+
;
6163
}
6264

6365

64-
private void notestWait(){
66+
private void notestWait() {
6567

6668
long waitTime = 5;
6769

@@ -73,6 +75,6 @@ private void notestWait(){
7375

7476
long endTimestamp = new Date().getTime();
7577

76-
assertTrue(((startTimestamp + waitTime*1000) < endTimestamp));
78+
assertTrue(((startTimestamp + waitTime * 1000) < endTimestamp));
7779
}
7880
}

‎library/src/androidTest/java/com/qiniu/android/BigDataConfigurationTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
public class BigDataConfigurationTest extends AndroidTestCase {
88

9-
public void testCopy(){
9+
public void testCopy() {
1010
Configuration configuration = new Configuration();
1111
configuration.connectTimeout = 15;
1212

@@ -15,7 +15,7 @@ public void testCopy(){
1515
assertTrue(configurationCopy.connectTimeout == configuration.connectTimeout);
1616
}
1717

18-
public void testCopyNoValue(){
18+
public void testCopyNoValue() {
1919
Configuration configuration = null;
2020

2121
Configuration configurationCopy = Configuration.copy(configuration);

‎library/src/androidTest/java/com/qiniu/android/ClientTest.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,22 @@
44
import com.qiniu.android.bigdata.client.CompletionHandler;
55
import com.qiniu.android.bigdata.client.PostArgs;
66
import com.qiniu.android.http.ResponseInfo;
7-
import com.qiniu.android.http.request.httpclient.MultipartBody;
87
import com.qiniu.android.storage.UpToken;
98
import com.qiniu.android.utils.StringMap;
109

1110
import org.json.JSONObject;
1211

13-
import java.util.HashMap;
14-
15-
import okhttp3.MediaType;
16-
1712
public class ClientTest extends BaseTest {
1813

19-
public void testSyncGet(){
14+
public void testSyncGet() {
2015

2116
Client client = new Client(null, 90, 90, null, null);
2217
ResponseInfo responseInfo = client.syncGet("https://up.qiniup.com/crossdomain.xml", null);
2318
assertTrue(responseInfo != null);
2419
assertTrue(responseInfo.statusCode == 200);
2520
}
2621

27-
public void testAsyncGet(){
22+
public void testAsyncGet() {
2823

2924
final WaitCondition waitCondition = new WaitCondition();
3025
Client client = new Client();
@@ -41,7 +36,7 @@ public void complete(ResponseInfo info, JSONObject response) {
4136
wait(waitCondition, 10 * 60);
4237
}
4338

44-
public void testMultipartSyncPost(){
39+
public void testMultipartSyncPost() {
4540

4641
PostArgs postArgs = new PostArgs();
4742
postArgs.data = "123".getBytes();
@@ -57,7 +52,7 @@ public void testMultipartSyncPost(){
5752
assertTrue(responseInfo != null);
5853
}
5954

60-
public void testMultipartAsyncPost(){
55+
public void testMultipartAsyncPost() {
6156

6257
final WaitCondition waitCondition = new WaitCondition();
6358

‎library/src/androidTest/java/com/qiniu/android/ComplexUploadSceneTest.java‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,22 @@
11
package com.qiniu.android;
22

3-
import android.test.AndroidTestCase;
43
import android.util.Log;
54

6-
import com.qiniu.android.common.Config;
75
import com.qiniu.android.http.ResponseInfo;
86
import com.qiniu.android.storage.Configuration;
97
import com.qiniu.android.storage.UpCompletionHandler;
10-
import com.qiniu.android.storage.UploadManager;
11-
12-
import junit.framework.Assert;
138

149
import org.json.JSONObject;
1510

1611
import java.io.File;
1712
import java.io.IOException;
1813
import java.util.concurrent.CountDownLatch;
19-
import java.util.concurrent.TimeUnit;
2014

2115
public class ComplexUploadSceneTest extends UploadBaseTest {
2216

2317
private final CountDownLatch signal = new CountDownLatch(1);
2418

25-
public void testMutiUploadV1(){
19+
public void testMutiUploadV1() {
2620

2721
final int maxCount = 40;
2822

@@ -36,7 +30,7 @@ public void testMutiUploadV1(){
3630
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
3731
.useConcurrentResumeUpload(true)
3832
.concurrentTaskCount(3)
39-
.chunkSize((i%4 + 1) * 1024 * 1024 + i)
33+
.chunkSize((i % 4 + 1) * 1024 * 1024 + i)
4034
.build();
4135

4236
int size = (i + 1) * 1024;
@@ -53,12 +47,12 @@ public void testMutiUploadV1(){
5347
upload(info, keyUp, config, null, new UpCompletionHandler() {
5448
@Override
5549
public void complete(String key, ResponseInfo info, JSONObject response) {
56-
synchronized (param){
50+
synchronized (param) {
5751
param.completeCount += 1;
58-
if (info != null && info.isOK()){
52+
if (info != null && info.isOK()) {
5953
param.successCount += 1;
6054
}
61-
if (param.completeCount == (maxCount - start)){
55+
if (param.completeCount == (maxCount - start)) {
6256
signal.countDown();
6357
}
6458
}
@@ -76,7 +70,7 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
7670
assertTrue("success count" + param.successCount, param.successCount == param.completeCount);
7771
}
7872

79-
public void testMutiUploadV2(){
73+
public void testMutiUploadV2() {
8074

8175
final int maxCount = 40;
8276

@@ -90,7 +84,7 @@ public void testMutiUploadV2(){
9084
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
9185
.useConcurrentResumeUpload(true)
9286
.concurrentTaskCount(3)
93-
.chunkSize((i%4 + 1) * 1024 * 1024 + i)
87+
.chunkSize((i % 4 + 1) * 1024 * 1024 + i)
9488
.build();
9589

9690
int size = (i + 1) * 1024;
@@ -107,12 +101,12 @@ public void testMutiUploadV2(){
107101
upload(info, keyUp, config, null, new UpCompletionHandler() {
108102
@Override
109103
public void complete(String key, ResponseInfo info, JSONObject response) {
110-
synchronized (param){
104+
synchronized (param) {
111105
param.completeCount += 1;
112-
if (info != null && (info.isOK() || info.statusCode == 614)){
106+
if (info != null && (info.isOK() || info.statusCode == 614)) {
113107
param.successCount += 1;
114108
}
115-
if (param.completeCount == (maxCount - start)){
109+
if (param.completeCount == (maxCount - start)) {
116110
signal.countDown();
117111
}
118112
}
@@ -131,7 +125,7 @@ public void complete(String key, ResponseInfo info, JSONObject response) {
131125
}
132126

133127

134-
private class TestParam{
128+
private class TestParam {
135129
int successCount = 0;
136130
int completeCount = 0;
137131
}

‎library/src/androidTest/java/com/qiniu/android/ConcurrentResumeUploadTest.java‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,12 @@
11
package com.qiniu.android;
22

3-
import android.test.suitebuilder.annotation.LargeTest;
4-
5-
import com.qiniu.android.common.AutoZone;
6-
import com.qiniu.android.common.FixedZone;
7-
import com.qiniu.android.common.Zone;
83
import com.qiniu.android.http.ResponseInfo;
94
import com.qiniu.android.storage.Configuration;
10-
import com.qiniu.android.storage.UpCompletionHandler;
11-
import com.qiniu.android.storage.UpProgressHandler;
12-
import com.qiniu.android.storage.UploadManager;
13-
import com.qiniu.android.storage.UploadOptions;
14-
import com.qiniu.android.utils.AsyncRun;
15-
import com.qiniu.android.utils.Etag;
16-
import com.qiniu.android.utils.LogUtil;
17-
18-
import org.json.JSONObject;
195

206
import java.io.File;
217
import java.io.IOException;
228
import java.util.Date;
23-
import java.util.Iterator;
24-
import java.util.LinkedList;
25-
import java.util.Queue;
9+
2610

2711
/**
2812
* Created by yangsen on 2020/5/27

‎library/src/androidTest/java/com/qiniu/android/DnsApiTest.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77
import com.qiniu.android.http.dns.IDnsNetworkAddress;
88
import com.qiniu.android.storage.UpToken;
99

10-
import android.util.Log;
11-
import com.qiniu.android.storage.Recorder;
12-
import com.qiniu.android.utils.StringUtils;
13-
import java.net.InetAddress;
14-
import java.net.UnknownHostException;
15-
import java.util.ArrayList;
16-
1710
import java.util.List;
1811

1912
/**

‎library/src/androidTest/java/com/qiniu/android/FastDatePrinterTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import com.qiniu.android.utils.FastDatePrinter;
44
import com.qiniu.android.utils.LogUtil;
55

6-
import java.util.Calendar;
76
import java.util.Date;
87
import java.util.Locale;
98
import java.util.TimeZone;

‎library/src/androidTest/java/com/qiniu/android/HttpHeaderTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
package com.qiniu.android;
2+
23
import android.test.AndroidTestCase;
34

45
import com.qiniu.android.http.Headers;
@@ -23,18 +24,18 @@ protected void setUp() throws Exception {
2324
LogUtil.i(headers.names().toString());
2425
}
2526

26-
public void testValue(){
27+
public void testValue() {
2728

2829
assertTrue(headers.values("date") != null);
2930
assertTrue(headers.values("host") != null);
3031
}
3132

32-
public void testCount(){
33+
public void testCount() {
3334

3435
assertTrue(headers.byteCount() > 0);
3536
}
3637

37-
public void testBuilder(){
38+
public void testBuilder() {
3839
String dateKey = "date";
3940
String dateValue = HttpDate.format(new Date());
4041
String hostKey = "host";
@@ -78,32 +79,32 @@ public void testBuilder(){
7879
}
7980

8081

81-
public void testBuilderError(){
82+
public void testBuilderError() {
8283

8384
Headers headers = null;
8485

8586
String headersString = null;
8687
try {
8788
headers = Headers.of(headersString);
88-
} catch (Exception e){
89+
} catch (Exception e) {
8990
assertTrue(true);
9091
}
9192

9293
try {
9394
headers = Headers.of("key");
94-
} catch (Exception e){
95+
} catch (Exception e) {
9596
assertTrue(true);
9697
}
9798

9899
try {
99100
headers = Headers.of("key", null);
100-
} catch (Exception e){
101+
} catch (Exception e) {
101102
assertTrue(true);
102103
}
103104

104105
try {
105106
headers = Headers.of("key", "");
106-
} catch (Exception e){
107+
} catch (Exception e) {
107108
assertTrue(true);
108109
}
109110

‎library/src/androidTest/java/com/qiniu/android/RetryTest.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@
88
import com.qiniu.android.storage.UpProgressHandler;
99
import com.qiniu.android.storage.UploadManager;
1010
import com.qiniu.android.storage.UploadOptions;
11-
import com.qiniu.android.utils.Etag;
1211
import com.qiniu.android.utils.LogUtil;
1312

14-
import org.json.JSONException;
1513
import org.json.JSONObject;
1614

1715
import java.io.File;
18-
import java.io.IOException;
1916

2017
/**
2118
* Created by yangsen on 2020/6/3

‎library/src/androidTest/java/com/qiniu/android/SystemHttpClientTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import com.qiniu.android.http.request.httpclient.SystemHttpClient;
77
import com.qiniu.android.http.metrics.UploadSingleRequestMetrics;
88

9-
10-
119
import org.json.JSONObject;
1210

1311

0 commit comments

Comments
 (0)