Test aggregate property mappings

danschultz · Sep 2, 2011 · 48e26dd · 48e26dd
1 parent 17c3f9a
commit 48e26dd
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/tests/mesh/Name.as b/tests/mesh/Name.as
@@ -8,39 +8,39 @@ package mesh
 
 	public class Name implements IExternalizable
 	{
-		public function Name(firstName:String = "", lastName:String = "")
+		public function Name(first:String = "", last:String = "")
 		{
-			_firstName = firstName;
-			_lastName = lastName;
+			_first = first;
+			_last = last;
 		}
 
 		public function equals(name:Name):Boolean
 		{
-			return firstName == name.firstName && lastName == name.lastName;
+			return first == name.first && last == name.last;
 		}
 
 		public function readExternal(input:IDataInput):void
 		{
-			_firstName = input.readUTF();
-			_lastName = input.readUTF();
+			_first = input.readUTF();
+			_last = input.readUTF();
 		}
 
 		public function writeExternal(output:IDataOutput):void
 		{
-			output.writeUTF(firstName);
-			output.writeUTF(lastName);
+			output.writeUTF(first);
+			output.writeUTF(last);
 		}
 
-		private var _firstName:String;
-		public function get firstName():String
+		private var _first:String;
+		public function get first():String
 		{
-			return _firstName;
+			return _first;
 		}
 
-		private var _lastName:String;
-		public function get lastName():String
+		private var _last:String;
+		public function get last():String
 		{
-			return _lastName;
+			return _last;
 		}
 	}
 }
diff --git a/tests/mesh/Person.as b/tests/mesh/Person.as
@@ -25,7 +25,7 @@ package mesh
 		override public function fromObject(object:Object):void
 		{
 			super.fromObject(object);
-			name = object.name != null ? new Name(object.name.firstName, object.name.lastName) : null;
+			name = object.name != null ? new Name(object.name.first, object.name.last) : null;
 		}
 
 		override protected function get serializableOptions():Object

diff --git a/tests/mesh/model/AggregateTestMockEntity.as b/tests/mesh/model/AggregateTestMockEntity.as
@@ -6,12 +6,12 @@ package mesh.model
 	{
 		[Bindable] public var name:Name;
 		[Bindable] public var firstName:String;
-		[Bindable] public var lastName:String;
+		[Bindable] public var last:String;
 
 		public function AggregateTestMockEntity(values:Object=null)
 		{
 			super(values);
-			aggregate("name", Name, ["firstName", "lastName"]);
+			aggregate("name", Name, ["first:firstName", "last"]);
 		}
 	}
 }
diff --git a/tests/mesh/model/AggregateTests.as b/tests/mesh/model/AggregateTests.as
@@ -19,17 +19,17 @@ package mesh.model
 		public function testPropertyChangeUpdatesAggregate():void
 		{
 			_entity.firstName = "Thom";
-			_entity.lastName = "Yorke";
-			assertThat(_entity.name.firstName, equalTo(_entity.firstName));
-			assertThat(_entity.name.lastName, equalTo(_entity.lastName));
+			_entity.last = "Yorke";
+			assertThat(_entity.name.first, equalTo(_entity.firstName));
+			assertThat(_entity.name.last, equalTo(_entity.last));
 		}
 
 		[Test]
 		public function testAggregateChangeUpdatesProperties():void
 		{
 			_entity.name = new Name("Thom", "Yorke");
-			assertThat(_entity.firstName, equalTo(_entity.name.firstName));
-			assertThat(_entity.lastName, equalTo(_entity.name.lastName));
+			assertThat(_entity.firstName, equalTo(_entity.name.first));
+			assertThat(_entity.last, equalTo(_entity.name.last));
 		}
 	}
 }
diff --git a/tests/mesh/model/serialization/SerializerTests.as b/tests/mesh/model/serialization/SerializerTests.as
@@ -88,7 +88,7 @@ package mesh.model.serialization
 
 			assertThat(serialized.id, equalTo(_customer.id));
 			assertThat(serialized.age, equalTo(_customer.age));
-			assertThat(serialized.name, hasProperties({firstName:_customer.name.firstName, lastName:_customer.name.lastName}));
+			assertThat(serialized.name, hasProperties({first:_customer.name.first, last:_customer.name.last}));
 			assertThat(serialized.address, hasProperties({street:_customer.address.street}));
 			assertThat(serialized.address.city, nullValue());
 			assertThat(serialized.account, nullValue());

diff --git a/tests/mesh/model/store/FindTests.as b/tests/mesh/model/store/FindTests.as
@@ -44,7 +44,7 @@ package mesh.model.store
 			var customer:Person = _store.find(Person, _jimmyPage.id);
 			assertThat(_store.index.contains(customer), equalTo(true));
 			assertThat(customer.id, equalTo(_jimmyPage.id));
-			assertThat(customer.name, hasProperties({firstName:_jimmyPage.name.firstName, lastName:_jimmyPage.name.lastName}));
+			assertThat(customer.name, hasProperties({first:_jimmyPage.name.first, last:_jimmyPage.name.last}));
 		}
 
 		[Test]
@@ -53,8 +53,8 @@ package mesh.model.store
 			var result:ResultList = _store.find(new LocalQuery().on(Person));
 			var results:Array = result.toArray();
 			assertThat(results.length, equalTo(2));
-			assertThat(results, array(hasProperties({id:_jimmyPage.id, name:hasProperties({firstName:_jimmyPage.name.firstName, lastName:_jimmyPage.name.lastName})}),
-									  hasProperties({id:_robertPlant.id, name:hasProperties({firstName:_robertPlant.name.firstName, lastName:_robertPlant.name.lastName})})));
+			assertThat(results, array(hasProperties({id:_jimmyPage.id, name:hasProperties({first:_jimmyPage.name.first, last:_jimmyPage.name.last})}),
+									  hasProperties({id:_robertPlant.id, name:hasProperties({first:_robertPlant.name.first, last:_robertPlant.name.last})})));
 		}
 	}
 }