From: Hendrik B. <nh...@us...> - 2012-03-26 19:47:32
|
Update of /cvsroot/arianne/stendhal/tests/games/stendhal/server/entity In directory vz-cvs-4.sog:/tmp/cvs-serv17701/tests/games/stendhal/server/entity Modified Files: RPEntityTest.java Log Message: code format Index: RPEntityTest.java =================================================================== RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/server/entity/RPEntityTest.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** RPEntityTest.java 11 Jan 2012 18:44:04 -0000 1.30 --- RPEntityTest.java 26 Mar 2012 19:47:30 -0000 1.31 *************** *** 51,55 **** import utilities.RPClass.ItemTestHelper; - public class RPEntityTest { --- 51,54 ---- *************** *** 93,97 **** assertThat(RPEntity.applyDistanceAttackModifiers(damage, 49, 7), is(43)); assertThat(RPEntity.applyDistanceAttackModifiers(damage, 64, 7), is(0)); ! // same with non standard distances. // a short range weapon first --- 92,96 ---- assertThat(RPEntity.applyDistanceAttackModifiers(damage, 49, 7), is(43)); assertThat(RPEntity.applyDistanceAttackModifiers(damage, 64, 7), is(0)); ! // same with non standard distances. // a short range weapon first *************** *** 102,106 **** assertThat(RPEntity.applyDistanceAttackModifiers(damage, 16, 4), is(64)); assertThat(RPEntity.applyDistanceAttackModifiers(damage, 25, 4), is(0)); ! // and a long range weapon (dunno if we actually have anything for // this long range) --- 101,105 ---- assertThat(RPEntity.applyDistanceAttackModifiers(damage, 16, 4), is(64)); assertThat(RPEntity.applyDistanceAttackModifiers(damage, 25, 4), is(0)); ! // and a long range weapon (dunno if we actually have anything for // this long range) *************** *** 139,225 **** int defenderDEF = 1; int attackerATK = 1; ! assertThat(entity.calculateRiskForCanHit(1, defenderDEF, attackerATK), ! is(19)); ! assertThat(entity.calculateRiskForCanHit(2, defenderDEF, attackerATK), ! is(18)); ! assertThat(entity.calculateRiskForCanHit(3, defenderDEF, attackerATK), ! is(17)); ! assertThat(entity.calculateRiskForCanHit(4, defenderDEF, attackerATK), ! is(16)); ! assertThat(entity.calculateRiskForCanHit(5, defenderDEF, attackerATK), ! is(15)); ! assertThat(entity.calculateRiskForCanHit(6, defenderDEF, attackerATK), ! is(14)); ! assertThat(entity.calculateRiskForCanHit(7, defenderDEF, attackerATK), ! is(13)); ! assertThat(entity.calculateRiskForCanHit(8, defenderDEF, attackerATK), ! is(12)); ! assertThat(entity.calculateRiskForCanHit(9, defenderDEF, attackerATK), ! is(11)); ! assertThat(entity.calculateRiskForCanHit(10, defenderDEF, attackerATK), ! is(10)); ! assertThat(entity.calculateRiskForCanHit(11, defenderDEF, attackerATK), ! is(9)); ! assertThat(entity.calculateRiskForCanHit(12, defenderDEF, attackerATK), ! is(8)); ! assertThat(entity.calculateRiskForCanHit(13, defenderDEF, attackerATK), ! is(7)); ! assertThat(entity.calculateRiskForCanHit(14, defenderDEF, attackerATK), ! is(6)); ! assertThat(entity.calculateRiskForCanHit(15, defenderDEF, attackerATK), ! is(5)); ! assertThat(entity.calculateRiskForCanHit(16, defenderDEF, attackerATK), ! is(4)); ! assertThat(entity.calculateRiskForCanHit(17, defenderDEF, attackerATK), ! is(3)); ! assertThat(entity.calculateRiskForCanHit(18, defenderDEF, attackerATK), ! is(2)); ! assertThat(entity.calculateRiskForCanHit(19, defenderDEF, attackerATK), ! is(1)); ! assertThat(entity.calculateRiskForCanHit(20, defenderDEF, attackerATK), ! is(0)); defenderDEF = 10; attackerATK = 5; ! assertThat(entity.calculateRiskForCanHit(1, defenderDEF, attackerATK), ! is(90)); ! assertThat(entity.calculateRiskForCanHit(2, defenderDEF, attackerATK), ! is(80)); ! assertThat(entity.calculateRiskForCanHit(3, defenderDEF, attackerATK), ! is(70)); ! assertThat(entity.calculateRiskForCanHit(4, defenderDEF, attackerATK), ! is(60)); ! assertThat(entity.calculateRiskForCanHit(5, defenderDEF, attackerATK), ! is(50)); ! assertThat(entity.calculateRiskForCanHit(6, defenderDEF, attackerATK), ! is(40)); ! assertThat(entity.calculateRiskForCanHit(7, defenderDEF, attackerATK), ! is(30)); ! assertThat(entity.calculateRiskForCanHit(8, defenderDEF, attackerATK), ! is(20)); ! assertThat(entity.calculateRiskForCanHit(9, defenderDEF, attackerATK), ! is(10)); ! assertThat(entity.calculateRiskForCanHit(10, defenderDEF, attackerATK), ! is(0)); ! assertThat(entity.calculateRiskForCanHit(11, defenderDEF, attackerATK), ! is(-10)); ! assertThat(entity.calculateRiskForCanHit(12, defenderDEF, attackerATK), ! is(-20)); ! assertThat(entity.calculateRiskForCanHit(13, defenderDEF, attackerATK), ! is(-30)); ! assertThat(entity.calculateRiskForCanHit(14, defenderDEF, attackerATK), ! is(-40)); ! assertThat(entity.calculateRiskForCanHit(15, defenderDEF, attackerATK), ! is(-50)); ! assertThat(entity.calculateRiskForCanHit(16, defenderDEF, attackerATK), ! is(-60)); ! assertThat(entity.calculateRiskForCanHit(17, defenderDEF, attackerATK), ! is(-70)); ! assertThat(entity.calculateRiskForCanHit(18, defenderDEF, attackerATK), ! is(-80)); ! assertThat(entity.calculateRiskForCanHit(19, defenderDEF, attackerATK), ! is(-90)); ! assertThat(entity.calculateRiskForCanHit(20, defenderDEF, attackerATK), ! is(-100)); } --- 138,184 ---- int defenderDEF = 1; int attackerATK = 1; ! assertThat(entity.calculateRiskForCanHit(1, defenderDEF, attackerATK), is(19)); ! assertThat(entity.calculateRiskForCanHit(2, defenderDEF, attackerATK), is(18)); ! assertThat(entity.calculateRiskForCanHit(3, defenderDEF, attackerATK), is(17)); ! assertThat(entity.calculateRiskForCanHit(4, defenderDEF, attackerATK), is(16)); ! assertThat(entity.calculateRiskForCanHit(5, defenderDEF, attackerATK), is(15)); ! assertThat(entity.calculateRiskForCanHit(6, defenderDEF, attackerATK), is(14)); ! assertThat(entity.calculateRiskForCanHit(7, defenderDEF, attackerATK), is(13)); ! assertThat(entity.calculateRiskForCanHit(8, defenderDEF, attackerATK), is(12)); ! assertThat(entity.calculateRiskForCanHit(9, defenderDEF, attackerATK), is(11)); ! assertThat(entity.calculateRiskForCanHit(10, defenderDEF, attackerATK), is(10)); ! assertThat(entity.calculateRiskForCanHit(11, defenderDEF, attackerATK), is(9)); ! assertThat(entity.calculateRiskForCanHit(12, defenderDEF, attackerATK), is(8)); ! assertThat(entity.calculateRiskForCanHit(13, defenderDEF, attackerATK), is(7)); ! assertThat(entity.calculateRiskForCanHit(14, defenderDEF, attackerATK), is(6)); ! assertThat(entity.calculateRiskForCanHit(15, defenderDEF, attackerATK), is(5)); ! assertThat(entity.calculateRiskForCanHit(16, defenderDEF, attackerATK), is(4)); ! assertThat(entity.calculateRiskForCanHit(17, defenderDEF, attackerATK), is(3)); ! assertThat(entity.calculateRiskForCanHit(18, defenderDEF, attackerATK), is(2)); ! assertThat(entity.calculateRiskForCanHit(19, defenderDEF, attackerATK), is(1)); ! assertThat(entity.calculateRiskForCanHit(20, defenderDEF, attackerATK), is(0)); defenderDEF = 10; attackerATK = 5; ! assertThat(entity.calculateRiskForCanHit(1, defenderDEF, attackerATK), is(90)); ! assertThat(entity.calculateRiskForCanHit(2, defenderDEF, attackerATK), is(80)); ! assertThat(entity.calculateRiskForCanHit(3, defenderDEF, attackerATK), is(70)); ! assertThat(entity.calculateRiskForCanHit(4, defenderDEF, attackerATK), is(60)); ! assertThat(entity.calculateRiskForCanHit(5, defenderDEF, attackerATK), is(50)); ! assertThat(entity.calculateRiskForCanHit(6, defenderDEF, attackerATK), is(40)); ! assertThat(entity.calculateRiskForCanHit(7, defenderDEF, attackerATK), is(30)); ! assertThat(entity.calculateRiskForCanHit(8, defenderDEF, attackerATK), is(20)); ! assertThat(entity.calculateRiskForCanHit(9, defenderDEF, attackerATK), is(10)); ! assertThat(entity.calculateRiskForCanHit(10, defenderDEF, attackerATK), is(0)); ! assertThat(entity.calculateRiskForCanHit(11, defenderDEF, attackerATK), is(-10)); ! assertThat(entity.calculateRiskForCanHit(12, defenderDEF, attackerATK), is(-20)); ! assertThat(entity.calculateRiskForCanHit(13, defenderDEF, attackerATK), is(-30)); ! assertThat(entity.calculateRiskForCanHit(14, defenderDEF, attackerATK), is(-40)); ! assertThat(entity.calculateRiskForCanHit(15, defenderDEF, attackerATK), is(-50)); ! assertThat(entity.calculateRiskForCanHit(16, defenderDEF, attackerATK), is(-60)); ! assertThat(entity.calculateRiskForCanHit(17, defenderDEF, attackerATK), is(-70)); ! assertThat(entity.calculateRiskForCanHit(18, defenderDEF, attackerATK), is(-80)); ! assertThat(entity.calculateRiskForCanHit(19, defenderDEF, attackerATK), is(-90)); ! assertThat(entity.calculateRiskForCanHit(20, defenderDEF, attackerATK), is(-100)); } *************** *** 247,252 **** assertThat(entity.getItemAtk(), is(0f)); ! final Item item = SingletonRepository.getEntityManager().getItem( ! "dagger"); entity.getSlot("lhand").add(item); assertThat(entity.getItemAtk(), is((float) item.getAttack())); --- 206,210 ---- assertThat(entity.getItemAtk(), is(0f)); ! final Item item = SingletonRepository.getEntityManager().getItem("dagger"); entity.getSlot("lhand").add(item); assertThat(entity.getItemAtk(), is((float) item.getAttack())); *************** *** 282,287 **** assertThat(entity.getItemAtk(), is(0f)); ! final Item item = SingletonRepository.getEntityManager().getItem( ! "cheese"); entity.getSlot("lhand").add(item); assertThat(entity.getItemAtk(), is(0f)); --- 240,244 ---- assertThat(entity.getItemAtk(), is(0f)); ! final Item item = SingletonRepository.getEntityManager().getItem("cheese"); entity.getSlot("lhand").add(item); assertThat(entity.getItemAtk(), is(0f)); *************** *** 316,330 **** assertThat(entity.getItemAtk(), is(0f)); ! final Item lefthanditem = SingletonRepository.getEntityManager() ! .getItem("l hand sword"); entity.getSlot("lhand").add(lefthanditem); assertThat(entity.getItemAtk(), is(0f)); ! final Item righthanditem = SingletonRepository.getEntityManager() ! .getItem("r hand sword"); entity.getSlot("rhand").add(righthanditem); assertThat(entity.getItemAtk(), ! is((float) (lefthanditem.getAttack() + righthanditem ! .getAttack()))); } --- 273,284 ---- assertThat(entity.getItemAtk(), is(0f)); ! final Item lefthanditem = SingletonRepository.getEntityManager().getItem("l hand sword"); entity.getSlot("lhand").add(lefthanditem); assertThat(entity.getItemAtk(), is(0f)); ! final Item righthanditem = SingletonRepository.getEntityManager().getItem("r hand sword"); entity.getSlot("rhand").add(righthanditem); assertThat(entity.getItemAtk(), ! is((float) (lefthanditem.getAttack() + righthanditem.getAttack()))); } *************** *** 355,365 **** assertThat(entity.getItemAtk(), is(0f)); ! final Item lefthanditem = SingletonRepository.getEntityManager() ! .getItem("l hand sword"); entity.getSlot("rhand").add(lefthanditem); assertThat(entity.getItemAtk(), is(0f)); ! final Item righthanditem = SingletonRepository.getEntityManager() ! .getItem("r hand sword"); entity.getSlot("lhand").add(righthanditem); assertThat(entity.getItemAtk(), is(0f)); --- 309,317 ---- assertThat(entity.getItemAtk(), is(0f)); ! final Item lefthanditem = SingletonRepository.getEntityManager().getItem("l hand sword"); entity.getSlot("rhand").add(lefthanditem); assertThat(entity.getItemAtk(), is(0f)); ! final Item righthanditem = SingletonRepository.getEntityManager().getItem("r hand sword"); entity.getSlot("lhand").add(righthanditem); assertThat(entity.getItemAtk(), is(0f)); *************** *** 376,380 **** final StendhalRPZone zone = new StendhalRPZone("testzone"); final RPEntity attacker = new RPEntity() { ! @Override protected void dropItemsOn(final Corpse corpse) { --- 328,332 ---- final StendhalRPZone zone = new StendhalRPZone("testzone"); final RPEntity attacker = new RPEntity() { ! @Override protected void dropItemsOn(final Corpse corpse) { *************** *** 389,393 **** @Override ! public int damageDone(final RPEntity defender, double attackingWeaponsValue, Nature damageType) { return 0; } --- 341,346 ---- @Override ! public int damageDone(final RPEntity defender, double attackingWeaponsValue, ! Nature damageType) { return 0; } *************** *** 466,470 **** @Override ! public int damageDone(final RPEntity defender, double attackingWeaponsValue, Nature damageType) { return 30; } --- 419,424 ---- @Override ! public int damageDone(final RPEntity defender, double attackingWeaponsValue, ! Nature damageType) { return 30; } *************** *** 515,519 **** assertNotNull(attacker.getAttackTarget()); ! AttackEvent attack = null; for (RPEvent ev : attacker.events()) { --- 469,473 ---- assertNotNull(attacker.getAttackTarget()); ! AttackEvent attack = null; for (RPEvent ev : attacker.events()) { *************** *** 658,674 **** } - @Test public void testgetDroppables() { ! RPEntity entity = new MockRPentity(); ! Item cheese = SingletonRepository.getEntityManager().getItem("cheese"); ! Item flag = new CaptureTheFlagFlag(); ! List<Item> droppables; ! droppables = entity.getDroppables(); assertEquals(null, droppables); ! entity.addSlot(new PlayerSlot("lhand")); entity.addSlot(new PlayerSlot("rhand")); --- 612,627 ---- } @Test public void testgetDroppables() { ! RPEntity entity = new MockRPentity(); ! Item cheese = SingletonRepository.getEntityManager().getItem("cheese"); ! Item flag = new CaptureTheFlagFlag(); ! List<Item> droppables; ! droppables = entity.getDroppables(); assertEquals(null, droppables); ! entity.addSlot(new PlayerSlot("lhand")); entity.addSlot(new PlayerSlot("rhand")); *************** *** 694,706 **** assertEquals(1, droppables.size()); assertEquals("flag", droppables.get(0).get("name")); ! // remove flag, and we have no droppables any more entity.getSlot("rhand").remove(flag.getID()); ! droppables = entity.getDroppables(); assertEquals(null, droppables); } - @Test public void testdropDroppableItem() { --- 647,658 ---- assertEquals(1, droppables.size()); assertEquals("flag", droppables.get(0).get("name")); ! // remove flag, and we have no droppables any more entity.getSlot("rhand").remove(flag.getID()); ! droppables = entity.getDroppables(); assertEquals(null, droppables); } @Test public void testdropDroppableItem() { *************** *** 708,713 **** // MockStendlRPWorld.get(); ! Player player = PlayerTestHelper.createPlayer("player"); ! Item flag = new CaptureTheFlagFlag(); List<Item> droppables; --- 660,665 ---- // MockStendlRPWorld.get(); ! Player player = PlayerTestHelper.createPlayer("player"); ! Item flag = new CaptureTheFlagFlag(); List<Item> droppables; *************** *** 717,721 **** zone.add(player); ! player.getSlot("rhand").add(flag); --- 669,673 ---- zone.add(player); ! player.getSlot("rhand").add(flag); *************** *** 723,740 **** assertEquals(1, droppables.size()); assertEquals("flag", droppables.get(0).get("name")); ! player.dropDroppableItem(flag); ! droppables = player.getDroppables(); assertEquals(null, droppables); } - @Test public void testmaybeDropDroppables() { ! ! Player player = PlayerTestHelper.createPlayer("player"); ! Player attacker = PlayerTestHelper.createPlayer("attacker"); ! Item flag = new CaptureTheFlagFlag(); List<Item> droppables; --- 675,691 ---- assertEquals(1, droppables.size()); assertEquals("flag", droppables.get(0).get("name")); ! player.dropDroppableItem(flag); ! droppables = player.getDroppables(); assertEquals(null, droppables); } @Test public void testmaybeDropDroppables() { ! ! Player player = PlayerTestHelper.createPlayer("player"); ! Player attacker = PlayerTestHelper.createPlayer("attacker"); ! Item flag = new CaptureTheFlagFlag(); List<Item> droppables; *************** *** 745,767 **** zone.add(player); ! player.getSlot("rhand").add(flag); // XXX i don't really know a better way to test this. ! // in theory, this could be in a loop forever. ! // but that won't happen ! while (true) { ! player.maybeDropDroppables(attacker); ! droppables = player.getDroppables(); ! if (droppables == null) { break; } } } ! @Test public void testModifiedBaseHP() throws Exception { --- 696,718 ---- zone.add(player); ! player.getSlot("rhand").add(flag); // XXX i don't really know a better way to test this. ! // in theory, this could be in a loop forever. ! // but that won't happen ! while (true) { ! player.maybeDropDroppables(attacker); ! droppables = player.getDroppables(); ! if (droppables == null) { break; } } } ! @Test public void testModifiedBaseHP() throws Exception { *************** *** 771,774 **** --- 722,726 ---- // do nothing } + @Override public void logic() { *************** *** 779,791 **** entity.initHP(100); assertThat(entity.getBaseHP(), is(100)); ! long expireTimestampAsLong = System.currentTimeMillis()+1000; entity.addBaseHpModifier(new Date(expireTimestampAsLong), 0.5d); assertThat(entity.getBaseHP(), is(150)); ! while(expireTimestampAsLong >= System.currentTimeMillis()) { // just to wait till modifier is expired } assertThat(entity.getBaseHP(), is(100)); } ! @Test public void testModifiedDef() throws Exception { --- 731,743 ---- entity.initHP(100); assertThat(entity.getBaseHP(), is(100)); ! long expireTimestampAsLong = System.currentTimeMillis() + 1000; entity.addBaseHpModifier(new Date(expireTimestampAsLong), 0.5d); assertThat(entity.getBaseHP(), is(150)); ! while (expireTimestampAsLong >= System.currentTimeMillis()) { // just to wait till modifier is expired } assertThat(entity.getBaseHP(), is(100)); } ! @Test public void testModifiedDef() throws Exception { *************** *** 795,798 **** --- 747,751 ---- // do nothing } + @Override public void logic() { *************** *** 803,810 **** entity.setDef(100); assertThat(entity.getDef(), is(100)); ! long expireTimestampAsLong = System.currentTimeMillis()+1000; entity.addDefModifier(new Date(expireTimestampAsLong), 0.5d); assertThat(entity.getDef(), is(150)); ! while(expireTimestampAsLong >= System.currentTimeMillis()) { // just to wait till modifier is expired } --- 756,763 ---- entity.setDef(100); assertThat(entity.getDef(), is(100)); ! long expireTimestampAsLong = System.currentTimeMillis() + 1000; entity.addDefModifier(new Date(expireTimestampAsLong), 0.5d); assertThat(entity.getDef(), is(150)); ! while (expireTimestampAsLong >= System.currentTimeMillis()) { // just to wait till modifier is expired } |