[Arianne-commits] stendhal/tests/games/stendhal/client/entity TestBuildOfferedActions.java, 1.9, 1.10

[Astrid S. <ast...@us...>]

Update of /cvsroot/arianne/stendhal/tests/games/stendhal/client/entity
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv24104/tests/games/stendhal/client/entity

Modified Files:
	TestBuildOfferedActions.java 
Log Message:
replace some String literals with appropriate constants

Index: TestBuildOfferedActions.java
===================================================================
RCS file: /cvsroot/arianne/stendhal/tests/games/stendhal/client/entity/TestBuildOfferedActions.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** TestBuildOfferedActions.java	1 May 2007 11:22:20 -0000	1.9
--- TestBuildOfferedActions.java	6 May 2007 19:45:35 -0000	1.10
***************
*** 34,38 ****
  		me.buildOfferedActions(list);
  		List<String> expected = new ArrayList<String>();
! 		expected.add("Look");
  		Assert.assertEquals(expected, list);
  		Assert.assertEquals(expected.toArray(), me.offeredActions());
--- 34,38 ----
  		me.buildOfferedActions(list);
  		List<String> expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
  		Assert.assertEquals(expected, list);
  		Assert.assertEquals(expected.toArray(), me.offeredActions());
***************
*** 51,57 ****
  		List<String> expected = new ArrayList<String>();
  		User user = new User();
! 		expected.add("Look");
! 		expected.add("Attack");
! 		expected.add("Own");
  		sheep.buildOfferedActions(list);
  		Assert.assertNotNull(list);
--- 51,57 ----
  		List<String> expected = new ArrayList<String>();
  		User user = new User();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.ATTACK.getRepresentation());
! 		expected.add(ActionType.OWN.getRepresentation());
  		sheep.buildOfferedActions(list);
  		Assert.assertNotNull(list);
***************
*** 62,67 ****
  		list = new ArrayList<String>();
  		expected = new ArrayList<String>();
! 		expected.add("Look");
! 		expected.add("Attack");
  		RPObject object = new RPObject();
  		object.put("type",1);
--- 62,67 ----
  		list = new ArrayList<String>();
  		expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.ATTACK.getRepresentation());
  		RPObject object = new RPObject();
  		object.put("type",1);
***************
*** 81,86 ****
  		sh.initialize(rpo);
  		List<String> expected = new ArrayList<String>();
! 		expected.add("Look");
! 		expected.add("Open");
  		sh.buildOfferedActions(list);
  		Assert.assertNotNull(list);
--- 81,86 ----
  		sh.initialize(rpo);
  		List<String> expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.OPEN.getRepresentation());
  		sh.buildOfferedActions(list);
  		Assert.assertNotNull(list);
***************
*** 89,95 ****
  		list.clear();
  		expected.clear();
! 		expected.add("Look");
! 		expected.add("Inspect");
! 		expected.add("Close");
  		sh.buildOfferedActions(list);
  		Assert.assertEquals(expected, list);
--- 89,95 ----
  		list.clear();
  		expected.clear();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.INSPECT.getRepresentation());
! 		expected.add(ActionType.CLOSE.getRepresentation());
  		sh.buildOfferedActions(list);
  		Assert.assertEquals(expected, list);
***************
*** 105,114 ****
  		Entity en = EntityFactory.createEntity(rp);
  		List<String> expected = new ArrayList<String>();
! 		expected.add("Look");
! 		expected.add("Pick");
  		en.buildOfferedActions(list);
  		Assert.assertNotNull(list);
  		Assert.assertEquals(expected, list);
! 		Assert.assertEquals(new String[] { "Pick", "Look" }, en.offeredActions());
  	}
  	@Test
--- 105,114 ----
  		Entity en = EntityFactory.createEntity(rp);
  		List<String> expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.PICK.getRepresentation());
  		en.buildOfferedActions(list);
  		Assert.assertNotNull(list);
  		Assert.assertEquals(expected, list);
! 		Assert.assertEquals(new String[] { ActionType.PICK.getRepresentation(), ActionType.LOOK.getRepresentation() }, en.offeredActions());
  	}
  	@Test
***************
*** 119,128 ****
  		Entity en = EntityFactory.createEntity(rp);
  		List<String> expected = new ArrayList<String>();
! 		expected.add("Look");
  		
  		en.buildOfferedActions(list);
  		Assert.assertNotNull(list);
  		Assert.assertEquals(expected, list);
! 		Assert.assertEquals(new String[] { "Look" }, en.offeredActions());
  	}
  	@Test
--- 119,128 ----
  		Entity en = EntityFactory.createEntity(rp);
  		List<String> expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
  		
  		en.buildOfferedActions(list);
  		Assert.assertNotNull(list);
  		Assert.assertEquals(expected, list);
! 		Assert.assertEquals(new String[] { ActionType.LOOK.getRepresentation() }, en.offeredActions());
  	}
  	@Test
***************
*** 136,145 ****
  		Entity en = EntityFactory.createEntity(rp);
  		List<String> expected = new ArrayList<String>();
! 		expected.add("Look");
  		
  		en.buildOfferedActions(list);
  		Assert.assertNotNull(list);
  		Assert.assertEquals(expected, list);
! 		Assert.assertEquals(new String[] { "Use","Look" }, en.offeredActions());
  	}
  	@Test
--- 136,145 ----
  		Entity en = EntityFactory.createEntity(rp);
  		List<String> expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
  		
  		en.buildOfferedActions(list);
  		Assert.assertNotNull(list);
  		Assert.assertEquals(expected, list);
! 		Assert.assertEquals(new String[] { ActionType.USE.getRepresentation(),ActionType.LOOK.getRepresentation() }, en.offeredActions());
  	}
  	@Test
***************
*** 148,153 ****
  		Door door = new Door();
  		List<String> expected = new ArrayList<String>();
! 		expected.add("Look");
! 		expected.add("Open");
  		door.buildOfferedActions(list);
  		Assert.assertNotNull(list);
--- 148,153 ----
  		Door door = new Door();
  		List<String> expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.OPEN.getRepresentation());
  		door.buildOfferedActions(list);
  		Assert.assertNotNull(list);
***************
*** 157,162 ****
  		list.clear();
  		expected.clear();
! 		expected.add("Look");
! 		expected.add("Close");
  		door.buildOfferedActions(list);
  		Assert.assertEquals(expected, list);
--- 157,162 ----
  		list.clear();
  		expected.clear();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.CLOSE.getRepresentation());
  		door.buildOfferedActions(list);
  		Assert.assertEquals(expected, list);
***************
*** 168,173 ****
  		Box box = new Box();
  		List<String> expected = new ArrayList<String>();
! 		expected.add("Look");
! 		expected.add("Open");
  		box.buildOfferedActions(list);
  		Assert.assertNotNull(list);
--- 168,173 ----
  		Box box = new Box();
  		List<String> expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.OPEN.getRepresentation());
  		box.buildOfferedActions(list);
  		Assert.assertNotNull(list);
***************
*** 180,185 ****
  		GoldSource gs = new GoldSource();
  		List<String> expected = new ArrayList<String>();
! 		expected.add("Look");
! 		expected.add("Prospect");
  		gs.buildOfferedActions(list);
  		Assert.assertNotNull(list);
--- 180,185 ----
  		GoldSource gs = new GoldSource();
  		List<String> expected = new ArrayList<String>();
! 		expected.add(ActionType.LOOK.getRepresentation());
! 		expected.add(ActionType.PROSPECT.getRepresentation());
  		gs.buildOfferedActions(list);
  		Assert.assertNotNull(list);