simplified unit test TestCmdSetColor.js

Mario Schuettel · Mario Schuettel · commit 2436aa4c44ad · 2015-10-06T16:34:46.000+02:00
diff --git a/test/unit/editor/TestCmdSetColor.js b/test/unit/editor/TestCmdSetColor.js
@@ -3,38 +3,33 @@ module( "CmdSetColor" );
 test("Test CmdSetColor (Undo and Redo)", function() {
 
 	var editor = new Editor();
-
-	var object = aPointlight( "The light Light" );
+	var pointLight = aPointlight( "The light Light" );
+	editor.execute( new CmdAddObject( pointLight ) );
 
 	var green   = 12581843; // bffbd3
 	var blue    = 14152447; // d7f2ff
 	var yellow  = 16775383; // fff8d7
 
-	editor.execute( new CmdAddObject( object ) );
+	var colors = [ green, blue, yellow ];
 
-	// set color to green
-	var cmd = new CmdSetColor( object, 'color', green );
-	cmd.updatable = false;	// Because otherwise the commands are merged into one command
-	editor.execute( cmd );
-	ok( object.color.getHex() == green , "OK, color has been set successfully, Expected: '" + green + "', Actual: '" + object.color.getHex() + "'" );
+	colors.map( function( color ) {
 
-	// set color to blue
-	var cmd = new CmdSetColor( object, 'color', blue );
-	cmd.updatable = false;	// Because otherwise the commands are merged into one command
-	editor.execute( cmd );
-	ok( object.color.getHex() == blue , "OK, color has been set successfully, Expected: '" + blue + "', Actual: '" + object.color.getHex() + "'" );
+		var cmd = new CmdSetColor( pointLight, 'color', color );
+		cmd.updatable = false;
+		editor.execute( cmd );
 
-	// set color to yellow
-	var cmd = new CmdSetColor( object, 'color', yellow );
-	cmd.updatable = false;	// Because otherwise the commands are merged into one command
-	editor.execute( cmd );
-	ok( object.color.getHex() == yellow , "OK, color has been set successfully, Expected: '" + yellow + "', Actual: '" + object.color.getHex() + "'" );
+	});
 
+	ok( pointLight.color.getHex() == colors[ colors.length - 1 ],
+		"OK, color has been set successfully (expected: '" + colors[ colors.length - 1 ] + "', actual: '" + pointLight.color.getHex() + "')" );
 
 	editor.undo();
-	ok( object.color.getHex() == blue, "OK, changing color has been undone, Expected: '" + blue + "', Actual: '" + object.color.getHex() + "'" );
+	ok( pointLight.color.getHex() == colors[ colors.length - 2 ],
+		"OK, color has been set successfully after undo (expected: '" + colors[ colors.length - 2 ] + "', actual: '" + pointLight.color.getHex() + "')" );
 
 	editor.redo();
-	ok( object.color.getHex() == yellow , "OK, changing color has been redone, Expected: '" + yellow + "', Actual: '" + object.color.getHex() + "'" );
+	ok( pointLight.color.getHex() == colors[ colors.length - 1 ],
+		"OK, color has been set successfully after redo (expected: '" + colors[ colors.length - 1 ] + "', actual: '" + pointLight.color.getHex() + "')" );
+
 
 });
