Merge "Adding more GenericArrayObject tests"

JeroenDeDauw · Jul 26, 2012 · 9bab036 · 9bab036
2 parents 662f01c + 41fcff4
commit 9bab036
Show file tree

Hide file tree

Showing 4 changed files with 189 additions and 13 deletions.
diff --git a/Diff/includes/Diff.php b/Diff/includes/Diff.php
@@ -203,17 +203,6 @@ public function unserialize( $serialization ) {
 		return $serializationData;
 	}
 
-	/**
-	 * @see IDiff::isEmpty
-	 *
-	 * @since 0.1
-	 *
-	 * @return boolean
-	 */
-	public function isEmpty() {
-		return $this->count() === 0;
-	}
-
 	/**
 	 * Returns the add operations.
 	 *

diff --git a/Diff/includes/GenericArrayObject.php b/Diff/includes/GenericArrayObject.php
@@ -219,4 +219,15 @@ public function unserialize( $serialization ) {
 		return $serializationData;
 	}
 
+	/**
+	 * Returns if the ArrayObject has no elements.
+	 *
+	 * @since 0.1
+	 *
+	 * @return boolean
+	 */
+	public function isEmpty() {
+		return $this->count() === 0;
+	}
+
 }
diff --git a/Diff/tests/DiffTest.php b/Diff/tests/DiffTest.php
@@ -21,8 +21,10 @@
  */
 class DiffTest extends GenericArrayObjectTest {
 
-	public function stuffProvider() {
+	public function elementInstancesProvider() {
 		return array(
+			array( array(
+			) ),
 			array( array(
 				new DiffOpAdd( 'ohi' )
 			) ),
@@ -49,7 +51,7 @@ public function stuffProvider() {
 	}
 
 	/**
-	 * @dataProvider stuffProvider
+	 * @dataProvider elementInstancesProvider
 	 */
 	public function testStuff( array $operations ) {
 		$diff = new Diff( $operations );
@@ -75,5 +77,20 @@ public function testStuff( array $operations ) {
 		$this->assertEquals( $count, $diff->count() );
 	}
 
+	public function instanceProvider() {
+		$instances = array();
+
+		foreach ( $this->stuffProvider() as $args ) {
+			$diffOps = $args[0];
+			$instances[] = new Diff( $diffOps );
+		}
+
+		return $instances;
+	}
+
+	public function getInstanceClass() {
+		return '\Diff\Diff';
+	}
+
 }
 
diff --git a/Diff/tests/GenericArrayObjectTest.php b/Diff/tests/GenericArrayObjectTest.php
@@ -1,6 +1,7 @@
 <?php
 
 namespace Diff\Test;
+use \Diff\GenericArrayObject as GenericArrayObject;
 
 /**
  * Tests for the Diff\GenericArrayObject and deriving classes.
@@ -17,6 +18,164 @@
  */
 abstract class GenericArrayObjectTest extends \MediaWikiTestCase {
 
+	public abstract function elementInstancesProvider();
 
+	public abstract function instanceProvider();
+
+	public abstract function getInstanceClass();
+
+	/**
+	 * @return GenericArrayObject
+	 */
+	protected function getNew( array $elements = array() ) {
+		$class = $this->getInstanceClass();
+		return new $class( $elements );
+	}
+
+	/**
+	 * @dataProvider elementInstancesProvider
+	 * @param array $elements
+	 */
+	public function testConstructor( array $elements ) {
+		$arrayObject = $this->getNew( $elements );
+
+		$this->assertEquals( count( $elements ), $arrayObject->count() );
+	}
+
+	/**
+	 * @dataProvider elementInstancesProvider
+	 * @param array $elements
+	 */
+	public function testIsEmpty( array $elements ) {
+		$arrayObject = $this->getNew( $elements );
+
+		$this->assertEquals( $elements === array(), $arrayObject->isEmpty() );
+	}
+
+	/**
+	 * @dataProvider instanceProvider
+	 * @param GenericArrayObject $list
+	 */
+	public function testUnset( GenericArrayObject $list ) {
+		if ( !$list->isEmpty() ) {
+			$offset = $list->getIterator()->key();
+			$count = $list->count();
+			$list->offsetUnset( $offset );
+			$this->assertEquals( $count - 1, $list->count() );
+		}
+
+		if ( !$list->isEmpty() ) {
+			$offset = $list->getIterator()->key();
+			$count = $list->count();
+			unset( $list[$offset] );
+			$this->assertEquals( $count - 1, $list->count() );
+		}
+
+		$exception = null;
+		try { $list->offsetUnset( 'sdfsedtgsrdysftu' ); } catch ( \Exception $exception ){}
+		$this->assertInstanceOf( '\Exception', $exception );
+	}
+
+	/**
+	 * @dataProvider elementInstancesProvider
+	 * @param array $elements
+	 */
+	public function testAppend( array $elements ) {
+		$list = $this->getNew();
+
+		$listSize = count( $elements );
+
+		foreach ( $elements as $element ) {
+			$list->append( $element );
+		}
+
+		$this->assertEquals( $listSize, $list->count() );
+
+		$list = $this->getNew();
+
+		foreach ( $elements as $element ) {
+			$list[] = $element;
+		}
+
+		$this->assertEquals( $listSize, $list->count() );
+
+		$this->checkTypeChecks( function( GenericArrayObject $list, $element ) {
+			$list->append( $element );
+		} );
+	}
+
+	protected function checkTypeChecks( $function ) {
+		$excption = null;
+		$list = $this->getNew();
+
+		$elementClass = $list->getObjectType();
+
+		foreach ( array( 42, 'foo', array(), new \stdClass(), 4.2 ) as $element ) {
+			$validValid = $element instanceof $elementClass;
+
+			try{
+				call_user_func( $function, $list, $element );
+				$valid = true;
+			}
+			catch ( \MWException $exception ) {
+				$valid = false;
+			}
+
+			$this->assertEquals(
+				$validValid,
+				$valid,
+				'Object of invalid type got successfully added to a GenericArrayObject'
+			);
+		}
+	}
+
+	/**
+	 * @dataProvider elementInstancesProvider
+	 * @param array $elements
+	 */
+	public function testOffsetSet( array $elements ) {
+		if ( $elements === array() ) {
+			$this->assertTrue( true );
+			return;
+		}
+
+		$list = $this->getNew();
+
+		$element = reset( $elements );
+		$list->offsetSet( 42, $element );
+		$this->assertEquals( $element, $list->offsetGet( 42 ) );
+
+		$list = $this->getNew();
+
+		$element = reset( $elements );
+		$list['oHai'] = $element;
+		$this->assertEquals( $element, $list['oHai'] );
+
+		$list = $this->getNew();
+
+		$element = reset( $elements );
+		$list->offsetSet( 9001, $element );
+		$this->assertEquals( $element, $list[9001] );
+
+		$list = $this->getNew();
+
+		$element = reset( $elements );
+		$list->offsetSet( null, $element );
+		$this->assertEquals( $element, $list[0] );
+
+		$list = $this->getNew();
+		$offset = 0;
+
+		foreach ( $elements as $element ) {
+			$list->offsetSet( null, $element );
+			$this->assertEquals( $element, $list[$offset++] );
+		}
+
+		$this->assertEquals( count( $elements ), $list->count() );
+
+		$this->checkTypeChecks( function( GenericArrayObject $list, $element ) {
+			$list->offsetSet( mt_rand(), $element );
+		} );
+	}
 
 }