Merge pull request #14 from DataValues/nonOptional

Fix broken tests
DataValues · Jan 5, 2015 · 3ce89f7 · 3ce89f7
2 parents c9f4dfd + 518beb7
commit 3ce89f7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/tests/DataValues/MonolingualTextValueTest.php b/tests/DataValues/MonolingualTextValueTest.php
@@ -38,13 +38,11 @@ public function validConstructorArgumentsProvider() {
 	public function invalidConstructorArgumentsProvider() {
 		$argLists = array();
 
-		$argLists[] = array( 42 );
-		$argLists[] = array( array() );
-		$argLists[] = array( false );
-		$argLists[] = array( true );
-		$argLists[] = array( null );
-		$argLists[] = array( 'foo' );
-		$argLists[] = array( 'en' );
+		$argLists[] = array( 42, null );
+		$argLists[] = array( array(), null );
+		$argLists[] = array( false, null );
+		$argLists[] = array( true, null );
+		$argLists[] = array( null, null );
 		$argLists[] = array( 'en', 42 );
 		$argLists[] = array( 'en', false );
 		$argLists[] = array( 'en', array() );

diff --git a/tests/DataValues/MultilingualTextValueTest.php b/tests/DataValues/MultilingualTextValueTest.php
@@ -45,22 +45,13 @@ public function validConstructorArgumentsProvider() {
 	public function invalidConstructorArgumentsProvider() {
 		$argLists = array();
 
-		$argLists[] = array( 42 );
-		$argLists[] = array( false );
-		$argLists[] = array( true );
-		$argLists[] = array( null );
-		$argLists[] = array( 'foo' );
-		$argLists[] = array( 'en' );
-		$argLists[] = array( 'en', 42 );
-		$argLists[] = array( 'en', false );
-		$argLists[] = array( 'en', array() );
-		$argLists[] = array( 'en', null );
-		$argLists[] = array( '', 'foo' );
-		$argLists[] = array( 'en', 'foo' );
-		$argLists[] = array( 'en', ' foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz foo bar baz ' );
-		$argLists[] = array( new MonolingualTextValue( 'en', 'foo' ) );
-
+		$argLists[] = array( array( 42 ) );
+		$argLists[] = array( array( false ) );
+		$argLists[] = array( array( true ) );
+		$argLists[] = array( array( null ) );
+		$argLists[] = array( array( array() ) );
 		$argLists[] = array( array( 'foo' ) );
+
 		$argLists[] = array( array( 42 => 'foo' ) );
 		$argLists[] = array( array( '' => 'foo' ) );
 		$argLists[] = array( array( 'en' => 42 ) );