Menu
▾
▴
[Arianne-commits] stendhal/tests/games/stendhal/server/entity/mapstuff/spawner PassiveEntityRespawnPointFactoryTest.java, 1.9, 1.10
|
From: Hendrik B. <nh...@us...> - 2012-03-26 20:03:29
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/entity/mapstuff/spawner
In directory vz-cvs-4.sog:/tmp/cvs-serv20150/tests/games/stendhal/server/entity/mapstuff/spawner
Modified Files:
PassiveEntityRespawnPointFactoryTest.java
Log Message:
removed instanceof check and cast to the same type as the variable is defined
Index: PassiveEntityRespawnPointFactoryTest.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/entity/mapstuff/spawner/PassiveEntityRespawnPointFactoryTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PassiveEntityRespawnPointFactoryTest.java 11 Nov 2011 21:36:25 -0000 1.9
--- PassiveEntityRespawnPointFactoryTest.java 26 Mar 2012 20:03:26 -0000 1.10
***************
*** 146,180 ****
.create(clazz, 1, null, 0, 0);
assertNotNull(value_1);
- assertTrue(value_1 instanceof PassiveEntityRespawnPoint);
assertEquals("You see a small vein of iron ore.",
! ((PassiveEntityRespawnPoint) value_1).getDescription());
PassiveEntityRespawnPoint value_2 = PassiveEntityRespawnPointFactory
.create(clazz, 2, null, 0, 0);
assertNotNull(value_2);
- assertTrue(value_2 instanceof PassiveEntityRespawnPoint);
assertEquals("You see a trace of a gold shimmer.",
! ((PassiveEntityRespawnPoint) value_2).getDescription());
PassiveEntityRespawnPoint value_3 = PassiveEntityRespawnPointFactory
.create(clazz, 3, null, 0, 0);
assertNotNull(value_3);
- assertTrue(value_3 instanceof PassiveEntityRespawnPoint);
assertEquals("You see a trace of a silvery shimmer.",
! ((PassiveEntityRespawnPoint) value_3).getDescription());
PassiveEntityRespawnPoint value_4 = PassiveEntityRespawnPointFactory
.create(clazz, 4, null, 0, 0);
assertNotNull(value_4);
- assertTrue(value_4 instanceof PassiveEntityRespawnPoint);
assertEquals("You see tiny gold shards.",
! ((PassiveEntityRespawnPoint) value_4).getDescription());
PassiveEntityRespawnPoint value_5 = PassiveEntityRespawnPointFactory
.create(clazz, 5, null, 0, 0);
assertNotNull(value_5);
- assertTrue(value_5 instanceof PassiveEntityRespawnPoint);
assertEquals("You see tiny pieces of mithril ore.",
! ((PassiveEntityRespawnPoint) value_5).getDescription());
PassiveEntityRespawnPoint value_6 = PassiveEntityRespawnPointFactory
--- 146,175 ----
.create(clazz, 1, null, 0, 0);
assertNotNull(value_1);
assertEquals("You see a small vein of iron ore.",
! value_1.getDescription());
PassiveEntityRespawnPoint value_2 = PassiveEntityRespawnPointFactory
.create(clazz, 2, null, 0, 0);
assertNotNull(value_2);
assertEquals("You see a trace of a gold shimmer.",
! value_2.getDescription());
PassiveEntityRespawnPoint value_3 = PassiveEntityRespawnPointFactory
.create(clazz, 3, null, 0, 0);
assertNotNull(value_3);
assertEquals("You see a trace of a silvery shimmer.",
! value_3.getDescription());
PassiveEntityRespawnPoint value_4 = PassiveEntityRespawnPointFactory
.create(clazz, 4, null, 0, 0);
assertNotNull(value_4);
assertEquals("You see tiny gold shards.",
! value_4.getDescription());
PassiveEntityRespawnPoint value_5 = PassiveEntityRespawnPointFactory
.create(clazz, 5, null, 0, 0);
assertNotNull(value_5);
assertEquals("You see tiny pieces of mithril ore.",
! value_5.getDescription());
PassiveEntityRespawnPoint value_6 = PassiveEntityRespawnPointFactory
***************
*** 207,213 ****
.create(clazz, 0, null, 0, 0);
assertNotNull(value_0);
- assertTrue(value_0 instanceof PassiveEntityRespawnPoint);
assertEquals("You see a place where an apple looks likely to fall.",
! ((PassiveEntityRespawnPoint) value_0).getDescription());
PassiveEntityRespawnPoint value_1 = PassiveEntityRespawnPointFactory
--- 202,207 ----
.create(clazz, 0, null, 0, 0);
assertNotNull(value_0);
assertEquals("You see a place where an apple looks likely to fall.",
! value_0.getDescription());
PassiveEntityRespawnPoint value_1 = PassiveEntityRespawnPointFactory
***************
*** 279,283 ****
assertTrue(value_11 instanceof VegetableGrower);
assertEquals("garlic", ((VegetableGrower) value_11).getVegetableName());
!
PassiveEntityRespawnPoint value_12 = PassiveEntityRespawnPointFactory
.create(clazz, 12, null, 0, 0);
--- 273,277 ----
assertTrue(value_11 instanceof VegetableGrower);
assertEquals("garlic", ((VegetableGrower) value_11).getVegetableName());
!
PassiveEntityRespawnPoint value_12 = PassiveEntityRespawnPointFactory
.create(clazz, 12, null, 0, 0);
***************
*** 302,323 ****
.create(clazz, 0, null, 0, 0);
assertNotNull(value_0);
- assertTrue(value_0 instanceof PassiveEntityRespawnPoint);
assertEquals("You see trace elements of some red crystal.",
! ((PassiveEntityRespawnPoint) value_0).getDescription());
PassiveEntityRespawnPoint value_1 = PassiveEntityRespawnPointFactory
.create(clazz, 1, null, 0, 0);
assertNotNull(value_1);
- assertTrue(value_1 instanceof PassiveEntityRespawnPoint);
assertEquals(
"You see evidence of a sapphire stone being here recently.",
! ((PassiveEntityRespawnPoint) value_1).getDescription());
PassiveEntityRespawnPoint value_2 = PassiveEntityRespawnPointFactory
.create(clazz, 2, null, 0, 0);
assertNotNull(value_2);
- assertTrue(value_2 instanceof PassiveEntityRespawnPoint);
assertEquals("You see trace elements of the precious gem emerald.",
! ((PassiveEntityRespawnPoint) value_2).getDescription());
PassiveEntityRespawnPoint value_3 = PassiveEntityRespawnPointFactory
--- 296,314 ----
.create(clazz, 0, null, 0, 0);
assertNotNull(value_0);
assertEquals("You see trace elements of some red crystal.",
! value_0.getDescription());
PassiveEntityRespawnPoint value_1 = PassiveEntityRespawnPointFactory
.create(clazz, 1, null, 0, 0);
assertNotNull(value_1);
assertEquals(
"You see evidence of a sapphire stone being here recently.",
! value_1.getDescription());
PassiveEntityRespawnPoint value_2 = PassiveEntityRespawnPointFactory
.create(clazz, 2, null, 0, 0);
assertNotNull(value_2);
assertEquals("You see trace elements of the precious gem emerald.",
! value_2.getDescription());
PassiveEntityRespawnPoint value_3 = PassiveEntityRespawnPointFactory
***************
*** 337,343 ****
.create(clazz, 0, null, 0, 0);
assertNotNull(value_0);
- assertTrue(value_0 instanceof PassiveEntityRespawnPoint);
assertEquals("You see a place where a coconut looks likely to fall.",
! ((PassiveEntityRespawnPoint) value_0).getDescription());
PassiveEntityRespawnPoint value_1 = PassiveEntityRespawnPointFactory
--- 328,333 ----
.create(clazz, 0, null, 0, 0);
assertNotNull(value_0);
assertEquals("You see a place where a coconut looks likely to fall.",
! value_0.getDescription());
PassiveEntityRespawnPoint value_1 = PassiveEntityRespawnPointFactory
***************
*** 350,356 ****
.create(clazz, 2, null, 0, 0);
assertNotNull(value_2);
- assertTrue(value_2 instanceof PassiveEntityRespawnPoint);
assertEquals("It looks like there's a pineapple sprout growing here.",
! ((PassiveEntityRespawnPoint) value_2).getDescription());
PassiveEntityRespawnPoint value_8 = PassiveEntityRespawnPointFactory
--- 340,345 ----
.create(clazz, 2, null, 0, 0);
assertNotNull(value_2);
assertEquals("It looks like there's a pineapple sprout growing here.",
! value_2.getDescription());
PassiveEntityRespawnPoint value_8 = PassiveEntityRespawnPointFactory
***************
*** 369,406 ****
.create(clazz, 0, null, 0, 0);
assertNotNull(value_0);
- assertTrue(value_0 instanceof PassiveEntityRespawnPoint);
assertEquals(
"You see some leftovers of animal food. Might be meat.",
! ((PassiveEntityRespawnPoint) value_0).getDescription());
PassiveEntityRespawnPoint value_1 = PassiveEntityRespawnPointFactory
.create(clazz, 1, null, 0, 0);
assertNotNull(value_1);
- assertTrue(value_1 instanceof PassiveEntityRespawnPoint);
assertEquals(
"You see some leftovers of animal food. Looks like ham.",
! ((PassiveEntityRespawnPoint) value_1).getDescription());
PassiveEntityRespawnPoint value_2 = PassiveEntityRespawnPointFactory
.create(clazz, 2, null, 0, 0);
assertNotNull(value_2);
- assertTrue(value_2 instanceof PassiveEntityRespawnPoint);
assertEquals(
"You see some leftovers of animal food. Maybe chicken?",
! ((PassiveEntityRespawnPoint) value_2).getDescription());
PassiveEntityRespawnPoint value_3 = PassiveEntityRespawnPointFactory
.create(clazz, 3, null, 0, 0);
assertNotNull(value_3);
- assertTrue(value_3 instanceof PassiveEntityRespawnPoint);
assertEquals("You see some shimmering fish scales like from a roach.",
! ((PassiveEntityRespawnPoint) value_3).getDescription());
PassiveEntityRespawnPoint value_4 = PassiveEntityRespawnPointFactory
.create(clazz, 4, null, 0, 0);
assertNotNull(value_4);
- assertTrue(value_4 instanceof PassiveEntityRespawnPoint);
assertEquals("You see some red fish scales like from a char.",
! ((PassiveEntityRespawnPoint) value_4).getDescription());
PassiveEntityRespawnPoint value_5 = PassiveEntityRespawnPointFactory
--- 358,390 ----
.create(clazz, 0, null, 0, 0);
assertNotNull(value_0);
assertEquals(
"You see some leftovers of animal food. Might be meat.",
! value_0.getDescription());
PassiveEntityRespawnPoint value_1 = PassiveEntityRespawnPointFactory
.create(clazz, 1, null, 0, 0);
assertNotNull(value_1);
assertEquals(
"You see some leftovers of animal food. Looks like ham.",
! value_1.getDescription());
PassiveEntityRespawnPoint value_2 = PassiveEntityRespawnPointFactory
.create(clazz, 2, null, 0, 0);
assertNotNull(value_2);
assertEquals(
"You see some leftovers of animal food. Maybe chicken?",
! value_2.getDescription());
PassiveEntityRespawnPoint value_3 = PassiveEntityRespawnPointFactory
.create(clazz, 3, null, 0, 0);
assertNotNull(value_3);
assertEquals("You see some shimmering fish scales like from a roach.",
! value_3.getDescription());
PassiveEntityRespawnPoint value_4 = PassiveEntityRespawnPointFactory
.create(clazz, 4, null, 0, 0);
assertNotNull(value_4);
assertEquals("You see some red fish scales like from a char.",
! value_4.getDescription());
PassiveEntityRespawnPoint value_5 = PassiveEntityRespawnPointFactory
|