Skip to content

Commit 6201218

Browse files
author
YangSen-qn
committed
change test case
1 parent d7c7053 commit 6201218

File tree

7 files changed

+24
-35
lines changed

7 files changed

+24
-35
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public void testMultipartSyncPost() {
5555
UpToken token = UpToken.parse(TestConfig.commonToken);
5656

5757
Client client = new Client(null, 90, 90, null, null);
58-
ResponseInfo responseInfo = client.syncMultipartPost("http://up.qiniu.com", postArgs, token);
58+
ResponseInfo responseInfo = client.syncMultipartPost("https://up.qiniup.com", postArgs, token);
5959

6060
assertTrue(responseInfo != null);
6161
}
@@ -73,7 +73,7 @@ public void testMultipartAsyncPost() {
7373
UpToken token = UpToken.parse(TestConfig.commonToken);
7474

7575
Client client = new Client(null, 90, 90, null, null);
76-
client.asyncMultipartPost("http://up.qiniu.com", postArgs, token, null, new CompletionHandler() {
76+
client.asyncMultipartPost("https://up.qiniu.com", postArgs, token, null, new CompletionHandler() {
7777
@Override
7878
public void complete(ResponseInfo info, JSONObject response) {
7979

‎library/src/androidTest/java/com/qiniu/android/http/HttpTest.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.junit.Test;
2020
import org.junit.runner.RunWith;
2121

22+
import java.net.Proxy;
2223
import java.net.URI;
2324
import java.net.URISyntaxException;
2425
import java.nio.charset.Charset;
@@ -50,7 +51,7 @@ public void setUp() throws Exception {
5051
@Test
5152
public void testPost1() throws Throwable {
5253

53-
httpManager.asyncPost("http://www.baidu.com",
54+
httpManager.asyncPost("https://www.baidu.com",
5455
"hello".getBytes(), null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
5556
null, new CompletionHandler() {
5657
@Override
@@ -78,7 +79,7 @@ public boolean shouldWait() {
7879
@Test
7980
public void testPost2() throws Throwable {
8081

81-
httpManager.asyncPost("http://up.qiniu.com", "hello".getBytes(), null,
82+
httpManager.asyncPost("https://up.qiniup.com", "hello".getBytes(), null,
8283
UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
8384
null, new CompletionHandler() {
8485
@Override
@@ -107,7 +108,7 @@ public void testPost3() throws Throwable {
107108
AsyncRun.runInMain(new Runnable() { // THIS IS THE KEY TO SUCCESS
108109
public void run() {
109110

110-
httpManager.asyncPost("http://httpbin.org/status/500", "hello".getBytes(),
111+
httpManager.asyncPost("https://httpbin.org/status/500", "hello".getBytes(),
111112
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
112113
null, new CompletionHandler() {
113114
@Override
@@ -138,7 +139,7 @@ public boolean shouldWait() {
138139
public void testPost4() throws Throwable {
139140
AsyncRun.runInMain(new Runnable() { // THIS IS THE KEY TO SUCCESS
140141
public void run() {
141-
httpManager.asyncPost("http://httpbin.org/status/418",
142+
httpManager.asyncPost("https://httpbin.org/status/418",
142143
"hello".getBytes(),
143144
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
144145
null, new CompletionHandler() {
@@ -166,11 +167,10 @@ public boolean shouldWait() {
166167
Assert.assertNotNull(info.error);
167168
}
168169

169-
@Test
170-
public void testPostNoDomain() throws Throwable {
170+
private void testPostNoDomain() throws Throwable {
171171

172172

173-
httpManager.asyncPost("http://no-domain.qiniu.com", "hello".getBytes(),
173+
httpManager.asyncPost("https://no-domain.qiniu.com", "hello".getBytes(),
174174
null, UpToken.parse(TestConfig.commonToken), "hello".getBytes().length,
175175
null, new CompletionHandler() {
176176
@Override
@@ -217,8 +217,8 @@ public boolean shouldWait() {
217217
// ResponseInfo.TimedOut == info.statusCode);
218218
// }
219219

220-
@Test
221-
public void testPostIP() throws Throwable {
220+
221+
private void testPostIP() throws Throwable {
222222
info = null;
223223
StringMap x = new StringMap().put("Host", "up.qiniu.com");
224224

@@ -274,7 +274,7 @@ public boolean shouldWait() {
274274
}
275275
}, 60);
276276

277-
Assert.assertTrue(!"".equals(info.reqId));
277+
Assert.assertTrue(info.reqId.length() > 0);
278278
Assert.assertEquals(400, info.statusCode);
279279
}
280280

‎library/src/androidTest/java/com/qiniu/android/http/request/httpclient/SystemHttpClientTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void testPostRequest() {
6060

6161
final WaitCondition waitCondition = new WaitCondition();
6262

63-
Request request = new Request("http://www.baidu.com/",
63+
Request request = new Request("https://www.baidu.com/",
6464
Request.HttpMethodPOST, null, "hello".getBytes(), 15);
6565

6666
SystemHttpClient client = new SystemHttpClient();
@@ -81,7 +81,7 @@ public void testSyncPostRequest() {
8181

8282
final WaitCondition waitCondition = new WaitCondition();
8383

84-
Request request = new Request("http://www.baidu.com/",
84+
Request request = new Request("https://www.baidu.com/",
8585
Request.HttpMethodPOST, null, "hello".getBytes(), 15);
8686

8787
SystemHttpClient client = new SystemHttpClient();
@@ -102,7 +102,7 @@ public void testPostRequestError() {
102102

103103
final WaitCondition waitCondition = new WaitCondition();
104104

105-
Request request = new Request("http://www.baidu.com/",
105+
Request request = new Request("https://www.baidu.com/",
106106
Request.HttpMethodPOST, null, "hello".getBytes(), 15);
107107

108108
SystemHttpClient client = new SystemHttpClient();

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public void testHttpV1() {
6565
Configuration configuration = new Configuration.Builder()
6666
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
6767
.useConcurrentResumeUpload(true)
68-
.useHttps(false)
6968
.build();
7069
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
7170
for (int size : sizeArray) {
@@ -135,14 +134,12 @@ public void testNoKeyV1() {
135134
Configuration configurationHttp = new Configuration.Builder()
136135
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
137136
.useConcurrentResumeUpload(true)
138-
.useHttps(false)
139137
.build();
140138
uploadFileAndAssertSuccessResult(file, null, configurationHttp, null);
141139

142140
Configuration configurationHttps = new Configuration.Builder()
143141
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
144142
.useConcurrentResumeUpload(true)
145-
.useHttps(true)
146143
.build();
147144
uploadFileAndAssertSuccessResult(file, null, configurationHttps, null);
148145

@@ -226,7 +223,6 @@ public void testHttpV2() {
226223
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
227224
.useConcurrentResumeUpload(true)
228225
.chunkSize(4 * 1024 * 1024)
229-
.useHttps(false)
230226
.build();
231227
int[] sizeArray = {500, 2000, 4000, 5000, 8000, 20000};
232228
long timestamp = new Date().getTime();
@@ -298,7 +294,6 @@ public void testNoKeyV2() {
298294
Configuration configurationHttp = new Configuration.Builder()
299295
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
300296
.useConcurrentResumeUpload(true)
301-
.useHttps(false)
302297
.build();
303298
uploadFileAndAssertSuccessResult(file, null, configurationHttp, null);
304299

@@ -326,7 +321,6 @@ public void test0kV2() {
326321
Configuration configurationHttp = new Configuration.Builder()
327322
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
328323
.useConcurrentResumeUpload(true)
329-
.useHttps(false)
330324
.build();
331325
uploadFileAndAssertResult(ResponseInfo.ZeroSizeFile, file, key, configurationHttp, null);
332326

‎library/src/androidTest/java/com/qiniu/android/storage/FormUploadTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public void testHttp() {
6969
Configuration configuration = new Configuration.Builder()
7070
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
7171
.useConcurrentResumeUpload(true)
72-
.useHttps(false)
7372
.build();
7473
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
7574
for (int size : sizeArray) {
@@ -207,7 +206,6 @@ public void testUrlConvert() {
207206
}
208207

209208
Configuration configuration = new Configuration.Builder()
210-
.useHttps(false)
211209
.zone(new FixedZone(new String[]{"upnono-na0.qiniu.com", "upnono-na0.qiniu.com"}))
212210
.urlConverter(new UrlConverter() {
213211
@Override

‎library/src/androidTest/java/com/qiniu/android/storage/GlobalConfigurationTest.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import org.junit.Test;
99
import org.junit.runner.RunWith;
1010

11+
import java.util.Arrays;
12+
import java.util.List;
13+
1114

1215
/**
1316
* Created by yangsen on 2020/6/3
@@ -21,9 +24,12 @@ public void testUpload() {
2124
configuration.dohIpv4Servers = null;
2225
configuration.udpDnsIpv4Servers = null;
2326
configuration.connectCheckURLStrings = null;
24-
assertTrue("dohIpv4Servers cfg error", configuration.getDohIpv4Servers()[0].equals("https://8.8.8.8/dns-query"));
25-
assertTrue("udpDnsIpv4Servers cfg error", configuration.getUdpDnsIpv4Servers()[1].equals("8.8.8.8"));
26-
assertTrue("connectCheckURLStrings cfg error", configuration.getConnectCheckUrls()[0].equals("https://www.qiniu.com"));
27+
List<String> dohIpv4Servers = Arrays.asList(configuration.getDohIpv4Servers());
28+
List<String> udpDnsIpv4Servers = Arrays.asList(configuration.getUdpDnsIpv4Servers());
29+
List<String> connectCheckURLStrings = Arrays.asList(configuration.getConnectCheckUrls());
30+
assertTrue("dohIpv4Servers cfg error", dohIpv4Servers.contains("https://8.8.8.8/dns-query"));
31+
assertTrue("udpDnsIpv4Servers cfg error", udpDnsIpv4Servers.contains("8.8.8.8"));
32+
assertTrue("connectCheckURLStrings cfg error", connectCheckURLStrings.contains("https://www.qiniu.com"));
2733
}
2834

2935
}

‎library/src/androidTest/java/com/qiniu/android/storage/ResumeUploadTest.java‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ public void testHttpV1() {
6262
Configuration configuration = new Configuration.Builder()
6363
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
6464
.useConcurrentResumeUpload(false)
65-
.useHttps(false)
6665
.build();
6766
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
6867
for (int size : sizeArray) {
@@ -102,7 +101,6 @@ public void testReuploadV1() {
102101
Configuration configuration = new Configuration.Builder()
103102
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
104103
.useConcurrentResumeUpload(false)
105-
.useHttps(true)
106104
.chunkSize(1024 * 1024)
107105
.build();
108106
int[] sizeArray = {30000};
@@ -132,7 +130,6 @@ public void testNoKeyV1() {
132130
Configuration configurationHttp = new Configuration.Builder()
133131
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
134132
.useConcurrentResumeUpload(false)
135-
.useHttps(false)
136133
.build();
137134
uploadFileAndAssertSuccessResult(file, null, configurationHttp, null);
138135

@@ -191,7 +188,6 @@ public void testCustomParamV1() {
191188
Configuration configuration = new Configuration.Builder()
192189
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V1)
193190
.useConcurrentResumeUpload(false)
194-
.useHttps(false)
195191
.build();
196192

197193
String key = "android_resume_custom_param_v1";
@@ -254,7 +250,6 @@ public void testHttpV2() {
254250
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
255251
.useConcurrentResumeUpload(false)
256252
.chunkSize(4 * 1024 * 1024)
257-
.useHttps(false)
258253
.build();
259254
int[] sizeArray = {500, 1000, 3000, 4000, 5000, 8000, 10000, 20000};
260255
for (int size : sizeArray) {
@@ -295,7 +290,6 @@ public void testReuploadV2() {
295290
Configuration configuration = new Configuration.Builder()
296291
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
297292
.useConcurrentResumeUpload(false)
298-
.useHttps(true)
299293
.chunkSize(4 * 1024 * 1024)
300294
.build();
301295
int[] sizeArray = {30000};
@@ -325,7 +319,6 @@ public void testNoKeyV2() {
325319
Configuration configurationHttp = new Configuration.Builder()
326320
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
327321
.useConcurrentResumeUpload(false)
328-
.useHttps(false)
329322
.build();
330323
uploadFileAndAssertSuccessResult(file, null, configurationHttp, null);
331324

@@ -353,7 +346,6 @@ public void test0kV2() {
353346
Configuration configurationHttp = new Configuration.Builder()
354347
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
355348
.useConcurrentResumeUpload(false)
356-
.useHttps(false)
357349
.build();
358350
uploadFileAndAssertResult(ResponseInfo.ZeroSizeFile, file, key, configurationHttp, null);
359351

@@ -385,7 +377,6 @@ public void testCustomParamV2() {
385377
.resumeUploadVersion(Configuration.RESUME_UPLOAD_VERSION_V2)
386378
.useConcurrentResumeUpload(false)
387379
.chunkSize(4 * 1024 * 1024)
388-
.useHttps(false)
389380
.build();
390381

391382
String key = "android_resume_custom_param_v2";

0 commit comments

Comments
 (0)