Updated to latest version of PHPBench

Author: dantleech

benchmarks/BaseBench.php

@@ -6,7 +6,7 @@
 use PhpBench\BenchmarkInterface;
 use PHPCR\ImportUUIDBehaviorInterface;
 
-abstract class BaseBench implements BenchmarkInterface
+abstract class BaseBench
 {
     const ROOT_NAME = 'bench';
     const ROOT_PATH = '/bench';
@@ -88,7 +88,7 @@ protected function getRootNode()
         return $this->rootNode;
     }
 
-    protected function loadDump($filename, $remove = false)
+    public function loadDump($filename, $remove = false)
     {
         $dumpPath = __DIR__ . '/../dumps/' . $filename;
 

benchmarks/InsertBench.php

@@ -7,17 +7,18 @@
 use PHPCR\Benchmark\BaseBench;
 
 /**
- * @group insert
- * @iterations 4
- * @revs 4
+ * @Groups({"insert"})
+ * @Iterations(4, sleep=1000000)
+ * @Revs(4)
+ * @OutputTimeUnit("seconds")
  */
 class InsertBench extends BaseBench
 {
     private $index = 1;
 
     /**
-     * @paramProvider provideNbNodes
-     * @beforeMethod beforeResetWorkspace
+     * @ParamProviders({"provideNbNodes"})
+     * @BeforeMethods({"beforeResetWorkspace"})
      */
     public function benchInsertNodes($params)
     {

benchmarks/QueryBench.php

@@ -6,19 +6,22 @@
 use PHPCR\Benchmark\BaseBench;
 
 /**
- * @group query
+ * @Groups({"query"})
+ * @Iterations(5)
+ * @Sleep(5000)
+ * @BeforeClassMethods({"beforeClass"})
+ * @OutputTimeUnit("seconds")
  */
 class QueryBench extends BaseBench
 {
-    public function setUp()
+    public static function beforeClass()
     {
-        $this->loadDump('large_website.xml');
+        (new self)->loadDump('large_website.xml');
     }
 
     /**
-     * @paramProvider provideQueries
-     * @iterations 5
-     * @group query_single_prop
+     * @Groups({"query_single_prop"}, extend=true)
+     * @ParamProviders({"provideQueries"})
      */
     public function benchQuery($params)
     {
@@ -27,9 +30,8 @@ public function benchQuery($params)
     }
 
     /**
-     * @paramProvider provideQueries
-     * @iterations 5
-     * @group query_single_prop
+     * @Groups({"query_single_prop"}, extend=true)
+     * @ParamProviders({"provideQueries"})
      */
     public function benchQueryWithNodes($params)
     {
@@ -42,9 +44,8 @@ public function benchQueryWithNodes($params)
     }
 
     /**
-     * @paramProvider provideQueries
-     * @iterations 5
-     * @group query_single_prop
+     * @Groups({"query_single_prop"}, extend=true)
+     * @ParamProviders({"provideQueries"})
      */
     public function benchQueryIterate($params)
     {
@@ -57,9 +58,8 @@ public function benchQueryIterate($params)
     }
 
     /**
-     * @paramProvider provideProperties
-     * @iterations 5
-     * @group query_variable_props
+     * @ParamProviders({"provideProperties"})
+     * @Groups({"query_variable_prop"}, extend=true)
      */
     public function benchQueryIterateVariableProperties($params)
     {

benchmarks/TraversalBench.php

@@ -5,13 +5,15 @@
 use PHPCR\NodeInterface;
 
 /**
- * @group traversal_full
- * @iterations 6
+ * @Groups({"traversal_full"})
+ * @Iterations(6)
+ * @OutputTimeUnit("seconds")
  */
 class TraversalBench extends BaseBench
 {
     public function setUp()
     {
+
         $this->loadDump('large_website.xml');
     }