Implemented parsing of 'class' attribute for <visibility> and <validity> elements. For issue #58.

Author: end2endzone

src/ObjectFactory.cpp

@@ -159,6 +159,16 @@ namespace shellanything
 
     Validator result;
 
+    //parse class
+    std::string class_;
+    if (ParseAttribute(element, "class", true, true, class_, error))
+    {
+      if (!class_.empty())
+      {
+        result.SetClass(class_);
+      }
+    }
+
     //parse maxfiles
     int maxfiles = -1;
     if (ParseAttribute(element, "maxfiles", true, true, maxfiles, error))

test/TestObjectFactory.cpp

@@ -152,7 +152,7 @@ namespace shellanything { namespace test
 
     //ASSERT a 8 menus are available
     Menu::MenuPtrList menus = cmgr.GetConfigurations()[0]->GetMenus();
-    ASSERT_EQ( 8, menus.size() );
+    ASSERT_EQ( 9, menus.size() );
 
     //assert <visibility> tag properly parsed
     static const std::string expected_property = "bar";
@@ -162,16 +162,18 @@ namespace shellanything { namespace test
     static const std::string expected_inverse_maxfiles = "maxfiles";
     static const std::string expected_inverse_many = "maxfiles;maxfolders";
     static const std::string expected_inverse_unknown = "foo";
-
-    ASSERT_EQ( expected_property,         menus[00]->GetVisibility().GetProperties() );
-    ASSERT_EQ( 5,                         menus[01]->GetVisibility().GetMaxFiles() );
-    ASSERT_EQ( 6,                         menus[01]->GetVisibility().GetMaxDirectories() );
-    ASSERT_EQ( expected_file_extension,   menus[02]->GetVisibility().GetFileExtensions() );
-    ASSERT_EQ( expected_file_exists,      menus[03]->GetVisibility().GetFileExists() );
-    ASSERT_EQ( expected_inverse_empty,    menus[04]->GetVisibility().GetInserve() );
-    ASSERT_EQ( expected_inverse_maxfiles, menus[05]->GetVisibility().GetInserve() );
-    ASSERT_EQ( expected_inverse_many,     menus[06]->GetVisibility().GetInserve() );
-    ASSERT_EQ( expected_inverse_unknown,  menus[07]->GetVisibility().GetInserve() );
+    static const std::string expected_class = "file";
+
+    ASSERT_EQ( expected_property,         menus[0]->GetVisibility().GetProperties() );
+    ASSERT_EQ( 5,                         menus[1]->GetVisibility().GetMaxFiles() );
+    ASSERT_EQ( 6,                         menus[1]->GetVisibility().GetMaxDirectories() );
+    ASSERT_EQ( expected_file_extension,   menus[2]->GetVisibility().GetFileExtensions() );
+    ASSERT_EQ( expected_file_exists,      menus[3]->GetVisibility().GetFileExists() );
+    ASSERT_EQ( expected_inverse_empty,    menus[4]->GetVisibility().GetInserve() );
+    ASSERT_EQ( expected_inverse_maxfiles, menus[5]->GetVisibility().GetInserve() );
+    ASSERT_EQ( expected_inverse_many,     menus[6]->GetVisibility().GetInserve() );
+    ASSERT_EQ( expected_inverse_unknown,  menus[7]->GetVisibility().GetInserve() );
+    ASSERT_EQ( expected_class,            menus[8]->GetVisibility().GetClass() );
 
     //cleanup
     ASSERT_TRUE( ra::filesystem::DeleteFile(template_target_path.c_str()) ) << "Failed deleting file '" << template_target_path << "'.";

test/test_files/TestObjectFactory.testParseValidator.xml

@@ -41,29 +41,37 @@
       </actions>
     </menu>
 
-    <menu name="menu05" inverse="maxfiles">
+    <menu name="menu05">
       <!-- inverse attribute set to maxfiles -->
       <visibility inverse="maxfiles" />
       <actions>
         <property name="baz" value="true" />
       </actions>
     </menu>
 
-    <menu name="menu06" inverse="maxfiles;maxfolders">
+    <menu name="menu06">
       <!-- inverse multiple value -->
       <visibility inverse="maxfiles;maxfolders" />
       <actions>
         <property name="baz" value="true" />
       </actions>
     </menu>
 
-    <menu name="menu07" inverse="foo">
+    <menu name="menu07">
       <!-- inverse unknown attribute -->
       <visibility inverse="foo" />
       <actions>
         <property name="baz" value="true" />
       </actions>
     </menu>
 
+    <menu name="menu08">
+      <!-- class attribute is set -->
+      <visibility class="file" />
+      <actions>
+        <property name="baz" value="true" />
+      </actions>
+    </menu>
+
   </shell>
 </root>