Add StringParserTest

Author: thiemowmde

README.md

@@ -52,6 +52,9 @@ DataValues Common has been written by the Wikidata team, as [Wikimedia Germany]
 ### 0.3.0 (2015-08-11)
 
 * Added `DispatchingValueParser`
+* Added `StringNormalizer` interface
+* Added `NullStringNormalizer`
+* Added `StringParser`
 * Dropped deprecated constant `DataValuesCommon_VERSION`, use `DATAVALUES_COMMON_VERSION` instead
 * Dropped `ValueParserTestBase::getParserClass`
 * Dropped `ValueParserTestBase::newParserOptions`

src/ValueParsers/Normalizers/NullStringNormalizer.php

@@ -7,14 +7,17 @@
 /**
  * Null implementation of StringNormalizer.
  *
+ * @since 0.3
+ *
  * @license GPL 2+
  * @author Daniel Kinzler
  */
 class NullStringNormalizer implements StringNormalizer {
 
 	/**
-	 * @param string $value the value to normalize
+	 * @param string $value
 	 *
+	 * @throws InvalidArgumentException if $value is not a string
 	 * @return string the normalized value
 	 */
 	public function normalize( $value ) {

src/ValueParsers/Normalizers/StringNormalizer.php

@@ -5,19 +5,20 @@
 use InvalidArgumentException;
 
 /**
- * Interface for string normalization
+ * Interface for string normalization.
+ *
+ * @since 0.3
  *
  * @license GPL 2+
  * @author Daniel Kinzler
  */
 interface StringNormalizer {
 
 	/**
-	 * @param string $value the value to normalize
-	 *
-	 * @return string the normalized value
+	 * @param string $value
 	 *
 	 * @throws InvalidArgumentException if $value is not a string
+	 * @return string the normalized value
 	 */
 	public function normalize( $value );
 

src/ValueParsers/StringParser.php

@@ -2,15 +2,15 @@
 
 namespace ValueParsers;
 
-use InvalidArgumentException;
 use DataValues\StringValue;
+use InvalidArgumentException;
 use ValueParsers\Normalizers\NullStringNormalizer;
 use ValueParsers\Normalizers\StringNormalizer;
 
 /**
  * Implementation of the ValueParser interface for StringValues.
  *
- * @since 0.2.4
+ * @since 0.3
  *
  * @licence GNU GPL v2+
  * @author Daniel Kinzler
@@ -26,21 +26,16 @@ class StringParser implements ValueParser {
 	 * @param StringNormalizer $normalizer
 	 */
 	public function __construct( StringNormalizer $normalizer = null ) {
-		if ( $normalizer === null ) {
-			$normalizer = new NullStringNormalizer();
-		}
-
-		$this->normalizer = $normalizer;
+		$this->normalizer = $normalizer ?: new NullStringNormalizer();
 	}
 
 	/**
 	 * @see ValueParser::parse
 	 *
 	 * @param string $value
 	 *
-	 * @return StringValue
-	 *
 	 * @throws InvalidArgumentException if $value is not a string
+	 * @return StringValue
 	 */
 	public function parse( $value ) {
 		if ( !is_string( $value ) ) {

tests/ValueParsers/Normalizers/NullStringNormalizerTest.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace ValueParsers\Normalizers\Test;
+
+use DataValues\DataValue;
+use DataValues\StringValue;
+use PHPUnit_Framework_TestCase;
+use ValueParsers\Normalizers\NullStringNormalizer;
+
+/**
+ * @covers ValueParsers\Normalizers\NullStringNormalizer
+ *
+ * @group ValueParsers
+ * @group DataValueExtensions
+ *
+ * @licence GNU GPL v2+
+ * @author Thiemo Mättig
+ */
+class NullStringNormalizerTest extends PHPUnit_Framework_TestCase {
+
+	/**
+	 * @dataProvider stringProvider
+	 */
+	public function testNormalize( $value ) {
+		$normalizer = new NullStringNormalizer();
+		$this->assertSame( $value, $normalizer->normalize( $value ) );
+	}
+
+	public function stringProvider() {
+		return array(
+			array( '' ),
+			array( 'a' ),
+			array( ' a ' ),
+		);
+	}
+
+	/**
+	 * @dataProvider invalidValueProvider
+	 */
+	public function testNormalizeException( $value ) {
+		$normalizer = new NullStringNormalizer();
+		$this->setExpectedException( 'InvalidArgumentException' );
+		$normalizer->normalize( $value );
+	}
+
+	public function invalidValueProvider() {
+		return array(
+			array( null ),
+			array( true ),
+			array( 1 ),
+			array( new StringValue( '' ) ),
+		);
+	}
+
+}

tests/ValueParsers/StringParserTest.php

@@ -4,14 +4,11 @@
 
 use DataValues\DataValue;
 use DataValues\StringValue;
+use ValueParsers\Normalizers\StringNormalizer;
 use ValueParsers\StringParser;
 
 /**
- * Unit test StringParser class.
- *
- * @covers StringParser
- *
- * @since 0.1
+ * @covers ValueParsers\StringParser
  *
  * @group ValueParsers
  * @group DataValueExtensions
@@ -38,15 +35,15 @@ public function provideParse() {
 	/**
 	 * @dataProvider provideParse
 	 */
-	public function testParse( $input, $normalizer, DataValue $expected ) {
+	public function testParse( $input, StringNormalizer $normalizer = null, DataValue $expected ) {
 		$parser = new StringParser( $normalizer );
 		$value = $parser->parse( $input );
 
 		$this->assertInstanceOf( 'DataValues\StringValue', $value );
 		$this->assertEquals( $expected->toArray(), $value->toArray() );
 	}
 
-	public function provideParse_InvalidArgumentException() {
+	public function nonStringProvider() {
 		return array(
 			'null' => array( null ),
 			'array' => array( array() ),
@@ -55,12 +52,11 @@ public function provideParse_InvalidArgumentException() {
 	}
 
 	/**
-	 * @dataProvider provideParse_InvalidArgumentException
+	 * @dataProvider nonStringProvider
 	 */
-	public function testParse_InvalidArgumentException( $input ) {
-		$this->setExpectedException( 'InvalidArgumentException' );
-
+	public function testGivenNonString_parseThrowsException( $input ) {
 		$parser = new StringParser();
+		$this->setExpectedException( 'InvalidArgumentException' );
 		$parser->parse( $input );
 	}