Merge pull request #53 from wmde/fixTests

Partly revert cloning changes and fix tests

Author: JonasKress

src/List.js

@@ -37,7 +37,7 @@ var SELF = wb.datamodel.List = util.inherit(
 			this._assertIsItem( items[i] );
 		}
 
-		this._items = items;
+		this._items = items.slice();
 		this.length = items.length;
 	},
 {

src/Map.js

@@ -26,13 +26,13 @@ var SELF = wb.datamodel.Map = function WbDataModelMap( ItemConstructor, map ) {
 	}
 
 	this._ItemConstructor = ItemConstructor;
+	this._items = {};
 
 	for( var key in map ) {
 		this._assertIsItem( map[key] );
 		this.length++;
+		this._items[key] = map[key];
 	}
-
-	this._items = map;
 };
 
 $.extend( SELF.prototype, {

src/Set.js

@@ -51,6 +51,7 @@ var SELF = wb.datamodel.Set = util.inherit(
 				throw new Error( 'There may only be one item per item key' );
 			}
 
+			this.length++;
 			this._items[key] = items[i];
 		}
 	},

tests/Group.tests.js

@@ -171,7 +171,7 @@ QUnit.test( 'Constructor', function( assert ) {
 } );
 
 QUnit.test( 'setItemContainer() & getItemContainer()', function( assert ) {
-	assert.expect( 6 );
+	assert.expect( 4 );
 	var container = getTestContainer( 'key', 1 ),
 		group = createGroup( 'key', container ),
 		newContainer = getTestContainer( 'key', 3 );
@@ -187,22 +187,11 @@ QUnit.test( 'setItemContainer() & getItemContainer()', function( assert ) {
 		'Verified returned container matching returned container.'
 	);
 
-	container.addItem( getTestItems( 'key', 2 )[1] );
-
-	assert.ok(
-		!group.getItemContainer().equals( container ),
-		'Group container does not match original container manipulated after Group instantiation.'
-	);
-
-	assert.ok(
-		!group.getItemContainer().equals( newContainer ),
-		'Verified returned container not matching not yet set new container.'
-	);
-
 	group.setItemContainer( newContainer );
 
-	assert.ok(
-		group.getItemContainer().equals( newContainer ),
+	assert.strictEqual(
+		newContainer,
+		group.getItemContainer(),
 		'Set new container.'
 	);
 

tests/List.tests.js

@@ -30,7 +30,7 @@ function getTestItems( n ) {
 }
 
 QUnit.test( 'Constructor', function( assert ) {
-	assert.expect( 5 );
+	assert.expect( 6 );
 	assert.ok(
 		( new wb.datamodel.List( TestItem ) ) instanceof wb.datamodel.List,
 		'Instantiated empty List.'
@@ -44,10 +44,10 @@ QUnit.test( 'Constructor', function( assert ) {
 		'Instantiated filled List.'
 	);
 
-	assert.strictEqual(
+	assert.notStrictEqual(
 		items,
 		list._items,
-		'Constructor does not clone.'
+		'Constructor does clone.'
 	);
 
 	assert.equal(

tests/Map.tests.js

@@ -46,7 +46,7 @@ function createMap( map ) {
 }
 
 QUnit.test( 'Constructor', function( assert ) {
-	assert.expect( 7 );
+	assert.expect( 8 );
 	assert.ok(
 		createMap() instanceof wb.datamodel.Map,
 		'Instantiated empty Map.'
@@ -60,10 +60,10 @@ QUnit.test( 'Constructor', function( assert ) {
 		'Instantiated filled Map.'
 	);
 
-	assert.strictEqual(
+	assert.notStrictEqual(
 		items,
 		map._items,
-		'Constructor does not clone.'
+		'Constructor does clone.'
 	);
 
 	assert.equal(

tests/MultiTerm.tests.js

@@ -25,7 +25,7 @@ QUnit.test( 'Constructor (positive)', function( assert ) {
 } );
 
 QUnit.test( 'Constructor (negative)', function( assert ) {
-	assert.expect( 4 );
+	assert.expect( 5 );
 	var negativeTestSets = [
 		[undefined, []],
 		['', undefined],

tests/Set.tests.js

@@ -46,7 +46,7 @@ function createSet( items ) {
 }
 
 QUnit.test( 'Constructor', function( assert ) {
-	assert.expect( 7 );
+	assert.expect( 8 );
 	assert.ok(
 		createSet() instanceof wb.datamodel.Set,
 		'Instantiated empty Set.'

tests/Term.tests.js

@@ -33,7 +33,7 @@ QUnit.test( 'Constructor (positive)', function( assert ) {
 } );
 
 QUnit.test( 'Constructor (negative)', function( assert ) {
-	assert.expect( 4 );
+	assert.expect( 5 );
 	function instantiateObject( languageCode, text ) {
 		return function() {
 			return new wb.datamodel.Term( languageCode, text );