fix some risky tests

xabbuh · xabbuh · commit 6c22b05ed17a · 2017-03-20T16:03:41.000+01:00
diff --git a/Tests/Templating/Helper/FormHelperDivLayoutTest.php b/Tests/Templating/Helper/FormHelperDivLayoutTest.php
@@ -131,36 +131,36 @@ public static function themeInheritanceProvider()
 
     public function testRange()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testRangeWithMinMaxValues()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testLabelWithoutTranslationOnButton()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testSingleChoiceWithPlaceholderWithoutTranslation()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testButtonlabelWithoutTranslation()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testAttributesNotTranslatedWhenTranslationDomainIsFalse()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 }
diff --git a/Tests/Templating/Helper/FormHelperTableLayoutTest.php b/Tests/Templating/Helper/FormHelperTableLayoutTest.php
@@ -118,36 +118,36 @@ protected function setTheme(FormView $view, array $themes)
 
     public function testRange()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testRangeWithMinMaxValues()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testLabelWithoutTranslationOnButton()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testSingleChoiceWithPlaceholderWithoutTranslation()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testButtonlabelWithoutTranslation()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 
     public function testAttributesNotTranslatedWhenTranslationDomainIsFalse()
     {
-        // No-op for forward compatibility with AbstractLayoutTest 2.8
+        $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');
     }
 }
diff --git a/Tests/Templating/Helper/StopwatchHelperTest.php b/Tests/Templating/Helper/StopwatchHelperTest.php
@@ -30,11 +30,10 @@ public function testDevEnvironment()
     public function testProdEnvironment()
     {
         $helper = new StopwatchHelper(null);
+        $helper->start('foo');
 
-        try {
-            $helper->start('foo');
-        } catch (\BadMethodCallException $e) {
-            $this->fail('Assumed stopwatch is not called when not provided');
-        }
+        // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above
+        // can be executed without throwing any exceptions
+        $this->addToAssertionCount(1);
     }
 }
diff --git a/Tests/Templating/TemplateTest.php b/Tests/Templating/TemplateTest.php
@@ -19,21 +19,9 @@ class TemplateTest extends TestCase
     /**
      * @dataProvider getTemplateToPathProvider
      */
-    public function testGetPathForTemplatesInABundle($template, $path)
+    public function testGetPathForTemplate($template, $path)
     {
-        if ($template->get('bundle')) {
-            $this->assertEquals($template->getPath(), $path);
-        }
-    }
-
-    /**
-     * @dataProvider getTemplateToPathProvider
-     */
-    public function testGetPathForTemplatesOutOfABundle($template, $path)
-    {
-        if (!$template->get('bundle')) {
-            $this->assertEquals($template->getPath(), $path);
-        }
+        $this->assertSame($template->getPath(), $path);
     }
 
     public function getTemplateToPathProvider()

Original file line number	Diff line number	Diff line change
`@@ -131,36 +131,36 @@ public static function themeInheritanceProvider()`
`131`	`131`
`132`	`132`	`public function testRange()`
`133`	`133`	`{`
`134`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`134`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`public function testRangeWithMinMaxValues()`
`138`	`138`	`{`
`139`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`139`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`public function testLabelWithoutTranslationOnButton()`
`143`	`143`	`{`
`144`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`144`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`145`	`145`	`}`
`146`	`146`
`147`	`147`	`public function testSingleChoiceWithPlaceholderWithoutTranslation()`
`148`	`148`	`{`
`149`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`149`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()`
`153`	`153`	`{`
`154`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`154`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`155`	`155`	`}`
`156`	`156`
`157`	`157`	`public function testButtonlabelWithoutTranslation()`
`158`	`158`	`{`
`159`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`159`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`public function testAttributesNotTranslatedWhenTranslationDomainIsFalse()`
`163`	`163`	`{`
`164`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`164`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`165`	`165`	`}`
`166`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,36 +118,36 @@ protected function setTheme(FormView $view, array $themes)`
`118`	`118`
`119`	`119`	`public function testRange()`
`120`	`120`	`{`
`121`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`121`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`public function testRangeWithMinMaxValues()`
`125`	`125`	`{`
`126`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`126`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`127`	`127`	`}`
`128`	`128`
`129`	`129`	`public function testLabelWithoutTranslationOnButton()`
`130`	`130`	`{`
`131`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`131`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public function testSingleChoiceWithPlaceholderWithoutTranslation()`
`135`	`135`	`{`
`136`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`136`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`public function testSingleChoiceExpandedWithPlaceholderWithoutTranslation()`
`140`	`140`	`{`
`141`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`141`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`public function testButtonlabelWithoutTranslation()`
`145`	`145`	`{`
`146`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`146`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`public function testAttributesNotTranslatedWhenTranslationDomainIsFalse()`
`150`	`150`	`{`
`151`		`- // No-op for forward compatibility with AbstractLayoutTest 2.8`
	`151`	`+ $this->markTestIncomplete('No-op for forward compatibility with AbstractLayoutTest 2.8');`
`152`	`152`	`}`
`153`	`153`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,10 @@ public function testDevEnvironment()`
`30`	`30`	`public function testProdEnvironment()`
`31`	`31`	`{`
`32`	`32`	`$helper = new StopwatchHelper(null);`
	`33`	`+ $helper->start('foo');`
`33`	`34`
`34`		`- try {`
`35`		`- $helper->start('foo');`
`36`		`- } catch (\BadMethodCallException $e) {`
`37`		`- $this->fail('Assumed stopwatch is not called when not provided');`
`38`		`- }`
	`35`	`+ // add a dummy assertion here to satisfy PHPUnit, the only thing we want to test is that the code above`
	`36`	`+ // can be executed without throwing any exceptions`
	`37`	`+ $this->addToAssertionCount(1);`
`39`	`38`	`}`
`40`	`39`	`}`