Fix tests reflecting removed 'OR' queries and array operator

modules/monitoring/test/php/library/Filter/Type/StatusFilterTest.php

@@ -93,7 +93,7 @@ class StatusFilterTest extends BaseTestCase
         );
         $this->assertEquals(
             1,
-            $treeNode->right,
+            $treeNode->right[0],
             'Assert the right treenode to contain the numeric status for "Down"'
         );
         $this->assertEquals(

modules/monitoring/test/php/library/Filter/UrlViewFilterTest.php

@@ -86,6 +86,7 @@ class UrlViewFilterTest extends BaseTestCase
 {
     public function testUrlParamCreation()
     {
+        $this->markTestSkipped('Or queries are disabled');
         $searchEngine = new Filter();
         $searchEngine->createFilterDomain('host')
             ->registerAttribute(
@@ -140,7 +141,7 @@ class UrlViewFilterTest extends BaseTestCase
             'Assert the field to be set correctly'
         );
         $this->assertEquals(
-            $tree->root->right,
+            $tree->root->right[0],
             'Hans Wurst',
             'Assert the value to be set correctly'
         );
@@ -148,6 +149,8 @@ class UrlViewFilterTest extends BaseTestCase
 
     public function testConjunctionFilterInUrl()
     {
+        $this->markTestSkipped("OR queries are disabled");
+
         $filterFactory = new UrlViewFilter(new FilterMock());
         $query = 'attr1!=Hans+Wurst&test=test123|bla=1';
         $tree = $filterFactory->parseUrl($query);
@@ -157,6 +160,7 @@ class UrlViewFilterTest extends BaseTestCase
 
     public function testImplicitConjunctionInUrl()
     {
+        $this->markTestSkipped("OR queries are disabled");
         $filterFactory = new UrlViewFilter(new FilterMock());
         $query = 'attr1!=Hans+Wurst&test=test123|bla=1|2|3';
         $tree = $filterFactory->parseUrl($query);

test/php/library/Icinga/Filter/FilterTest.php

@@ -135,6 +135,7 @@ class FilterTest extends BaseTestCase
 
     public function testSingleOrQueryTreeCreation()
     {
+        $this->markTestSkipped('OR queries are disabled for now');
         $searchEngine = new Filter();
         $searchEngine->createFilterDomain('host')
             ->registerAttribute(
@@ -171,6 +172,7 @@ class FilterTest extends BaseTestCase
 
     public function testMultipleOrQueries()
     {
+        $this->markTestSkipped('OR queries are disabled');
         $searchEngine = new Filter();
         $searchEngine->createFilterDomain('host')
             ->registerAttribute(
@@ -222,6 +224,7 @@ class FilterTest extends BaseTestCase
 
     public function testComplexQueryTreeCreation()
     {
+        $this->markTestSkipped('OR queries are disabled for now');
         $searchEngine = new Filter();
         $searchEngine->createFilterDomain('host')
             ->registerAttribute(

test/php/library/Icinga/Filter/Type/BooleanFilterTest.php

@@ -121,13 +121,13 @@ class BooleanFilterTest extends BaseTestCase
         $node = $filter->createTreeNode('is with problem', 'host_status');
         $this->assertEquals('host_problem', $node->left, 'Assert the left part of the node to be host_problem');
         $this->assertEquals(Node::OPERATOR_EQUALS, $node->operator, 'Assert the operator to be equals');
-        $this->assertEquals(1, $node->right, 'Assert the value to be 1');
+        $this->assertEquals(1, $node->right[0], 'Assert the value to be 1');
 
 
         $node = $filter->createTreeNode('is not with problem', 'host_status');
         $this->assertEquals('host_problem', $node->left, 'Assert the left part of the node to be host_problem');
         $this->assertEquals(Node::OPERATOR_EQUALS, $node->operator, 'Assert the operator to be equals');
-        $this->assertEquals(0, $node->right, 'Assert the value to be 0 for not equals');
+        $this->assertEquals(0, $node->right[0], 'Assert the value to be 0 for not equals');
     }
 
     public function testTimeQueryNodeCreation()
@@ -143,11 +143,11 @@ class BooleanFilterTest extends BaseTestCase
 
         $this->assertEquals('time_node', $node->left->left, 'Assert the left part of the node to be time filter');
         $this->assertEquals(Node::OPERATOR_GREATER_EQ, $node->left->operator, 'Assert the operator to be greater eq');
-        $this->assertEquals('-1 hour', $node->left->right, 'Assert the value to be the strotime info');
+        $this->assertEquals('-1 hour', $node->left->right[0], 'Assert the value to be the strotime info');
 
         $this->assertEquals('host_problem', $node->right->left, 'Assert the right part of the node to be host_problem');
         $this->assertEquals(Node::OPERATOR_EQUALS, $node->right->operator, 'Assert the operator to be equals');
-        $this->assertEquals(1, $node->right->right, 'Assert the value to be 1');
+        $this->assertEquals(1, $node->right->right[0], 'Assert the value to be 1');
 
     }
 }