mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update WidgetDefinitionTest for RadioButton and button value

Browse Source 
Change-Id: I04fde55661f81d3d230cda3eb5cc2dcec72a1309
Reviewed-on: https://gerrit.libreoffice.org/68655
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Tomaž Vajngerl
2019-01-23 09:50:28 +01:00
committed by Tomaž Vajngerl
parent f08c5964f6
commit 2e77a44ea1
2 changed files with 111 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
vcl/qa/cppunit/widgetdraw/WidgetDefinitionReaderTest.cxx
View File

@@ -37,19 +37,52 @@ public:
void WidgetDefinitionReaderTest::testRead() void WidgetDefinitionReaderTest::testRead()
{ {
vcl::WidgetDefinitionReader aWidgetDefinitionReader(getFullUrl("definition1.xml")); vcl::WidgetDefinitionReader aReader(getFullUrl("definition1.xml"));
CPPUNIT_ASSERT_EQUAL(OUString("000000"), aWidgetDefinitionReader.maFaceColor.AsRGBHexString()); CPPUNIT_ASSERT_EQUAL(OUString("000000"), aReader.maFaceColor.AsRGBHexString());
CPPUNIT_ASSERT_EQUAL(OUString("000000"), CPPUNIT_ASSERT_EQUAL(OUString("000000"), aReader.maCheckedColor.AsRGBHexString());
aWidgetDefinitionReader.maCheckedColor.AsRGBHexString()); CPPUNIT_ASSERT_EQUAL(OUString("000000"), aReader.maLightColor.AsRGBHexString());
CPPUNIT_ASSERT_EQUAL(OUString("000000"), aWidgetDefinitionReader.maLightColor.AsRGBHexString());
aWidgetDefinitionReader.read(); aReader.read();
CPPUNIT_ASSERT_EQUAL(OUString("f7f7f7"), aWidgetDefinitionReader.maFaceColor.AsRGBHexString()); CPPUNIT_ASSERT_EQUAL(OUString("123456"), aReader.maFaceColor.AsRGBHexString());
CPPUNIT_ASSERT_EQUAL(OUString("c0c0c0"), CPPUNIT_ASSERT_EQUAL(OUString("234567"), aReader.maCheckedColor.AsRGBHexString());
aWidgetDefinitionReader.maCheckedColor.AsRGBHexString()); CPPUNIT_ASSERT_EQUAL(OUString("345678"), aReader.maLightColor.AsRGBHexString());
CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aWidgetDefinitionReader.maLightColor.AsRGBHexString());
CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aReader.maVisitedLinkColor.AsRGBHexString());
CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aReader.maToolTextColor.AsRGBHexString());
CPPUNIT_ASSERT_EQUAL(OUString("ffffff"), aReader.maFontColor.AsRGBHexString());
{
std::vector<std::shared_ptr<vcl::WidgetDefinitionState>> aStates
= aReader.getPushButtonDefinition(ControlPart::Entire)
->getStates(ControlState::DEFAULT | ControlState::ENABLED
| ControlState::ROLLOVER,
ImplControlValue());
CPPUNIT_ASSERT_EQUAL(size_t(2), aStates.size());
CPPUNIT_ASSERT_EQUAL(size_t(2), aStates[0]->mpDrawCommands.size());
CPPUNIT_ASSERT_EQUAL(vcl::DrawCommandType::RECTANGLE,
aStates[0]->mpDrawCommands[0]->maType);
CPPUNIT_ASSERT_EQUAL(vcl::DrawCommandType::CIRCLE, aStates[0]->mpDrawCommands[1]->maType);
}
{
std::vector<std::shared_ptr<vcl::WidgetDefinitionState>> aStates
= aReader.getRadioButtonDefinition(ControlPart::Entire)
->getStates(ControlState::NONE, ImplControlValue(ButtonValue::On));
CPPUNIT_ASSERT_EQUAL(size_t(1), aStates.size());
CPPUNIT_ASSERT_EQUAL(size_t(2), aStates[0]->mpDrawCommands.size());
}
{
std::vector<std::shared_ptr<vcl::WidgetDefinitionState>> aStates
= aReader.getRadioButtonDefinition(ControlPart::Entire)
->getStates(ControlState::NONE, ImplControlValue(ButtonValue::Off));
CPPUNIT_ASSERT_EQUAL(size_t(1), aStates.size());
CPPUNIT_ASSERT_EQUAL(size_t(1), aStates[0]->mpDrawCommands.size());
}
} }
} // namespace } // namespace

110
vcl/qa/cppunit/widgetdraw/data/definition1.xml
View File

