Merge pull request #7 from wmde/factoryfix

Fixed constructor assertion in parser/formatter factories

Author: addshore

js/src/ValueFormatters/ValueFormatterFactory.js

@@ -121,7 +121,7 @@
 	 * @throws {Error} if the provided argument is not a valueFormatters.ValueFormatter constructor.
 	 */
 	function assertIsValueFormatterConstructor( Formatter ) {
-		if( !$.isFunction( Formatter ) && Formatter.prototype instanceof vf.ValueFormatter ) {
+		if( !( $.isFunction( Formatter ) && Formatter.prototype instanceof vf.ValueFormatter ) ) {
 			throw new Error( 'Invalid ValueFormatter constructor' );
 		}
 	}

js/src/ValueParsers/ValueParserFactory.js

@@ -119,7 +119,7 @@
 	 * @throws {Error} if the provided argument is not a valueParsers.ValueParser constructor.
 	 */
 	function assertIsValueParserConstructor( Parser ) {
-		if( !$.isFunction( Parser ) && Parser.prototype instanceof vp.ValueParser ) {
+		if( !( $.isFunction( Parser ) && Parser.prototype instanceof vp.ValueParser ) ) {
 			throw new Error( 'Invalid ValueParser constructor' );
 		}
 	}

js/tests/ValueFormatters/ValueFormatterFactory.tests.js

@@ -60,18 +60,11 @@
 			'Failed trying to register an invalid formatter constructor.'
 		);
 
-		assert.throws(
-			function() {
-				formatterFactory.registerDataTypeFormatter( StringFormatter, 'invalid' );
-			},
-			'Failed trying to register a formatter with an invalid purpose.'
-		);
-
 		formatterFactory.registerDataTypeFormatter( StringFormatter, stringType.getId() );
 
 		assert.throws(
 			function() {
-				formatterFactory.getFormatter( stringType.getId() );
+				formatterFactory.getFormatter( stringType );
 			},
 			'Failed trying to get a formatter with an invalid purpose.'
 		);
@@ -87,18 +80,11 @@
 			'Failed trying to register an invalid formatter constructor.'
 		);
 
-		assert.throws(
-			function() {
-				formatterFactory.registerDataValueFormatter( StringFormatter, 'invalid' );
-			},
-			'Failed trying to register a formatter with an invalid purpose.'
-		);
-
 		formatterFactory.registerDataValueFormatter( StringFormatter, StringValue.TYPE );
 
 		assert.throws(
 			function() {
-				formatterFactory.getFormatter( StringValue.TYPE );
+				formatterFactory.getFormatter( StringValue );
 			},
 			'Failed trying to get a formatter with an invalid purpose.'
 		);

js/tests/ValueParsers/ValueParserFactory.tests.js

@@ -60,18 +60,11 @@
 			'Failed trying to register an invalid parser constructor.'
 		);
 
-		assert.throws(
-			function() {
-				parserFactory.registerDataTypeParser( StringParser, 'invalid' );
-			},
-			'Failed trying to register a parser with an invalid purpose.'
-		);
-
 		parserFactory.registerDataTypeParser( StringParser, stringType.getId() );
 
 		assert.throws(
 			function() {
-				parserFactory.getParser( StringValue );
+				parserFactory.getParser( stringType );
 			},
 			'Failed trying to get a parser with an invalid purpose.'
 		);
@@ -87,13 +80,6 @@
 			'Failed trying to register an invalid parser constructor.'
 		);
 
-		assert.throws(
-			function() {
-				parserFactory.registerDataValueParser( StringParser, 'invalid' );
-			},
-			'Failed trying to register a parser with an invalid purpose.'
-		);
-
 		parserFactory.registerDataValueParser( StringParser, StringValue.TYPE );
 
 		assert.throws(