From 8597e8b16a6f0994140c7d96a53530268417aff5 Mon Sep 17 00:00:00 2001
From: Enno Rehling <enno.rehling@gmail.com>
Date: Sun, 30 Oct 2016 05:39:25 +0100
Subject: [PATCH] move guard test to guard.test.c

---
 src/guard.test.c | 25 +++++++++++++++++++++++++
 src/move.test.c  | 26 --------------------------
 2 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/src/guard.test.c b/src/guard.test.c
index 262631a30..61f08be05 100644
--- a/src/guard.test.c
+++ b/src/guard.test.c
@@ -16,6 +16,30 @@
 #include <CuTest.h>
 #include "tests.h"
 
+static void test_is_guarded(CuTest *tc) {
+    unit *u1, *u2;
+    region *r;
+    race *rc;
+
+    test_cleanup();
+    rc = rc_get_or_create("dragon");
+    rc->flags |= RCF_UNARMEDGUARD;
+    r = test_create_region(0, 0, 0);
+    u1 = test_create_unit(test_create_faction(0), r);
+    u2 = test_create_unit(test_create_faction(rc), r);
+    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_TRAVELTHRU));
+    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_PRODUCE));
+    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_TREES));
+    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_MINING));
+    guard(u2, GUARD_MINING | GUARD_PRODUCE);
+    CuAssertIntEquals(tc, GUARD_CREWS | GUARD_LANDING | GUARD_TRAVELTHRU | GUARD_TAX | GUARD_PRODUCE | GUARD_RECRUIT, guard_flags(u2));
+    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_TRAVELTHRU));
+    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_TREES));
+    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_MINING));
+    CuAssertPtrEquals(tc, u2, is_guarded(r, u1, GUARD_PRODUCE));
+    test_cleanup();
+}
+
 static void test_guard_unskilled(CuTest * tc)
 // TODO: it would be better to test armedmen()
 {
@@ -114,6 +138,7 @@ static void test_guard_monsters(CuTest * tc)
 CuSuite *get_guard_suite(void)
 {
     CuSuite *suite = CuSuiteNew();
+    SUITE_ADD_TEST(suite, test_is_guarded);
     SUITE_ADD_TEST(suite, test_is_guard);
     SUITE_ADD_TEST(suite, test_guard_unskilled);
     SUITE_ADD_TEST(suite, test_guard_armed);
diff --git a/src/move.test.c b/src/move.test.c
index 2ce9cccda..5c89166c8 100644
--- a/src/move.test.c
+++ b/src/move.test.c
@@ -2,7 +2,6 @@
 #include <stdlib.h>
 #include "move.h"
 
-#include "guard.h"
 #include "keyword.h"
 
 #include <kernel/config.h>
@@ -201,30 +200,6 @@ static void test_walkingcapacity(CuTest *tc) {
     test_cleanup();
 }
 
-static void test_is_guarded(CuTest *tc) {
-    unit *u1, *u2;
-    region *r;
-    race *rc;
-
-    test_cleanup();
-    rc = rc_get_or_create("dragon");
-    rc->flags |= RCF_UNARMEDGUARD;
-    r = test_create_region(0, 0, 0);
-    u1 = test_create_unit(test_create_faction(0), r);
-    u2 = test_create_unit(test_create_faction(rc), r);
-    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_TRAVELTHRU));
-    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_PRODUCE));
-    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_TREES));
-    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_MINING));
-    guard(u2, GUARD_MINING | GUARD_PRODUCE);
-    CuAssertIntEquals(tc, GUARD_CREWS | GUARD_LANDING | GUARD_TRAVELTHRU | GUARD_TAX | GUARD_PRODUCE | GUARD_RECRUIT, guard_flags(u2));
-    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_TRAVELTHRU));
-    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_TREES));
-    CuAssertPtrEquals(tc, 0, is_guarded(r, u1, GUARD_MINING));
-    CuAssertPtrEquals(tc, u2, is_guarded(r, u1, GUARD_PRODUCE));
-    test_cleanup();
-}
-
 static void test_ship_trails(CuTest *tc) {
     ship *sh;
     region *r1, *r2, *r3;
@@ -526,7 +501,6 @@ CuSuite *get_move_suite(void)
     SUITE_ADD_TEST(suite, test_ship_has_harbormaster_contact);
     SUITE_ADD_TEST(suite, test_ship_has_harbormaster_ally);
     SUITE_ADD_TEST(suite, test_ship_has_harbormaster_same_faction);
-    SUITE_ADD_TEST(suite, test_is_guarded);
     SUITE_ADD_TEST(suite, test_ship_trails);
     SUITE_ADD_TEST(suite, test_age_trails);
     SUITE_ADD_TEST(suite, test_ship_no_overload);