openharmony/print_print_fwk
1
0
Fork 0
mirror of https://gitee.com/openharmony/print_print_fwk synced 2024-11-23 17:09:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!470 将关机状态归到不可用状态

Browse Source 
Merge pull request !470 from liuwenfeng/master
This commit is contained in:
openharmony_ci 2024-11-02 07:30:48 +00:00 committed by Gitee
commit 6dd914a88b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
services/print_service/src/vendor_helper.cpp
View File

@ -104,6 +104,15 @@ bool ConvertJsonToStringList(const std::string &jsonString, std::vector<std::str
return true;
}
std::string GetStringValueFromJson(const nlohmann::json &jsonObject, const std::string &key)
{
if (!jsonObject.contains(key) || !jsonObject[key].is_string()) {
PRINT_HILOGW("can not find %{public}s", key.c_str());
return "";
}
return jsonObject[key].get<std::string>();
}
bool ConvertStringToLong(const char *src, long &dst)
{
if (src == nullptr) {
@ -164,24 +173,24 @@ bool ConvertQualityToJson(const Print_Quality &code, nlohmann::json &jsonObject)
bool ConvertStringToPrinterState(const std::string &stateData, Print_PrinterState &state)
{
long result = 0;
if (!ConvertStringToLong(stateData.c_str(), result)) {
if (!nlohmann::json::accept(stateData)) {
PRINT_HILOGW("invalid stateData");
return false;
}
nlohmann::json jsonObject = nlohmann::json::parse(stateData, nullptr, false);
if (jsonObject.is_discarded()) {
PRINT_HILOGW("stateData discarded");
return false;
}
if (!jsonObject.contains("state") || !jsonObject["state"].is_string()) {
PRINT_HILOGW("can not find state");
return false;
}
std::string stateValue = jsonObject["state"].get<std::string>();
if (!ConvertStringToLong(stateValue.c_str(), result)) {
return false;
}
if (!nlohmann::json::accept(stateData)) {
PRINT_HILOGW("invalid stateData");
return false;
}
nlohmann::json jsonObject = nlohmann::json::parse(stateData, nullptr, false);
if (jsonObject.is_discarded()) {
PRINT_HILOGW("stateData discarded");
return false;
}
std::string stateValue = GetStringValueFromJson(jsonObject, "state");
if (!ConvertStringToLong(stateValue.c_str(), result)) {
return false;
}
std::string reasonValue = GetStringValueFromJson(jsonObject, "reason");
if (reasonValue == "shutdown") {
PRINT_HILOGD("printer shutdown");
state = PRINTER_UNAVAILABLE;
return true;
}
if (result < 0 || result > PRINTER_UNAVAILABLE + 1) {
PRINT_HILOGW("invalid state");

12
test/unittest/fwk_vendor_manager_test/vendor_helper_test.cpp
View File

@ -165,16 +165,14 @@ HWTEST_F(VendorHelperTest, VendorHelperTest_0004, TestSize.Level1)
{
Print_PrinterState state = PRINTER_UNAVAILABLE;
EXPECT_FALSE(ConvertStringToPrinterState("-1", state));
EXPECT_FALSE(ConvertStringToPrinterState("12", state));
EXPECT_FALSE(ConvertStringToPrinterState("", state));
EXPECT_TRUE(ConvertStringToPrinterState("0", state));
EXPECT_EQ(state, PRINTER_IDLE);
EXPECT_TRUE(ConvertStringToPrinterState("2", state));
EXPECT_EQ(state, PRINTER_IDLE);
EXPECT_FALSE(ConvertStringToPrinterState("\"state\"", state));
EXPECT_FALSE(ConvertStringToPrinterState("{\"state\":2}", state));
EXPECT_TRUE(ConvertStringToPrinterState("{\"state\":\"2\"}", state));
EXPECT_TRUE(ConvertStringToPrinterState("{\"state\":\"0\"}", state));
EXPECT_EQ(state, PRINTER_IDLE);
EXPECT_TRUE(ConvertStringToPrinterState("{\"state\":\"1\"，\"reason\":\"none\"}", state));
EXPECT_EQ(state, PRINTER_BUSY);
EXPECT_TRUE(ConvertStringToPrinterState("{\"state\":\"2\"，\"reason\":\"shutdown\"}", state));
EXPECT_EQ(state, PRINTER_UNAVAILABLE);
}
HWTEST_F(VendorHelperTest, VendorHelperTest_0005, TestSize.Level1)