Changeset 3875a9ab22363c222e98bf637e4ad3a4cac7c2a4 for test

Timestamp:

03/02/08 13:15:14 (9 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

Christopher Jung <bktheg@web.de> 1204460114 +0100

git-parent:

[37191705f4c8bf1d54efbd9d9aed5e94da379484]

git-author:

Christopher Jung <bktheg@web.de> 1204460114 +0100

Message:

Verlassen einer Flotte gefixt inkl. Tests

Files:

• test/java/net/driftingsouls/ds2/server/ships/ShipFleetTest.java (modified) (3 diffs)

test/java/net/driftingsouls/ds2/server/ships/ShipFleetTest.java

@@ -71 +71 @@
-                assertThat(ok, is(true));
-                
+                db.flush();
+                
-                assertThat(this.fleet1.getOwner(), is(targetOwner));
-                
@@ -94 +96 @@
-                assertThat(ok, is(true));
-                
+                db.flush();
+                
-                assertThat(this.fleet2.getOwner(), is(targetOwner));
-                
@@ -102 +106 @@
-                }
-        }
+        
+        /**
+         * Testet das Entfernen eines Schiffes aus einer Flotte 
+         */
+        @Test
+        public void removeShipCleanSession() {
+                org.hibernate.Session db = context.getDB();
+                
+                // Flotten aus dem Cache entfernen
+                db.clear();
+                
+                Ship ship = (Ship)db.get(Ship.class, 1);
+                ship.getFleet().removeShip(ship);
+                
+                db.flush();
+                
+                assertThat(ship.getFleet(), nullValue());
+                
+                ShipFleet fleet = (ShipFleet)db.get(ShipFleet.class, 1);
+                assertThat(fleet, not(nullValue()));
+                
+                ship = (Ship)db.get(Ship.class, 2);
+                assertThat(ship.getFleet(), equalTo(fleet));
+        }
+        
+        /**
+         * Testet das Entfernen eines Schiffes aus einer Flotte 
+         */
+        @Test
+        public void removeShip() {
+                org.hibernate.Session db = context.getDB();
+                
+                Ship ship = (Ship)db.get(Ship.class, 1);
+                ship.getFleet().removeShip(ship);
+                
+                db.flush();
+                
+                assertThat(ship.getFleet(), nullValue());
+                
+                ShipFleet fleet = (ShipFleet)db.get(ShipFleet.class, 1);
+                assertThat(fleet, not(nullValue()));
+                
+                ship = (Ship)db.get(Ship.class, 2);
+                assertThat(ship.getFleet(), equalTo(fleet));
+        }
+        
+        /**
+         * Testet das Entfernen eines Schiffes aus einer Flotte 
+         * dessen die Flotte anschliessend zu wenig Schiffe hat
+         */
+        @Test
+        public void removeShipAndDissolveFleet() {
+                org.hibernate.Session db = context.getDB();
+                
+                Ship ship = (Ship)db.get(Ship.class, 4);
+                ship.getFleet().removeShip(ship);
+                
+                db.flush();
+                
+                assertThat(ship.getFleet(), nullValue());
+                
+                ShipFleet fleet = (ShipFleet)db.get(ShipFleet.class, 2);
+                assertThat(fleet, nullValue());
+                
+                ship = (Ship)db.get(Ship.class, 5);
+                assertThat(ship.getFleet(), nullValue());
+        }
-}