Implemented inversed exprtk support and tests.

end2endzone · end2endzone · commit 504f74e2ac16 · 2020-10-04T09:13:01.000-04:00
diff --git a/src/Validator.cpp b/src/Validator.cpp
@@ -604,6 +604,9 @@ namespace shellanything
     if (!evaluated)
       return false;
 
+    if (inversed)
+      result = !result;
+
     return result;
   }
 
diff --git a/test/TestValidator.cpp b/test/TestValidator.cpp
@@ -442,12 +442,18 @@ namespace shellanything { namespace test
     v.SetExprtk("5 > 1");
     ASSERT_TRUE( v.Validate(c) );
 
-    //assert a string expression
+    //assert a string expression with ==
     v.SetExprtk("'test'=='test'");
     ASSERT_TRUE( v.Validate(c) );
     v.SetExprtk("'foo'=='bar'");
     ASSERT_FALSE( v.Validate(c) );
 
+    //assert a string expression with !=
+    v.SetExprtk("'test'!='test'");
+    ASSERT_FALSE( v.Validate(c) );
+    v.SetExprtk("'foo'!='bar'");
+    ASSERT_TRUE( v.Validate(c) );
+
     //assert an expression with properties
     pmgr.SetProperty("foo", "bar");
     v.SetExprtk("'${foo}'=='bar'");
@@ -782,6 +788,63 @@ namespace shellanything { namespace test
     ASSERT_FALSE( v.Validate(c) );
   }
   //--------------------------------------------------------------------------------------------------
+  TEST_F(TestValidator, testExprtkInversed)
+  {
+    Context c;
+#ifdef _WIN32
+    {
+      Context::ElementList elements;
+      elements.push_back("C:\\Windows\\System32\\kernel32.dll");
+      elements.push_back("C:\\Windows\\System32\\cmd.exe"     );
+      elements.push_back("C:\\Windows\\System32\\notepad.exe" );
+      elements.push_back("C:\\Windows\\System32\\services.msc");
+      c.SetElements(elements);
+    }
+#else
+    //TODO: complete with known path to files
+#endif
+    c.RegisterProperties();
+
+    PropertyManager & pmgr = PropertyManager::GetInstance();
+
+    Validator v;
+    v.SetInserve("exprtk");
+
+    //assert default
+    ASSERT_TRUE( v.Validate(c) );
+
+    //assert an expression that resolve as true
+    v.SetExprtk("5>1");
+    ASSERT_FALSE( v.Validate(c) );
+
+    //assert an expression that resolve as false
+    v.SetExprtk("5<1");
+    ASSERT_TRUE( v.Validate(c) );
+
+    //assert expression with spaces
+    v.SetExprtk("5 > 1");
+    ASSERT_FALSE( v.Validate(c) );
+
+    //assert a string expression with ==
+    v.SetExprtk("'test'=='test'");
+    ASSERT_FALSE( v.Validate(c) );
+    v.SetExprtk("'foo'=='bar'");
+    ASSERT_TRUE( v.Validate(c) );
+
+    //assert a string expression with !=
+    v.SetExprtk("'test'!='test'");
+    ASSERT_TRUE( v.Validate(c) );
+    v.SetExprtk("'foo'!='bar'");
+    ASSERT_FALSE( v.Validate(c) );
+
+    //assert an expression with properties
+    pmgr.SetProperty("foo", "bar");
+    v.SetExprtk("'${foo}'=='bar'");
+    ASSERT_FALSE( v.Validate(c) );
+    v.SetExprtk("'bar'=='${foo}'");
+    ASSERT_FALSE( v.Validate(c) );
+  }
+  //--------------------------------------------------------------------------------------------------
   TEST_F(TestValidator, testInversedAll)
   {
     Validator v;

Original file line number	Diff line number	Diff line change
`@@ -604,6 +604,9 @@ namespace shellanything`
`604`	`604`	`if (!evaluated)`
`605`	`605`	`return false;`
`606`	`606`
	`607`	`+ if (inversed)`
	`608`	`+ result = !result;`
	`609`	`+`
`607`	`610`	`return result;`
`608`	`611`	`}`
`609`	`612`