Skip to content

X
Xts Acts

OpenHarmony / Xts Acts
1 年多 前同步成功

通知 9
Star 22
Fork 0
X
Xts Acts
提交 5bad233e 编写于 作者: R r00559040
浏览文件
操作

内源问题修改 

Signed-off-by: Nr00559040 <ry.renyi@huawei.com>
上级 55a97272
隐藏空白更改
内联 并排
Showing with 115 addition and 227 deletion
appexecfwk/bundle_standard/bundlemanager/actsbundlemanageruninstall/entry/src/main/js/test/ExampleJsunit.test.js
浏览文件 @ 5bad233e
......@@ -19,6 +19,7 @@ import demo from '@ohos.bundle'
const PATH = "/data/"
const ERROR = "error.hap"
const BMSJSTEST1 = "bmsJstest1.hap"
const BMSJSTEST2 = "bmsJstest2.hap"
const BMSJSTEST3 = "bmsJstest3.hap"
const BMSJSTEST4 = "bmsJstest4.hap"
const BMSJSTEST5 = "bmsJstest5.hap"
......@@ -31,12 +32,12 @@ const NAME4 = "com.example.myapplication5"
const NAME5 = "com.example.myapplication6"
const THIRD1 = "com.example.third1"
const LAUNCHER = "com.ohos.launcher"
const OBJECT = "object"
const SUCCESS = "SUCCESS"
const START_ABILITY_TIMEOUT = 3000;
const ERR_CODE = -1;
const STATUS_INSTALL_FAILURE_INVALID = 3;
const STATUS_INSTALL_FAILURE_CONFLICT = 4;
let installParam = {
userId: 100,
installFlag: 1,
isKeepData: false
}
describe('ActsBundleManagerUninstall', function () {
......@@ -46,34 +47,16 @@ describe('ActsBundleManagerUninstall', function () {
* @tc.desc Test uninstall interfaces.
*/
it('uninstall_0100', 0, async function (done) {
let installData = await demo.getBundleInstaller();
installData.install([PATH + BMSJSTEST1], {
userId: 100,
installFlag: 1,
isKeepData: false
}, async (err, data) => {
expect(err.code).assertEqual(0);
expect(data.status).assertEqual(0);
expect(data.statusMessage).assertEqual('SUCCESS');
let datainfo1 = await demo.getBundleInfo(NAME1, 1);
expect(datainfo1.name).assertEqual(NAME1);
installData.uninstall(NAME1, {
userId: 100,
installFlag: 1,
isKeepData: false
}, async (err, data) => {
expect(err.code).assertEqual(0);
expect(data.statusMessage).assertEqual('SUCCESS');
await demo.getBundleInfo(NAME1, 1).then(datainfo => {
expect(datainfo).assertFail()
done();
}).catch(err => {
expect(err).assertEqual(1)
done()
});
let installData = await demo.getBundleInstaller()
installData.install([PATH + BMSJSTEST1], installParam, async (err, data) => {
checkInstallResult(data)
await queryInfo(NAME1, 0)
installData.uninstall(NAME1, installParam, async (err, data) => {
checkInstallResult(data)
await queryInfo(NAME1, 1)
done()
})
});
})
})
/**
......@@ -83,52 +66,16 @@ describe('ActsBundleManagerUninstall', function () {
*/
it('uninstall_0200', 0, async function (done) {
let installData = await demo.getBundleInstaller()
installData.install([PATH + BMSJSTEST1, PATH + BMSJSTEST3], {
userId: 100,
installFlag: 1,
isKeepData: false
}, async (err, data) => {
expect(err.code).assertEqual(ERR_CODE);
expect(data.status).assertEqual(STATUS_INSTALL_FAILURE_CONFLICT);
expect(data.statusMessage).assertEqual('STATUS_INSTALL_FAILURE_CONFLICT');
let datainfo1 = demo.getBundleInfo(NAME1, 1);
datainfo1.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
let datainfo2 = demo.getBundleInfo(NAME2, 1);
datainfo2.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
installData.uninstall(NAME1, {
userId: 100,
installFlag: 1,
isKeepData: false
}, async(err, data) => {
let datainfo3 = demo.getBundleInfo(NAME1, 1);
datainfo3.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
installData.uninstall(NAME2, {
userId: 100,
installFlag: 1,
isKeepData: false
}, async(err, data) => {
let datainfo4 = demo.getBundleInfo(NAME2, 1);
datainfo4.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
done();
})
installData.install([PATH + BMSJSTEST2, PATH + BMSJSTEST3], installParam, async (err, data) => {
checkInstallResult(data)
let bundleInfo = await demo.getBundleInfo(NAME2, demo.BundleFlag.GET_BUNDLE_DEFAULT);
expect(bundleInfo.appInfo.moduleSourceDirs.length).assertEqual(2)
installData.uninstall(NAME2, installParam, async(err, data) => {
checkInstallResult(data)
await queryInfo(NAME2, 1)
done()
})
});
})
})
/**
......@@ -138,71 +85,32 @@ describe('ActsBundleManagerUninstall', function () {
*/
it('uninstall_0300', 0, async function (done) {
let installData = await demo.getBundleInstaller()
installData.install([PATH + BMSJSTEST4, PATH + BMSJSTEST5, PATH + BMSJSTEST6], {
userId: 100,
installFlag: 1,
isKeepData: false
}, async (err, data) => {
expect(err.code).assertEqual(ERR_CODE);
expect(data.status).assertEqual(STATUS_INSTALL_FAILURE_INVALID);
expect(data.statusMessage).assertEqual('STATUS_INSTALL_FAILURE_INVALID');
let datainfo1 = demo.getBundleInfo(NAME3, 1);
datainfo1.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
let datainfo2 = demo.getBundleInfo(NAME4, 1);
datainfo2.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
let datainfo3 = demo.getBundleInfo(NAME5, 1);
datainfo3.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
installData.uninstall(NAME3, {
userId: 100,
installFlag: 1,
isKeepData: false
}, async(err, data) => {
let datainfo4 = demo.getBundleInfo(NAME3, 1);
datainfo4.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
installData.uninstall(NAME4, {
userId: 100,
installFlag: 1,
isKeepData: false
}, async(err, data) => {
let datainfo5 = demo.getBundleInfo(NAME4, 1);
datainfo5.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
installData.uninstall(NAME5, {
userId: 100,
installFlag: 1,
isKeepData: false
}, async(err, data) => {
let datainfo6 = demo.getBundleInfo(NAME5, 1);
datainfo6.then(data => {
expect().assertFail();
}).catch(err => {
expect(err).assertEqual(1);
});
done();
});
});
});
});
});
installData.install([PATH + BMSJSTEST4], installParam, async (err, data) => {
checkInstallResult(data)
installData.install([PATH + BMSJSTEST5], installParam, async (err, data) => {
checkInstallResult(data)
installData.install([PATH + BMSJSTEST6], installParam, async (err, data) => {
checkInstallResult(data)
await queryInfo(NAME3, 0)
await queryInfo(NAME4, 0)
await queryInfo(NAME5, 0)
installData.uninstall(NAME3, installParam, async (err, data) => {
checkInstallResult(data)
installData.uninstall(NAME4, installParam, async (err, data) => {
checkInstallResult(data)
installData.uninstall(NAME5, installParam, async (err, data) => {
checkInstallResult(data)
await queryInfo(NAME3, 1)
await queryInfo(NAME4, 1)
await queryInfo(NAME5, 1)
done()
})
})
})
})
})
})
})
/**
* @tc.number uninstall_0400
......@@ -211,18 +119,12 @@ describe('ActsBundleManagerUninstall', function () {
*/
it('uninstall_0400', 0, async function (done) {
demo.getBundleInstaller().then((data) => {
data.uninstall(ERROR, {
userId: 100,
installFlag: 1,
isKeepData: false
}, OnReceiveinstallEvent);
function OnReceiveinstallEvent(err, data) {
expect(typeof data).assertEqual(OBJECT);
expect(data.statusMessage).assertEqual("STATUS_UNINSTALL_FAILURE");
done();
}
});
data.uninstall(ERROR, installParam, (err, data) => {
expect(data.status).assertEqual(demo.InstallErrorCode.STATUS_UNINSTALL_FAILURE)
expect(data.statusMessage).assertEqual("STATUS_UNINSTALL_FAILURE")
done()
})
})
})
/**
......@@ -232,19 +134,12 @@ describe('ActsBundleManagerUninstall', function () {
*/
it('uninstall_0500', 0, async function (done) {
demo.getBundleInstaller().then((data) => {
data.uninstall('', {
userId: 100,
installFlag: 1,
isKeepData: false
}, OnReceiveinstallEvent);
function OnReceiveinstallEvent(err, data) {
expect(typeof data).assertEqual(OBJECT);
console.info('======data.statusMessage=====' + JSON.stringify(data.statusMessage));
expect(data.statusMessage).assertEqual("STATUS_UNINSTALL_FAILURE_ABORTED");
done();
}
});
data.uninstall('', installParam, (err, data) => {
expect(data.status).assertEqual(demo.InstallErrorCode.STATUS_UNINSTALL_FAILURE_ABORTED)
expect(data.statusMessage).assertEqual("STATUS_UNINSTALL_FAILURE_ABORTED")
done()
})
})
})
/**
......@@ -254,19 +149,12 @@ describe('ActsBundleManagerUninstall', function () {
*/
it('uninstall_0600', 0, async function (done) {
demo.getBundleInstaller().then((data) => {
data.uninstall(LAUNCHER, {
userId: 100,
installFlag: 1,
isKeepData: false
}, OnReceiveinstallEvent);
function OnReceiveinstallEvent(err, data) {
expect(typeof data).assertEqual(OBJECT);
console.info('======data.statusMessage=====' + JSON.stringify(data.statusMessage));
expect(data.statusMessage).assertEqual("STATUS_UNINSTALL_FAILURE_CONFLICT");
done();
}
});
data.uninstall(LAUNCHER, installParam, (err, data) => {
expect(data.status).assertEqual(demo.InstallErrorCode.STATUS_UNINSTALL_FAILURE_CONFLICT)
expect(data.statusMessage).assertEqual("STATUS_UNINSTALL_FAILURE_CONFLICT")
done()
})
})
})
/**
......@@ -280,30 +168,15 @@ describe('ActsBundleManagerUninstall', function () {
userId: 100,
installFlag: 1,
isKeepData: true
}, OnReceiveinstallEvent);
async function OnReceiveinstallEvent(err, data) {
expect(typeof data).assertEqual(OBJECT);
expect(data.statusMessage).assertEqual(SUCCESS);
await demo.getBundleInfo(NAME1, 1).then(datainfo1 => {
expect(datainfo1.name).assertEqual(NAME1);
}).catch(err => {
expect(err).assertFail();
});
result.uninstall(NAME1, {
userId: 100,
installFlag: 1,
isKeepData: false
}, async(err, data) => {
expect(data.statusMessage).assertEqual(SUCCESS);
await demo.getBundleInfo(NAME1, 1).then(datainfo2 => {
expect(datainfo2).assertFail();
done();
}).catch(err => {
expect(err).assertEqual(1);
done();
});
});
}
}, async (err, data) => {
checkInstallResult(data)
await queryInfo(NAME1, 0)
result.uninstall(NAME1, installParam, async (err, data) => {
checkInstallResult(data)
await queryInfo(NAME1, 1)
done()
})
})
})
/**
......@@ -313,28 +186,43 @@ describe('ActsBundleManagerUninstall', function () {
*/
it('uninstall_0800', 0, async function (done) {
let installData = await demo.getBundleInstaller();
installData.install([PATH + BMSJSTEST8], {
userId: 100,
installFlag: 1,
isKeepData: false
}, async (err, data) => {
expect(err.code).assertEqual(0);
expect(data.status).assertEqual(0);
expect(data.statusMessage).assertEqual('SUCCESS');
let bundleInfo = await demo.getBundleInfo('com.example.third1', 1);
installData.install([PATH + BMSJSTEST8], installParam, async (err, data) => {
checkInstallResult(data)
let bundleInfo = await demo.getBundleInfo('com.example.third1', demo.BundleFlag.GET_BUNDLE_DEFAULT);
expect(bundleInfo.uid).assertLarger(10000);
installData.uninstall(THIRD1, {
userId: 100,
installFlag: 1,
isKeepData: false
}, async(err, data) => {
expect(err.code).assertEqual(0);
expect(data.status).assertEqual(0);
expect(data.statusMessage == "SUCCESS").assertTrue();
done();
});
});
installData.uninstall(THIRD1, installParam, async (err, data) => {
checkInstallResult(data)
await queryInfo('com.example.third1', 1)
done()
})
})
})
})
async function queryInfo(bundleName, assertFlag){
if (!assertFlag) {
await demo.getBundleInfo(bundleName, demo.BundleFlag.GET_BUNDLE_DEFAULT
).then(datainfo => {
console.info("getBundleInfo result0"+JSON.stringify(datainfo))
expect(datainfo.name).assertEqual(bundleName)
}).catch(err => {
console.info("getBundleInfo result0"+JSON.stringify(datainfo))
expect(err).assertFail()
})
} else {
await demo.getBundleInfo(bundleName, demo.BundleFlag.GET_BUNDLE_DEFAULT
).then(datainfo => {
console.info("getBundleInfo result1"+JSON.stringify(datainfo))
expect(datainfo).assertFail()
}).catch(err => {
console.info("getBundleInfo result1"+JSON.stringify(err))
expect(err).assertEqual(1)
})
}
}
function checkInstallResult(result) {
console.info("install uninstall result" + JSON.stringify(result))
expect(result.status).assertEqual(demo.InstallErrorCode.SUCCESS)
expect(result.statusMessage).assertEqual(SUCCESS)
}
})
\ No newline at end of file
appexecfwk/zlib/actszlibtest/ActsZlibTest.cpp
浏览文件 @ 5bad233e
......@@ -1331,7 +1331,7 @@ HWTEST_F(ActsZlibTest, ActsZlibTestInflateCodesUsed, Function | MediumTest | Lev
compr = static_cast<Byte*>(calloc(static_cast<uInt>(comprLen), CALLOC_SIZE));
uncompr = static_cast<Byte*>(calloc(static_cast<uInt>(uncomprLen), CALLOC_SIZE));
ASSERT_TRUE(compr != Z_NULL && uncompr != Z_NULL);
unsigned int64_t err;
unsigned uint64_t err;
z_stream d_stream; /* decompression stream */
strcpy(reinterpret_cast<char *>(uncompr), GARBAGE);
d_stream.zalloc = nullptr;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或