Merge pull request joomla#4710 from nibra/test-annotations

Test annotations
nmjay · Oct 16, 2014 · 4915bca · 4915bca
2 parents 9e29f97 + 5c1bcaf
commit 4915bca
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 34 deletions.
diff --git a/tests/unit/suites/libraries/cms/schema/JSchemaChangesetTest.php b/tests/unit/suites/libraries/cms/schema/JSchemaChangesetTest.php
@@ -73,56 +73,35 @@ protected function tearDown()
 		parent::tearDown();
 	}
 
-	/**
-	 * Tests the __construct method
-	 *
-	 * @return  void
-	 *
-	 * @since   3.0
-	 */
-	public function test__construct()
+	public function dataDriver()
 	{
-		$this->assertThat(
-			new JSchemaChangeset($this->db, null),
-			$this->isInstanceOf('JSchemaChangeset')
+		return array(
+			array('mysqli'),
+			array('postgresql'),
+			array('sqlsrv'),
 		);
 	}
 
 	/**
-	 * Tests the __construct method with the PostgreSQL driver
+	 * Tests the __construct method with the given driver
 	 *
-	 * @return  void
-	 *
-	 * @since   3.0
-	 */
-	public function test__constructPostgresql()
-	{
-		$this->db->name = 'postgresql';
-
-		$this->assertThat(
-			new JSchemaChangeset($this->db, null),
-			$this->isInstanceOf('JSchemaChangeset')
-		);
-	}
-
-	/**
-	 * Tests the __construct method with the SQL Server driver
+	 * @medium
 	 *
+	 * @dataProvider dataDriver
 	 * @return  void
 	 *
 	 * @since   3.0
 	 */
-	public function test__constructSqlsrv()
+	public function test__construct($driver)
 	{
-		$this->db->name = 'sqlsrv';
+		$this->db->name = $driver;
 
 		$this->assertThat(
 			new JSchemaChangeset($this->db, null),
 			$this->isInstanceOf('JSchemaChangeset')
 		);
 	}
 
-
 	/**
 	 * Tests the getInstance method with the MySQL driver
 	 *

diff --git a/tests/unit/suites/libraries/joomla/JFactoryTest.php b/tests/unit/suites/libraries/joomla/JFactoryTest.php
@@ -214,6 +214,8 @@ public function testGetDateUnchanged()
 	/**
 	 * Tests the JFactory::getDate method.
 	 *
+	 * @medium
+	 *
 	 * @return  void
 	 *
 	 * @since   12.3

diff --git a/tests/unit/suites/libraries/joomla/cache/JCacheTest.php b/tests/unit/suites/libraries/joomla/cache/JCacheTest.php
@@ -517,6 +517,8 @@ public function testClean()
 	/**
 	 * Testing Gc().
 	 *
+	 * @medium
+	 *
 	 * @return void
 	 */
 	public function testGc()

diff --git a/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageMainTest.php b/tests/unit/suites/libraries/joomla/cache/storage/JCacheStorageMainTest.php
@@ -138,12 +138,12 @@ public function testCacheMiss($store)
 	}
 
 	/**
-	 * Test...
-	 *
-	 * @param   string  $store  The store.
+	 * @medium
 	 *
 	 * @dataProvider provider
 	 *
+	 * @param   string  $store  The store.
+	 *
 	 * @return void
 	 */
 	public function testCacheTimeout($store)