@@ -1,56 +1,82 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<widgets> <widgets>
<style> <style>
<faceColor value="#F7F7F7"/> <faceColor value="#123456"/>
<checkedColor value="#C0C0C0"/> <checkedColor value="#234567"/>
<lightColor value="#FFFFFF"/> <lightColor value="#345678"/>
<lightBorderColor value="#F7F7F7"/> <lightBorderColor value="#FFFFFF"/>
<shadowColor value="#808080"/> <shadowColor value="#FFFFFF"/>
<darkShadowColor value="#000000"/> <darkShadowColor value="#FFFFFF"/>
<buttonTextColor value="#000000"/> <buttonTextColor value="#FFFFFF"/>
<buttonRolloverTextColor value="#000000"/> <buttonRolloverTextColor value="#FFFFFF"/>
<radioCheckTextColor value="#000000"/> <radioCheckTextColor value="#FFFFFF"/>
<groupTextColor value="#000000"/> <groupTextColor value="#FFFFFF"/>
<labelTextColor value="#000000"/> <labelTextColor value="#FFFFFF"/>
<windowColor value="#FFFFFF"/> <windowColor value="#FFFFFF"/>
<windowTextColor value="#000000"/> <windowTextColor value="#FFFFFF"/>
<dialogColor value="#FFFFFF"/> <dialogColor value="#FFFFFF"/>
<dialogTextColor value="#000000"/> <dialogTextColor value="#FFFFFF"/>
<workspaceColor value="#F7F7F7"/> <workspaceColor value="#FFFFFF"/>
<monoColor value="#000000"/> <monoColor value="#FFFFFF"/>
<fieldColor value="#FFFFFF"/> <fieldColor value="#FFFFFF"/>
<fieldTextColor value="#000000"/> <fieldTextColor value="#FFFFFF"/>
<fieldRolloverTextColor value="#000000"/> <fieldRolloverTextColor value="#FFFFFF"/>
<activeColor value="#0B87E7"/> <activeColor value="#FFFFFF"/>
<activeTextColor value="#FFFFFF"/> <activeTextColor value="#FFFFFF"/>
<activeBorderColor value="#C0C0C0"/> <activeBorderColor value="#FFFFFF"/>
<deactiveColor value="#808080"/> <deactiveColor value="#FFFFFF"/>
<deactiveTextColor value="#C0C0C0"/> <deactiveTextColor value="#FFFFFF"/>
<deactiveBorderColor value="#C0C0C0"/> <deactiveBorderColor value="#FFFFFF"/>
<menuColor value="#FFFFFF"/> <menuColor value="#FFFFFF"/>
<menuBarColor value="#FFFFFF"/> <menuBarColor value="#FFFFFF"/>
<menuBarRolloverColor value="#0B87E7"/> <menuBarRolloverColor value="#FFFFFF"/>
<menuBorderColor value="#C0C0C0"/> <menuBorderColor value="#FFFFFF"/>
<menuTextColor value="#000000"/> <menuTextColor value="#FFFFFF"/>
<menuBarTextColor value="#000000"/> <menuBarTextColor value="#FFFFFF"/>
<menuBarRolloverTextColor value="#000000"/> <menuBarRolloverTextColor value="#FFFFFF"/>
<menuBarHighlightTextColor value="#000000"/> <menuBarHighlightTextColor value="#FFFFFF"/>
<menuHighlightColor value="#0B87E7"/> <menuHighlightColor value="#FFFFFF"/>
<menuHighlightTextColor value="#FFFFFF"/> <menuHighlightTextColor value="#FFFFFF"/>
<highlightColor value="#0B87E7"/> <highlightColor value="#FFFFFF"/>
<highlightTextColor value="#FFFFFF"/> <highlightTextColor value="#FFFFFF"/>
<activeTabColor value="#FFFFFF"/> <activeTabColor value="#FFFFFF"/>
<inactiveTabColor value="#C0C0C0"/> <inactiveTabColor value="#FFFFFF"/>
<tabTextColor value="#000000"/> <tabTextColor value="#FFFFFF"/>
<tabRolloverTextColor value="#000000"/> <tabRolloverTextColor value="#FFFFFF"/>
<tabHighlightTextColor value="#000000"/> <tabHighlightTextColor value="#FFFFFF"/>
<disableColor value="#808080"/> <disableColor value="#FFFFFF"/>
<helpColor value="#FFFFE0"/> <helpColor value="#FFFFFF"/>
<helpTextColor value="#000000"/> <helpTextColor value="#FFFFFF"/>
<linkColor value="#0B87E7"/> <linkColor value="#FFFFFF"/>
<visitedLinkColor value="#0464AA"/> <visitedLinkColor value="#FFFFFF"/>
<toolTextColor value="#000000"/> <toolTextColor value="#FFFFFF"/>
<fontColor value="#000000"/> <fontColor value="#FFFFFF"/>
</style> </style>
<pushbutton>
<part value="Entire">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#808080" fill="#FFFFFF" stroke-width="1.0" rx="5" ry="5" margin="1"/>
<circ stroke="#808080" fill="#808080" stroke-width="1.0" margin="1"/>
</state>
<state enabled="true" focused="any" pressed="any" rollover="true" default="true" selected="any" button-value="any">
<rect stroke="#808080" fill="#808080" stroke-width="1.0" rx="5" ry="5" margin="1"/>
</state>
</part>
<part value="Focus">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="any">
<rect stroke="#808080" fill="#FFFFFF" stroke-width="1.0" rx="5" ry="5" margin="1"/>
</state>
</part>
</pushbutton>
<radiobutton>
<part value="Entire">
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="false">
<circ stroke="#007AFF" fill="#FFFFFF" stroke-width="1" margin="0"/>
</state>
<state enabled="any" focused="any" pressed="any" rollover="any" default="any" selected="any" button-value="true">
<circ stroke="#007AFF" fill="#FFFFFF" stroke-width="1" margin="0"/>
<circ stroke="#007AFF" fill="#007AFF" stroke-width="1" margin="3"/>
</state>
</part>
</radiobutton>
</widgets> </widgets>