提交 d9581f4e 编写于 作者: W weier

Signed-off-by: weier <duanlinrang@huawei.com>

 Changes to be committed:
上级 12f49a2d
...@@ -31,15 +31,19 @@ function getUploadConfig(fileurl){ ...@@ -31,15 +31,19 @@ function getUploadConfig(fileurl){
let File = { let File = {
filename: 'test', // When multipart is submitted, the file name in the request header. filename: 'test', // When multipart is submitted, the file name in the request header.
name: 'test', // When multipart is submitted, the name of the form item. The default is file. name: 'test', // When multipart is submitted, the name of the form item. The default is file.
uri: 'internal://cache/test.txt',//The local storage path of the file (please refer to the storage directory definition for path usage). uri: 'internal://cache/test.txt',
type: 'txt'//The content type of the file is obtained by default according to the suffix of the file name or path. //The local storage path of the file
// (please refer to the storage directory definition for path usage).
type: 'txt'
//The content type of the file is obtained by default
// according to the suffix of the file name or path.
} }
let FileArray=new Array(); let FileArray=new Array();
FileArray[0] = File; FileArray[0] = File;
let header_http = { headers: 'http' } let Header_Http = { headers: 'http' }
let UploadConfig = { let UploadConfig = {
url: 'http://192.168.112.124/upload_test/',// Resource address. url: 'http://192.168.112.124/upload_test/',// Resource address.
header: header_http, // Adds an HTTP or HTTPS header to be included with the upload request. header: Header_Http, // Adds an HTTP or HTTPS header to be included with the upload request.
method: 'POST', // Request method: POST, PUT. The default POST. method: 'POST', // Request method: POST, PUT. The default POST.
files: FileArray, // A list of files to be uploaded. Please use multipart/form-data to submit. files: FileArray, // A list of files to be uploaded. Please use multipart/form-data to submit.
data: RequestData // The requested form data. data: RequestData // The requested form data.
......
...@@ -17,27 +17,28 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from ' ...@@ -17,27 +17,28 @@ import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from '
import request from '@ohos.request'; import request from '@ohos.request';
import * as pubfun from './Publicfunction.js' import * as pubfun from './Publicfunction.js'
var type_progress = 'progress'; var Type_Progress = 'progress';
var type_HeaderReceive = 'headerReceive'; var Type_HeaderReceive = 'headerReceive';
var type_Fail = 'fail'; var Type_Fail = 'fail';
let uploadTask; let uploadTask;
let file7url = 'internal://cache/test.txt'; let file7url = 'internal://cache/test.txt';
//let file10kurl = '';
//let file10murl = '';
// var shell = require('shelljs')
describe('UploadTest', function () { describe('UploadTest', function () {
beforeAll(function () { beforeAll(function () {
console.info('beforeAll: Prerequisites at the test suite level, which are executed before the test suite is executed.'); console.info('beforeAll: Prerequisites at the test suite level, ' +
'which are executed before the test suite is executed.');
}) })
beforeEach(function () { beforeEach(function () {
console.info('beforeEach: Prerequisites at the test case level, which are executed before each test case is executed.'); console.info('beforeEach: Prerequisites at the test case level,' +
' which are executed before each test case is executed.');
}) })
afterEach(function () { afterEach(function () {
console.info('afterEach: Test case-level clearance conditions, which are executed after each test case is executed.'); console.info('afterEach: Test case-level clearance conditions, ' +
'which are executed after each test case is executed.');
}) })
afterAll(function () { afterAll(function () {
console.info('afterAll: Test suite-level cleanup condition, which is executed after the test suite is executed'); console.info('afterAll: Test suite-level cleanup condition, ' +
'which is executed after the test suite is executed');
}) })
/* /*
* @tc.number : InitUploadtaskCallback001 * @tc.number : InitUploadtaskCallback001
...@@ -49,12 +50,6 @@ describe('UploadTest', function () { ...@@ -49,12 +50,6 @@ describe('UploadTest', function () {
*/ */
it('InitUploadtaskCallback001', 0, async function (done) { it('InitUploadtaskCallback001', 0, async function (done) {
try { try {
// const cmd = `echo \"123456\" > /data/accounts/account_0/appdata/com.example.myapplication.hmservice/cache/test.txt`;
// shell.exec(cmd, (err) => {
// if (err) {
// throw Error(err).message;
// }
// })
console.log("Testupdate before getuploadconfig"); console.log("Testupdate before getuploadconfig");
let UploadConfig = pubfun.getUploadConfig(file7url) let UploadConfig = pubfun.getUploadConfig(file7url)
console.log("Testupdate before upload UploadConfig = " + JSON.stringify(UploadConfig)); console.log("Testupdate before upload UploadConfig = " + JSON.stringify(UploadConfig));
...@@ -75,6 +70,7 @@ describe('UploadTest', function () { ...@@ -75,6 +70,7 @@ describe('UploadTest', function () {
done(); done();
} }
}) })
/* /*
* @tc.number : SwitchOnProgressCallback001 * @tc.number : SwitchOnProgressCallback001
* @tc.name : Use getEntries get the value by mixing the string key * @tc.name : Use getEntries get the value by mixing the string key
...@@ -85,18 +81,7 @@ describe('UploadTest', function () { ...@@ -85,18 +81,7 @@ describe('UploadTest', function () {
*/ */
it('SwitchOnProgressCallback001', 0, async function (done) { it('SwitchOnProgressCallback001', 0, async function (done) {
try { try {
/*console.log("Testupdate before getuploadconfig"); pubfun.publiconprogress(uploadTask, Type_Progress);
let UploadConfig = pubfun.getUploadConfig(file7url)
console.log("Testupdate before upload UploadConfig = " + JSON.stringify(UploadConfig));
console.log("Testupdate before upload");
await pubfun.publicupload(UploadConfig).then((data) => {
console.log("Testupdate going upload uploadTask = " + data);
uploadTask = data;
}).catch((err) => {
console.log("SwitchOnProgressCallback001 fail" + JSON.stringify(err));
})*/
pubfun.publiconprogress(uploadTask, type_progress);
expect(true).assertEqual(0 == 0); expect(true).assertEqual(0 == 0);
done(); done();
} catch (err) { } catch (err) {
...@@ -105,6 +90,7 @@ describe('UploadTest', function () { ...@@ -105,6 +90,7 @@ describe('UploadTest', function () {
done(); done();
} }
}); });
/* /*
* @tc.number : SwitchOffProgressCallback001 * @tc.number : SwitchOffProgressCallback001
* @tc.name : Use getEntries get the value by mixing the string key * @tc.name : Use getEntries get the value by mixing the string key
...@@ -115,17 +101,10 @@ describe('UploadTest', function () { ...@@ -115,17 +101,10 @@ describe('UploadTest', function () {
*/ */
it('SwitchOffProgressCallback001', 0, async function (done) { it('SwitchOffProgressCallback001', 0, async function (done) {
try { try {
/*let UploadConfig = pubfun.getUploadConfig(file7url) pubfun.publiconprogress(uploadTask, Type_Progress);
await pubfun.publicupload(UploadConfig).then((data) => {
uploadTask = data;
}).catch((err) => {
console.log("SwitchOffProgressCallback001 fail 1" + JSON.stringify(err));
})*/
pubfun.publiconprogress(uploadTask, type_progress);
expect(true).assertEqual(0 == 0); expect(true).assertEqual(0 == 0);
await pubfun.publicoffprogress(uploadTask, type_progress).then((data) => { await pubfun.publicoffprogress(uploadTask, Type_Progress).then((data) => {
console.log("SwitchOffProgressCallback001 data" + JSON.stringify(data)); console.log("SwitchOffProgressCallback001 data" + JSON.stringify(data));
expect(7).assertEqual(data.totalSize); expect(7).assertEqual(data.totalSize);
done(); done();
...@@ -140,62 +119,7 @@ describe('UploadTest', function () { ...@@ -140,62 +119,7 @@ describe('UploadTest', function () {
done(); done();
} }
}) })
/*
* @tc.number : SwitchOnHeaderReceiveCallback001
* @tc.name : Use getEntries get the value by mixing the string key
* @tc.desc : Mixed strings value can be obtained correctly
* @tc.size : MediumTest
* @tc.type : Function
* @tc.level : Level 1
*/
/*it('SwitchOnHeaderReceiveCallback001', 0, async function (done) {
try {
let UploadConfig = pubfun.getUploadConfig(file7url)
await pubfun.publicupload(UploadConfig).then((data) => {
uploadTask = data;
}).catch((err) => {
console.log("SwitchOnHeaderReceiveCallback001 fail 1" + JSON.stringify(err));
})
await pubfun.publicon(uploadTask,type_HeaderReceive).then((data) => {
console.info("upOnHeader headers:" + JSON.stringify(data));
expect('待确认').assertEqual(data);
done();
}).catch((err) => {
console.log("SwitchOnHeaderReceiveCallback001 fail 2" + JSON.stringify(err));
})
} catch (e) {
console.log("SwitchOnHeaderReceiveCallback001 fail 3" + JSON.stringify(e));
expect(null).assertFail();
}
})
/*
* @tc.number : SwitchOffHeaderReceiveCallback001
* @tc.name : Use getEntries get the value by mixing the string key
* @tc.desc : Mixed strings value can be obtained correctly
* @tc.size : MediumTest
* @tc.type : Function
* @tc.level : Level 1
*/
/*it('SwitchOffHeaderReceiveCallback001', 0, async function (done) {
try {
let UploadConfig = pubfun.getUploadConfig(file7url)
await pubfun.publicupload(UploadConfig).then((data) => {
uploadTask = data;
}).catch((err) => {
console.log("SwitchOffHeaderReceiveCallback001 fail 1" + JSON.stringify(err));
})
await pubfun.publicoff(uploadTask,type_HeaderReceive).then((data) => {
console.info("upOnHeader headers:" + JSON.stringify(data));
expect('待确认').assertEqual(data);
done();
}).catch((err) => {
console.log("SwitchOffHeaderReceiveCallback001 fail 2" + JSON.stringify(err));
})
} catch (e) {
console.log("SwitchOffHeaderReceiveCallback001 fail 3" + JSON.stringify(e));
expect(null).assertFail();
}
})
/* /*
* @tc.number : SwitchOnFailCallback001 * @tc.number : SwitchOnFailCallback001
* @tc.name : Use getEntries get the value by mixing the string key * @tc.name : Use getEntries get the value by mixing the string key
...@@ -206,14 +130,7 @@ describe('UploadTest', function () { ...@@ -206,14 +130,7 @@ describe('UploadTest', function () {
*/ */
it('SwitchOnFailCallback001', 0, async function (done) { it('SwitchOnFailCallback001', 0, async function (done) {
try { try {
/*let UploadConfig = pubfun.getUploadConfig(file7url) await pubfun.publicon(uploadTask, Type_Fail).then((data) => {
await pubfun.publicupload(UploadConfig).then((data) => {
uploadTask = data;
}).catch((err) => {
console.log("SwitchOnFailCallback001 fail 1" + JSON.stringify(err));
})*/
await pubfun.publicon(uploadTask, type_Fail).then((data) => {
console.log("SwitchOnFailCallback001 data " + data); console.log("SwitchOnFailCallback001 data " + data);
expect(5).assertEqual(data); expect(5).assertEqual(data);
done(); done();
...@@ -228,6 +145,7 @@ describe('UploadTest', function () { ...@@ -228,6 +145,7 @@ describe('UploadTest', function () {
done(); done();
} }
}) })
/* /*
* @tc.number : SwitchOffFailCallback001 * @tc.number : SwitchOffFailCallback001
* @tc.name : Use getEntries get the value by mixing the string key * @tc.name : Use getEntries get the value by mixing the string key
...@@ -238,15 +156,8 @@ describe('UploadTest', function () { ...@@ -238,15 +156,8 @@ describe('UploadTest', function () {
*/ */
it('SwitchOffFailCallback001', 0, async function (done) { it('SwitchOffFailCallback001', 0, async function (done) {
try { try {
/*let UploadConfig = pubfun.getUploadConfig(file7url) await pubfun.publicon(uploadTask, Type_Fail)
await pubfun.publicupload(UploadConfig).then((data) => { await pubfun.publicoff(uploadTask, Type_Fail).then((data) => {
uploadTask = data;
}).catch((err) => {
console.log("SwitchOffFailCallback001 fail 1" + JSON.stringify(err));
})*/
await pubfun.publicon(uploadTask, type_Fail)
await pubfun.publicoff(uploadTask, type_Fail).then((data) => {
console.log("SwitchOffFailCallback001 data " + data); console.log("SwitchOffFailCallback001 data " + data);
expect(5).assertEqual(data); expect(5).assertEqual(data);
done(); done();
...@@ -261,6 +172,7 @@ describe('UploadTest', function () { ...@@ -261,6 +172,7 @@ describe('UploadTest', function () {
done(); done();
} }
}) })
/* /*
* @tc.number : RemoveCallback001 * @tc.number : RemoveCallback001
* @tc.name : Use getEntries get the value by mixing the string key * @tc.name : Use getEntries get the value by mixing the string key
...@@ -271,13 +183,6 @@ describe('UploadTest', function () { ...@@ -271,13 +183,6 @@ describe('UploadTest', function () {
*/ */
it('RemoveCallback001', 0, async function (done) { it('RemoveCallback001', 0, async function (done) {
try { try {
/*let UploadConfig = pubfun.getUploadConfig(file7url)
await pubfun.publicupload(UploadConfig).then((data) => {
uploadTask = data;
}).catch((err) => {
console.log("RemoveCallback001 fail 1" + JSON.stringify(err));
})*/
await pubfun.publicremove(uploadTask).then((data) => { await pubfun.publicremove(uploadTask).then((data) => {
console.log("RemoveCallback001 data " + data); console.log("RemoveCallback001 data " + data);
expect(true).assertEqual(data); expect(true).assertEqual(data);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册