- added some @Depends annotations in tests/Versioning/VersionHistoryTest.php

- fixed some code formating issues

Author: markussr

tests/Versioning/VersionHistoryTest.php

@@ -125,7 +125,6 @@ public function testGetAllLinearVersions()
         $this->assertCount(1, $lastVersion->getPredecessors());
         $this->assertCount(0, $lastVersion->getSuccessors());
     }
-
     public function testGetAllVersions()
     {
         // TODO: have non linear version history
@@ -150,7 +149,6 @@ public function testGetAllVersions()
         $this->assertCount(1, $lastVersion->getPredecessors());
         $this->assertCount(0, $lastVersion->getSuccessors());
     }
-
     /**
      * Check version history (allVersions), add more versions, then check the history updates correctly.
      */
@@ -312,24 +310,9 @@ public function testDeleteUnexistingVersion()
         $history->removeVersion('unexisting');
     }
 
-    /**
-     * Load Version by label
-     */
-    public function testGetVersionByLabel()
-    {
-        $history = $this->vm->getVersionHistory('/tests_version_base/versioned');
-        $history->addVersionLabel('1.0', 'stable', false);
-
-        $expectedVersion = $history->getVersion('1.0');
-        $actualVersion = $history->getVersionByLabel('stable');
-
-        $this->assertEquals($expectedVersion->getIdentifier(), $actualVersion->getIdentifier());
-    }
-
-
     /**
      * Try to load  Version by unexisting label
-     * @expectedException PHPCR\Version\VersionException
+     * @expectedException \PHPCR\Version\VersionException
      */
     public function testUnexistingGetVersionByLabel()
     {
@@ -345,6 +328,8 @@ public function testAddLabel()
     {
         $history = $this->vm->getVersionHistory('/tests_version_base/versioned');
         $history->addVersionLabel('1.0', 'stable', false);
+        $history->setChildrenDirty();
+
         $node = $history->getNode('jcr:versionLabels');
         try {
             $property = $node->getProperty('stable');
@@ -353,8 +338,26 @@ public function testAddLabel()
         }
     }
 
+    /**
+     * Load Version by label
+     *
+     * @depends testAddLabel
+     */
+    public function testGetVersionByLabel()
+    {
+        $history = $this->vm->getVersionHistory('/tests_version_base/versioned');
+        $history->addVersionLabel('1.0', 'stable', false);
+
+        $expectedVersion = $history->getVersion('1.0');
+        $actualVersion = $history->getVersionByLabel('stable');
+
+        $this->assertEquals($expectedVersion->getIdentifier(), $actualVersion->getIdentifier());
+    }
+
     /**
      * Try to check, if version has label
+     *
+     * @depends testAddLabel
      */
     public function testHasVersionLabel()
     {
@@ -365,7 +368,6 @@ public function testHasVersionLabel()
 
         $version = $history->getVersion('1.0');
 
-
         $this->assertFalse($history->hasVersionLabel('unsetlabel'));
         $this->assertFalse($history->hasVersionLabel('unsetlabel', $version));
 
@@ -378,6 +380,8 @@ public function testHasVersionLabel()
 
     /**
      * Try to get labels from version history
+     *
+     * @depends testAddLabel
      */
     public function testGetVersionLabels()
     {
@@ -402,6 +406,8 @@ public function testGetVersionLabels()
 
     /**
      * removes label from a version
+     *
+     * @depends testAddLabel
      */
     public function testRemoveLabel()
     {
@@ -413,7 +419,6 @@ public function testRemoveLabel()
         $this->assertFalse($history->hasVersionLabel('toremove'));
     }
 
-
     /**
      * Try to remove unset label from a version.
      * @expectedException \PHPCR\Version\VersionException
@@ -424,7 +429,6 @@ public function testRemoveUnsetLabel()
         $history->removeVersionLabel('unsetLabel');
     }
 
-
     /**
      * Check if a version node with the given name exists in the version history.
      *