fix some risky tests

Author: xabbuh

Tests/ConstraintTest.php

@@ -115,7 +115,9 @@ public function testRequiredOptionsMustBeDefined()
 
     public function testRequiredOptionsPassed()
     {
-        new ConstraintC(array('option1' => 'default'));
+        $constraint = new ConstraintC(array('option1' => 'default'));
+
+        $this->assertSame('default', $constraint->option1);
     }
 
     public function testGroupsAreConvertedToArray()
@@ -140,7 +142,9 @@ public function testAllowsSettingZeroRequiredPropertyValue()
 
     public function testCanCreateConstraintWithNoDefaultOptionAndEmptyArray()
     {
-        new ConstraintB(array());
+        $constraint = new ConstraintB(array());
+
+        $this->assertSame(array(Constraint::PROPERTY_CONSTRAINT, Constraint::CLASS_CONSTRAINT), $constraint->getTargets());
     }
 
     public function testGetTargetsCanBeString()

Tests/Constraints/CallbackValidatorTest.php

@@ -330,7 +330,9 @@ public function testConstraintGetTargets()
     // Should succeed. Needed when defining constraints as annotations.
     public function testNoConstructorArguments()
     {
-        new Callback();
+        $constraint = new Callback();
+
+        $this->assertSame(array(Constraint::CLASS_CONSTRAINT, Constraint::PROPERTY_CONSTRAINT), $constraint->getTargets());
     }
 
     public function testAnnotationInvocationSingleValued()

Tests/Constraints/GroupSequenceTest.php

@@ -94,5 +94,7 @@ public function testLegacyUnsetIgnoresNonExistingKeys()
 
         // should not fail
         unset($sequence[2]);
+
+        $this->assertCount(2, $sequence);
     }
 }

Tests/Mapping/ClassMetadataTest.php

@@ -245,19 +245,23 @@ public function testSerialize()
     public function testGroupSequencesWorkIfContainingDefaultGroup()
     {
         $this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup()));
+
+        $this->assertInstanceOf('Symfony\Component\Validator\Constraints\GroupSequence', $this->metadata->getGroupSequence());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
+     */
     public function testGroupSequencesFailIfNotContainingDefaultGroup()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');
-
         $this->metadata->setGroupSequence(array('Foo', 'Bar'));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Validator\Exception\GroupDefinitionException
+     */
     public function testGroupSequencesFailIfContainingDefault()
     {
-        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}('Symfony\Component\Validator\Exception\GroupDefinitionException');
-
         $this->metadata->setGroupSequence(array('Foo', $this->metadata->getDefaultGroup(), Constraint::DEFAULT_GROUP));
     }
 

Tests/Mapping/Factory/LazyLoadingMetadataFactoryTest.php

@@ -167,7 +167,11 @@ public function testMetadataCacheWithRuntimeConstraint()
         $metadata = $factory->getMetadataFor(self::PARENT_CLASS);
         $metadata->addConstraint(new Callback(function () {}));
 
+        $this->assertCount(3, $metadata->getConstraints());
+
         $metadata = $factory->getMetadataFor(self::CLASS_NAME);
+
+        $this->assertCount(6, $metadata->getConstraints());
     }
 
     public function testGroupsFromParent()

Tests/Resources/TranslationFilesTest.php

@@ -25,6 +25,8 @@ public function testTranslationFileIsValid($filePath)
         } else {
             \PHPUnit\Util\XML::loadfile($filePath, false, false, true);
         }
+
+        $this->addToAssertionCount(1);
     }
 
     public function provideTranslationFiles()