TASK: Move expected exceptions from annotations to method calls

Author: daniellienert

Tests/Unit/Eel/ElasticSearchQueryBuilderTest.php

@@ -169,10 +169,10 @@ public function basicRequestStructureTakesContextNodeIntoAccount(): void
 
     /**
      * @test
-     * @expectedException \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException
      */
     public function queryFilterThrowsExceptionOnInvalidClauseType(): void
     {
+        $this->expectException( QueryBuildingException::class);
         $this->queryBuilder->queryFilter('foo', [], 'unsupported');
     }
 
@@ -365,20 +365,22 @@ public function anAggregationCanBeSubbedUnderAPath(): void
 
     /**
      * @test
-     * @expectedException \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException
      */
     public function ifTheParentPathDoesNotExistAnExceptionisThrown(): void
     {
+        $this->expectException(QueryBuildingException::class);
+
         $this->queryBuilder->fieldBasedAggregation('foo', 'bar');
         $this->queryBuilder->fieldBasedAggregation('bar', 'bar', 'terms', 'doesNotExist');
     }
 
     /**
      * @test
-     * @expectedException \Flowpack\ElasticSearch\ContentRepositoryAdaptor\Exception\QueryBuildingException
      */
     public function ifSubbedParentPathDoesNotExistAnExceptionisThrown(): void
     {
+        $this->expectException(QueryBuildingException::class);
+
         $this->queryBuilder->fieldBasedAggregation('foo', 'bar');
         $this->queryBuilder->fieldBasedAggregation('bar', 'bar', 'terms', 'foo.doesNotExist');
     }