Changeset 9e4bc5e766622e597afd6c642de28b7d86e7b04d

Timestamp:

02/24/08 12:21:24 (8 months ago)

Author:

Christopher Jung <bktheg@web.de>

git-committer:

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

git-parent:

[ccb5b312252938685739aea4c3adee0a6c38890a]

git-author:

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

Message:

Weitere Testcases fuer Werften ergaenzt

Files:

• test/java/net/driftingsouls/ds2/server/werften/WerftObjectTest.java (modified) (4 diffs)
• test/java/net/driftingsouls/ds2/server/werften/WerftObjectTest.xml (modified) (2 diffs)

test/java/net/driftingsouls/ds2/server/werften/WerftObjectTest.java

@@ -35 +35 @@
-public class WerftObjectTest extends DriftingSoulsDBTestCase {
-        private WerftObject werft;
+        private WerftObject werftKomplex;
+        private WerftObject werftKomplexPart;
-        
-        /**
@@ -45 +47 @@
-                
-                this.werft = (WerftObject)db.get(WerftObject.class, 1);
+                assertThat(this.werft, not(nullValue()));
+                
+                this.werftKomplex = (WerftObject)db.get(WerftObject.class, 2);
+                assertThat(this.werftKomplex, not(nullValue()));
+                
+                this.werftKomplexPart = (WerftObject)db.get(WerftObject.class, 3);
+                assertThat(this.werftKomplexPart, not(nullValue()));
-        }
-        
@@ -56 +65 @@
-        @Test
-        public void destroyWerft() {
-assertThat(this.werft, not(nullValue())
+org.hibernate.Session db = context.getDB(
-                
-                this.werft.destroy();
-                
-                org.hibernate.Session db = context.getDB();
-                
-                WerftObject werftAfterDelete = (WerftObject)db.get(WerftObject.class, 1);
@@ -68 +75 @@
-                assertThat(entry, nullValue());
-        }
+        
+        /**
+         * Testet die Destroy-Operation bei Werftkomplexen
+         */
+        @Test
+        public void destroyWerftKomplex() {
+                org.hibernate.Session db = context.getDB();
+                
+                this.werftKomplex.destroy();
+                
+                WerftObject werftAfterDelete = (WerftObject)db.get(WerftObject.class, 2);
+                assertThat(werftAfterDelete, nullValue());
+                
+                WerftQueueEntry entry = (WerftQueueEntry)db.get(WerftQueueEntry.class, 2);
+                assertThat(entry, nullValue());
+                
+                entry = (WerftQueueEntry)db.get(WerftQueueEntry.class, 3);
+                assertThat(entry, nullValue());
+        }
+        
+        /**
+         * Testet die Destroy-Operation bei Werftkomplexen ausgehend von einem Teil
+         */
+        @Test
+        public void destroyWerftKomplexPart() {
+                org.hibernate.Session db = context.getDB();
+                
+                this.werftKomplexPart.destroy();
+                
+                WerftObject werftAfterDelete = (WerftObject)db.get(WerftObject.class, 3);
+                assertThat(werftAfterDelete, nullValue());
+                
+                WerftQueueEntry entry = (WerftQueueEntry)db.get(WerftQueueEntry.class, 2);
+                assertThat(entry, not(nullValue()));
+                
+                entry = (WerftQueueEntry)db.get(WerftQueueEntry.class, 3);
+                assertThat(entry, not(nullValue()));
+        }
+        
+        /**
+         * Testet {@link WerftObject#getBuildQueue()}
+         */
+        @Test
+        public void getBuildQuery() {
+                WerftQueueEntry[] entries = this.werft.getBuildQueue();
+                assertThat(entries, not(nullValue()));
+                assertThat(entries.length, is(1));
+                assertThat(entries[0].getBuildShipType().getTypeId(), is(1));
+                
+                entries = this.werftKomplex.getBuildQueue();
+                assertThat(entries, not(nullValue()));
+                assertThat(entries.length, is(2));
+                assertThat(entries[0].getBuildShipType().getTypeId(), is(1));
+                assertThat(entries[1].getBuildShipType().getTypeId(), is(1));
+                
+                entries = this.werftKomplexPart.getBuildQueue();
+                assertThat(entries, not(nullValue()));
+                assertThat(entries.length, is(0));
+        }
+        
+        /**
+         * Testet {@link WerftObject#getKomplex()}
+         */
+        @Test
+        public void getKomplex() {
+                assertThat(this.werft.getKomplex(), nullValue());
+                assertThat(this.werftKomplex.getKomplex(), nullValue());
+                assertThat(this.werftKomplexPart.getKomplex(), is(this.werftKomplex));
+        }
+        
+        /**
+         * Testet {@link WerftObject#getBuildQueueEntry(int)}
+         */
+        @Test
+        public void getBuildQueueEntry() {
+                WerftQueueEntry entry = this.werft.getBuildQueueEntry(0);
+                assertThat(entry, not(nullValue()));
+                assertThat(entry.getBuildShipType().getTypeId(), is(1));
+                
+                entry = this.werft.getBuildQueueEntry(1);
+                assertThat(entry, nullValue());
+                
+                entry = this.werftKomplex.getBuildQueueEntry(1);
+                assertThat(entry, not(nullValue()));
+                assertThat(entry.getBuildShipType().getTypeId(), is(1));
+                
+                entry = this.werftKomplexPart.getBuildQueueEntry(1);
+                assertThat(entry, nullValue());
+        }
-}

test/java/net/driftingsouls/ds2/server/werften/WerftObjectTest.xml

@@ -6 +6 @@
-        <ship_types id="1" nickname="GTS Zephyrus" picture="" ru="2" rd="5" ra="0" rm="110" eps="150"
-                cost="3" hull="30000" cargo="1500" heat="2" crew="30" weapons="" maxheat="" 
-
+werft="8" 
-
-        <bases id="1" name="Testasti" owner="1" x="5" y="1" system="1" bewohner="1" arbeiter="0" e="1000"
@@ -12 +12 @@
-                terrain="" bebauung="" active="" autogtuacts="" />
-                
+        <!-- Basiswerft -->
+                
-        <werften id="1" type="0" flagschiff="0" col="1" />
-        <werft_queues id="1" werft="1" position="0" building="1" item="-1" remaining="1" flagschiff="0" 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</dataset>