Modernize tests code style

ptlis · Jan 31, 2017 · 899f04d · 899f04d
1 parent bd8a2a8
commit 899f04d
Show file tree

Hide file tree

Showing 11 changed files with 111 additions and 290 deletions.
diff --git a/tests/Comparator/CompareVersionEqualToTest.php b/tests/Comparator/CompareVersionEqualToTest.php
@@ -21,23 +21,20 @@
  */
 final class CompareVersionEqualToTest extends TestCase
 {
+    /**
+     * @covers \ptlis\SemanticVersion\Comparator\EqualTo<extended>
+     */
     public function testReadSymbol()
     {
         $equalTo = new EqualTo();
 
-        $this->assertEquals(
-            '=',
-            $equalTo->getSymbol()
-        );
-
-        $this->assertEquals(
-            '=',
-            strval($equalTo)
-        );
+        $this->assertEquals('=', $equalTo->getSymbol());
+        $this->assertEquals('=', strval($equalTo));
     }
 
     /**
      * @dataProvider isEqualProvider
+     * @covers \ptlis\SemanticVersion\Comparator\EqualTo<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -46,13 +43,12 @@ public function testIsEqual($lVersion, $rVersion)
     {
         $equalTo = new EqualTo();
 
-        $this->assertTrue(
-            $equalTo->compare($lVersion, $rVersion)
-        );
+        $this->assertTrue($equalTo->compare($lVersion, $rVersion));
     }
 
     /**
      * @dataProvider isNotEqualProvider
+     * @covers \ptlis\SemanticVersion\Comparator\EqualTo<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -61,9 +57,7 @@ public function testIsNotEqual($lVersion, $rVersion)
     {
         $equalTo = new EqualTo();
 
-        $this->assertFalse(
-            $equalTo->compare($lVersion, $rVersion)
-        );
+        $this->assertFalse($equalTo->compare($lVersion, $rVersion));
     }
 
     public function isEqualProvider()

diff --git a/tests/Comparator/CompareVersionGreaterOrEqualToTest.php b/tests/Comparator/CompareVersionGreaterOrEqualToTest.php
@@ -21,23 +21,20 @@
  */
 final class CompareVersionGreaterOrEqualToTest extends TestCase
 {
+    /**
+     * @covers \ptlis\SemanticVersion\Comparator\GreaterOrEqualTo<extended>
+     */
     public function testReadSymbol()
     {
         $greaterOrEqualTo = new GreaterOrEqualTo();
 
-        $this->assertEquals(
-            '>=',
-            $greaterOrEqualTo->getSymbol()
-        );
-
-        $this->assertEquals(
-            '>=',
-            strval($greaterOrEqualTo)
-        );
+        $this->assertEquals('>=', $greaterOrEqualTo->getSymbol());
+        $this->assertEquals('>=', strval($greaterOrEqualTo));
     }
 
     /**
      * @dataProvider isGreaterOrEqualProvider
+     * @covers \ptlis\SemanticVersion\Comparator\GreaterOrEqualTo<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -46,13 +43,12 @@ public function testIsGreaterOrEqual($lVersion, $rVersion)
     {
         $greaterOrEqualTo = new GreaterOrEqualTo();
 
-        $this->assertTrue(
-            $greaterOrEqualTo->compare($lVersion, $rVersion)
-        );
+        $this->assertTrue($greaterOrEqualTo->compare($lVersion, $rVersion));
     }
 
     /**
      * @dataProvider isNotGreaterOrEqualProvider
+     * @covers \ptlis\SemanticVersion\Comparator\GreaterOrEqualTo<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -61,9 +57,7 @@ public function testIsNotGreaterOrEqual($lVersion, $rVersion)
     {
         $greaterOrEqualTo = new GreaterOrEqualTo();
 
-        $this->assertFalse(
-            $greaterOrEqualTo->compare($lVersion, $rVersion)
-        );
+        $this->assertFalse($greaterOrEqualTo->compare($lVersion, $rVersion));
     }
 
     public function isGreaterOrEqualProvider()

diff --git a/tests/Comparator/CompareVersionGreaterThanTest.php b/tests/Comparator/CompareVersionGreaterThanTest.php
@@ -21,23 +21,20 @@
  */
 final class CompareVersionGreaterThanTest extends TestCase
 {
+    /**
+     * @covers \ptlis\SemanticVersion\Comparator\GreaterThan<extended>
+     */
     public function testReadSymbol()
     {
         $greaterThan = new GreaterThan();
 
-        $this->assertEquals(
-            '>',
-            $greaterThan->getSymbol()
-        );
-
-        $this->assertEquals(
-            '>',
-            strval($greaterThan)
-        );
+        $this->assertEquals('>', $greaterThan->getSymbol());
+        $this->assertEquals('>', strval($greaterThan));
     }
 
     /**
      * @dataProvider isGreaterProvider
+     * @covers \ptlis\SemanticVersion\Comparator\GreaterThan<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -46,13 +43,12 @@ public function testIsGreater($lVersion, $rVersion)
     {
         $greaterThan = new GreaterThan();
 
-        $this->assertTrue(
-            $greaterThan->compare($lVersion, $rVersion)
-        );
+        $this->assertTrue($greaterThan->compare($lVersion, $rVersion));
     }
 
     /**
      * @dataProvider isNotGreaterProvider
+     * @covers \ptlis\SemanticVersion\Comparator\GreaterThan<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -61,9 +57,7 @@ public function testIsNotGreater($lVersion, $rVersion)
     {
         $greaterThan = new GreaterThan();
 
-        $this->assertFalse(
-            $greaterThan->compare($lVersion, $rVersion)
-        );
+        $this->assertFalse($greaterThan->compare($lVersion, $rVersion));
     }
 
     public function isGreaterProvider()

diff --git a/tests/Comparator/CompareVersionLessOrEqualToTest.php b/tests/Comparator/CompareVersionLessOrEqualToTest.php
@@ -21,23 +21,20 @@
  */
 final class CompareVersionLessOrEqualToTest extends TestCase
 {
+    /**
+     * @covers \ptlis\SemanticVersion\Comparator\LessOrEqualTo<extended>
+     */
     public function testReadSymbol()
     {
         $lessOrEqualTo = new LessOrEqualTo();
 
-        $this->assertEquals(
-            '<=',
-            $lessOrEqualTo->getSymbol()
-        );
-
-        $this->assertEquals(
-            '<=',
-            strval($lessOrEqualTo)
-        );
+        $this->assertEquals('<=', $lessOrEqualTo->getSymbol());
+        $this->assertEquals('<=', strval($lessOrEqualTo));
     }
 
     /**
      * @dataProvider isLessOrEqualProvider
+     * @covers \ptlis\SemanticVersion\Comparator\LessOrEqualTo<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -46,13 +43,12 @@ public function testIsLessOrEqual($lVersion, $rVersion)
     {
         $lessOrEqualTo = new LessOrEqualTo();
 
-        $this->assertTrue(
-            $lessOrEqualTo->compare($lVersion, $rVersion)
-        );
+        $this->assertTrue($lessOrEqualTo->compare($lVersion, $rVersion));
     }
 
     /**
      * @dataProvider isNotLessOrEqualProvider
+     * @covers \ptlis\SemanticVersion\Comparator\LessOrEqualTo<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -61,9 +57,7 @@ public function testIsNotLessOrEqual($lVersion, $rVersion)
     {
         $lessOrEqualTo = new LessOrEqualTo();
 
-        $this->assertFalse(
-            $lessOrEqualTo->compare($lVersion, $rVersion)
-        );
+        $this->assertFalse($lessOrEqualTo->compare($lVersion, $rVersion));
     }
 
     public function isLessOrEqualProvider()

diff --git a/tests/Comparator/CompareVersionLessThanTest.php b/tests/Comparator/CompareVersionLessThanTest.php
@@ -21,23 +21,20 @@
  */
 final class CompareVersionLessThanTest extends TestCase
 {
+    /**
+     * @covers \ptlis\SemanticVersion\Comparator\LessThan<extended>
+     */
     public function testReadSymbol()
     {
         $lessThan = new LessThan();
 
-        $this->assertEquals(
-            '<',
-            $lessThan->getSymbol()
-        );
-
-        $this->assertEquals(
-            '<',
-            strval($lessThan)
-        );
+        $this->assertEquals('<', $lessThan->getSymbol());
+        $this->assertEquals('<', strval($lessThan));
     }
 
     /**
      * @dataProvider isLessProvider
+     * @covers \ptlis\SemanticVersion\Comparator\LessThan<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -46,13 +43,12 @@ public function testIsGreater($lVersion, $rVersion)
     {
         $lessThan = new LessThan();
 
-        $this->assertTrue(
-            $lessThan->compare($lVersion, $rVersion)
-        );
+        $this->assertTrue($lessThan->compare($lVersion, $rVersion));
     }
 
     /**
      * @dataProvider isNotLessProvider
+     * @covers \ptlis\SemanticVersion\Comparator\LessThan<extended>
      *
      * @param Version $lVersion
      * @param Version $rVersion
@@ -61,9 +57,7 @@ public function testIsNotLess($lVersion, $rVersion)
     {
         $lessThan = new LessThan();
 
-        $this->assertFalse(
-            $lessThan->compare($lVersion, $rVersion)
-        );
+        $this->assertFalse($lessThan->compare($lVersion, $rVersion));
     }
 
     public function isLessProvider()

diff --git a/tests/Parse/ParseRangeTest.php b/tests/Parse/ParseRangeTest.php
@@ -64,14 +64,7 @@ public function testParseRange($version, $tokenList, $expectedRange, $expectedSe
         $parser = new VersionParser($this->getMatcherList());
         $range = $parser->parseRange($tokenList);
 
-        $this->assertEquals(
-            $expectedRange,
-            $range
-        );
-
-        $this->assertEquals(
-            $expectedSerialization,
-            strval($range)
-        );
+        $this->assertEquals($expectedRange, $range);
+        $this->assertEquals($expectedSerialization, strval($range));
     }
 }
diff --git a/tests/Parse/TokenizeTest.php b/tests/Parse/TokenizeTest.php
@@ -27,9 +27,6 @@ public function testTokenize($version, $tokenList)
     {
         $tokenizer = new VersionTokenizer();
 
-        $this->assertEquals(
-            $tokenList,
-            $tokenizer->tokenize($version)
-        );
+        $this->assertEquals($tokenList, $tokenizer->tokenize($version));
     }
 }
diff --git a/tests/Version/Label/LabelBuilderTest.php b/tests/Version/Label/LabelBuilderTest.php
@@ -18,72 +18,47 @@ class LabelBuilderTest extends \PHPUnit_Framework_TestCase
 {
     public function testCreateDev()
     {
-        $builder = new LabelBuilder();
-
-        $label = $builder
+        $label = (new LabelBuilder())
             ->setName('wibble')
             ->setVersion(5)
             ->build();
 
-        $this->assertEquals(
-            new Label(Label::PRECEDENCE_DEV, 5, 'wibble'),
-            $label
-        );
+        $this->assertEquals(new Label(Label::PRECEDENCE_DEV, 5, 'wibble'), $label);
     }
 
     public function testCreateAlpha()
     {
-        $builder = new LabelBuilder();
-
-        $label = $builder
+        $label = (new LabelBuilder())
             ->setName('alpha')
             ->setVersion(1)
             ->build();
 
-        $this->assertEquals(
-            new Label(Label::PRECEDENCE_ALPHA, 1),
-            $label
-        );
+        $this->assertEquals(new Label(Label::PRECEDENCE_ALPHA, 1), $label);
     }
 
     public function testCreateBeta()
     {
-        $builder = new LabelBuilder();
-
-        $label = $builder
+        $label = (new LabelBuilder())
             ->setName('beta')
             ->build();
 
-        $this->assertEquals(
-            new Label(Label::PRECEDENCE_BETA),
-            $label
-        );
+        $this->assertEquals(new Label(Label::PRECEDENCE_BETA), $label);
     }
 
     public function testCreateRC()
     {
-        $builder = new LabelBuilder();
-
-        $label = $builder
+        $label = (new LabelBuilder())
             ->setName('rc')
             ->setVersion(3)
             ->build();
 
-        $this->assertEquals(
-            new Label(Label::PRECEDENCE_RC, 3),
-            $label
-        );
+        $this->assertEquals(new Label(Label::PRECEDENCE_RC, 3), $label);
     }
 
     public function testCreateAbsent()
     {
-        $builder = new LabelBuilder();
-
-        $label = $builder->build();
+        $label = (new LabelBuilder())->build();
 
-        $this->assertEquals(
-            new Label(Label::PRECEDENCE_ABSENT),
-            $label
-        );
+        $this->assertEquals(new Label(Label::PRECEDENCE_ABSENT), $label);
     }
 }