ZF-4722

- Test cleanup, added @group & @expectedException annotation for phpunit, removed underscore in method

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@18473 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Db/Select/TestCommon.php

@@ -1609,18 +1609,22 @@ abstract class Zend_Db_Select_TestCommon extends Zend_Db_TestSetup
         $this->assertEquals(1, $result[0]['id']);
     }
 
-    public function testSelectUnion_NoArray_ThrowsException()
+    /**
+     * @group ZF-4772
+     * @expectedException Zend_Db_Select_Exception
+     */
+    public function testSelectUnionNoArrayThrowsException()
     {
-        $this->setExpectedException("Zend_Db_Select_Exception");
-
-        $this->_db->select()->union("string");
+        $this->_db->select()->union('string');
     }
 
-    public function testSelectUnion_InvalidUnionType_ThrowsException()
+    /**
+     * @group ZF-4772
+     * @expectedException Zend_Db_Select_Exception
+     */
+    public function testSelectUnionInvalidUnionTypeThrowsException()
     {
-        $this->setExpectedException("Zend_Db_Select_Exception");
-
-        $this->_db->select()->union(array(), "foo");
+        $this->_db->select()->union(array(), 'foo');
     }
 
     public function testSerializeSelect()