From 2b09ff6ec52037f73060849b6627a8cda53e7ea0 Mon Sep 17 00:00:00 2001
From: Jannis Harder <harder@informatik.uni-luebeck.de>
Date: Tue, 3 May 2011 17:13:11 +0200
Subject: pickUp(object) in StoneTray implementiert und getestet

git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@78 72836036-5685-4462-b002-a69064685172
---
 src/jrummikub/model/StoneTray.java      |  7 +++++++
 test/jrummikub/model/StoneTrayTest.java | 13 +++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/jrummikub/model/StoneTray.java b/src/jrummikub/model/StoneTray.java
index 945df13..7f97e1b 100644
--- a/src/jrummikub/model/StoneTray.java
+++ b/src/jrummikub/model/StoneTray.java
@@ -209,4 +209,11 @@ public class StoneTray<E extends Sizeable> implements
 		};
 	}
 
+	/**
+	 * @param object
+	 */
+	public void pickUp(E object) {
+		objects.remove(object);
+	}
+
 }
diff --git a/test/jrummikub/model/StoneTrayTest.java b/test/jrummikub/model/StoneTrayTest.java
index 6c1c170..23d9ea0 100644
--- a/test/jrummikub/model/StoneTrayTest.java
+++ b/test/jrummikub/model/StoneTrayTest.java
@@ -131,6 +131,7 @@ public class StoneTrayTest {
 		assertEquals(1, thirdPosition.getY(), 0.00001);
 	}
 
+	
 	@Test
 	public void testWrongPickUp() {
 		Thing firstThing = new Thing(5, 5);
@@ -138,6 +139,18 @@ public class StoneTrayTest {
 		Position testPosition = new Position(-2, -2);
 		assertNull(testTray.pickUp(testPosition));
 	}
+	
+	@Test
+	public void testPickUpByObject() {
+		Thing firstThing = new Thing(5,5);
+		testTray.drop(firstThing, new Position(0, 0));
+		Thing secondThing = new Thing(5,5);
+		testTray.drop(secondThing, new Position(5, 0));
+		testTray.pickUp(firstThing);
+		for (Pair<Thing, Position> i : testTray) {
+			assertSame(i.getFirst(), secondThing);
+		}
+	}
 
 	@Test
 	public void testRightPickUp() {
-- 
cgit v1.2.3