neocturne/JRummikub
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Zwischencommit weil Ida so müde ist, eigentlich nichts passiert

Browse source 
git-svn-id: svn://sunsvr01.isp.uni-luebeck.de/swproj13/trunk@177 72836036-5685-4462-b002-a69064685172
This commit is contained in:
Ida Massow 2011-05-08 22:46:31 +02:00
parent 35cd080bcd
commit ec2936a034
3 changed files with 56 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/jrummikub/control/TurnControl.java
View file

@ -5,7 +5,9 @@ import java.util.List;
import jrummikub.model.IHand; import jrummikub.model.IHand;
import jrummikub.model.ITable; import jrummikub.model.ITable;
import jrummikub.model.Position;
import jrummikub.model.Stone; import jrummikub.model.Stone;
import jrummikub.model.StoneSet;
import jrummikub.util.Connection; import jrummikub.util.Connection;
import jrummikub.util.Event; import jrummikub.util.Event;
import jrummikub.util.IEvent; import jrummikub.util.IEvent;
@ -108,6 +110,18 @@ public class TurnControl {
view.setSelectedStones(selectedStones); view.setSelectedStones(selectedStones);
} }
private void leftConnectorClick(StoneSet set){
}
private void rightConnectorClick(StoneSet set){
}
private void tableClick(Position position){
}
private void endOfTurn() { private void endOfTurn() {
timer.stopTimer(); timer.stopTimer();
endOfTurnEvent.emit(); endOfTurnEvent.emit();

11
test/jrummikub/control/TurnControlTest.java
View file

@ -1,10 +1,15 @@
package jrummikub.control; package jrummikub.control;
import static org.junit.Assert.*; import static jrummikub.model.StoneColor.BLACK;
import static jrummikub.model.StoneColor.BLUE;
import static jrummikub.model.StoneColor.RED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashMap;
import java.util.List; import java.util.List;
import jrummikub.model.MockHand; import jrummikub.model.MockHand;
@ -23,8 +28,6 @@ import jrummikub.view.MockView;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static jrummikub.model.StoneColor.*;
public class TurnControlTest { public class TurnControlTest {
static class AccessibleTable extends Table{ static class AccessibleTable extends Table{
StoneSet[] getSetArray(){ StoneSet[] getSetArray(){

38
test/jrummikub/model/TableTest.java
View file

@ -22,13 +22,17 @@ public class TableTest {
@Test @Test
public void testIsValid() { public void testIsValid() {
testTable.drop(new StoneSet(Arrays.asList(new Stone(RED), new Stone(BLACK), testTable.drop(
new Stone(1, BLACK))), new Position(0,0)); new StoneSet(Arrays.asList(new Stone(RED), new Stone(BLACK),
testTable.drop(new StoneSet(Arrays.asList(new Stone(1, RED), new Stone(2, RED), new Stone(1, BLACK))), new Position(0, 0));
new Stone(3, RED))), new Position(0,0)); testTable.drop(
new StoneSet(Arrays.asList(new Stone(1, RED),
new Stone(2, RED), new Stone(3, RED))), new Position(0,
0));
assertTrue(testTable.isValid()); assertTrue(testTable.isValid());
testTable.drop(new StoneSet(Arrays.asList(new Stone(5, RED))), new Position(0,0)); testTable.drop(new StoneSet(Arrays.asList(new Stone(5, RED))),
new Position(0, 0));
assertFalse(testTable.isValid()); assertFalse(testTable.isValid());
} }
@ -41,8 +45,9 @@ public class TableTest {
@SuppressWarnings("unused") @SuppressWarnings("unused")
public void testPickUpStoneGroup() { public void testPickUpStoneGroup() {
Stone targetStone = new Stone(BLACK); Stone targetStone = new Stone(BLACK);
testTable.drop(new StoneSet(Arrays.asList(new Stone(RED), targetStone, testTable.drop(
new Stone(1, BLACK))), new Position(0,0)); new StoneSet(Arrays.asList(new Stone(RED), targetStone,
new Stone(1, BLACK))), new Position(0, 0));
assertTrue(testTable.isValid()); assertTrue(testTable.isValid());
testTable.pickUpStone(targetStone); testTable.pickUpStone(targetStone);
assertFalse(testTable.isValid()); assertFalse(testTable.isValid());
@ -54,12 +59,21 @@ public class TableTest {
assertEquals(1, counter); assertEquals(1, counter);
} }
@Test
public void testPickLonelyStone() {
Stone targetStone = new Stone(BLACK);
testTable.drop(new StoneSet(targetStone), new Position(0, 0));
testTable.pickUpStone(targetStone);
assertEquals(0, testTable.getSize());
}
@Test @Test
@SuppressWarnings("unused") @SuppressWarnings("unused")
public void testPickUpStoneRun() { public void testPickUpStoneRun() {
Stone targetStone = new Stone(BLACK); Stone targetStone = new Stone(BLACK);
testTable.drop(new StoneSet(Arrays.asList(new Stone(1, RED), targetStone, testTable.drop(
new Stone(3, RED))), new Position(0,0)); new StoneSet(Arrays.asList(new Stone(1, RED), targetStone,
new Stone(3, RED))), new Position(0, 0));
assertTrue(testTable.isValid()); assertTrue(testTable.isValid());
testTable.pickUpStone(targetStone); testTable.pickUpStone(targetStone);
assertFalse(testTable.isValid()); assertFalse(testTable.isValid());
@ -74,9 +88,9 @@ public class TableTest {
@Test @Test
public void testFindSet() { public void testFindSet() {
Stone targetStone = new Stone(BLACK); Stone targetStone = new Stone(BLACK);
StoneSet testSet = new StoneSet(Arrays.asList(new Stone(1, RED), targetStone, StoneSet testSet = new StoneSet(Arrays.asList(new Stone(1, RED),
new Stone(3, RED))); targetStone, new Stone(3, RED)));
testTable.drop(testSet, new Position(0,0)); testTable.drop(testSet, new Position(0, 0));
StoneSet foundSet = testTable.findStoneSet(targetStone); StoneSet foundSet = testTable.findStoneSet(targetStone);
assertSame(testSet, foundSet); assertSame(testSet, foundSet);