Clean up isolated fish water test

Author: DevOpsOfChaos

libs/s25main/figures/nofFisher.h

@@ -26,9 +26,6 @@ class nofFisher : public nofFarmhand
     /// Abgeleitete Klasse informieren, wenn fertig ist mit Arbeiten
     void WorkFinished() override;
 
-    /// Returns the quality of this working point or determines if the worker can work here at all
-    PointQuality GetPointQuality(MapPoint pt, bool isBeforeWork) const override;
-
 public:
     nofFisher(MapPoint pos, unsigned char player, nobUsual* workplace);
     nofFisher(SerializedGameData& sgd, unsigned obj_id);
@@ -38,4 +35,7 @@ class nofFisher : public nofFarmhand
     void Serialize(SerializedGameData& sgd) const override;
 
     GO_Type GetGOT() const final { return GO_Type::NofFisher; }
+
+    /// Returns the quality of this working point or determines if the worker can work here at all
+    PointQuality GetPointQuality(MapPoint pt, bool isBeforeWork) const override;
 };

tests/s25Main/integration/testBuilding.cpp

@@ -7,11 +7,10 @@
 #include "RttrForeachPt.h"
 #include "buildings/nobBaseMilitary.h"
 #include "buildings/nobUsual.h"
+#include "desktops/dskGameInterface.h"
 #include "factories/BuildingFactory.h"
 #include "figures/nofFarmhand.h"
 #include "figures/nofFisher.h"
-#include "gameTypes/Resource.h"
-#include "desktops/dskGameInterface.h"
 #include "helpers/containerUtils.h"
 #include "uiHelper/uiHelpers.hpp"
 #include "worldFixtures/CreateEmptyWorld.h"
@@ -21,6 +20,7 @@
 #include "nodeObjs/noEnvObject.h"
 #include "nodeObjs/noStaticObject.h"
 #include "gameTypes/GameTypesOutput.h"
+#include "gameTypes/Resource.h"
 #include <boost/test/unit_test.hpp>
 
 // LCOV_EXCL_START
@@ -482,7 +482,6 @@ BOOST_FIXTURE_TEST_CASE(RoadRemovesObjs, EmptyWorldFixture1P)
     }
 }
 
-
 BOOST_FIXTURE_TEST_CASE(FisherIgnoresIsolatedFishWater, EmptyWorldFixture1PBiggest)
 {
     const DescIdx<TerrainDesc> tWater = GetWaterTerrain(world.GetDescription());
@@ -493,7 +492,6 @@ BOOST_FIXTURE_TEST_CASE(FisherIgnoresIsolatedFishWater, EmptyWorldFixture1PBigge
     BOOST_TEST_REQUIRE(fishery);
 
     nofFisher fisher(fisheryPos, 0, fishery);
-    const nofFarmhand& farmhand = fisher;
 
     const MapPoint workPt = world.MakeMapPoint(fisheryPos + Position(4, 0));
     const MapPoint fishPt = world.GetNeighbour(workPt, Direction::East);
@@ -515,12 +513,10 @@ BOOST_FIXTURE_TEST_CASE(FisherIgnoresIsolatedFishWater, EmptyWorldFixture1PBigge
     makeWaterPoint(fishPt);
     world.SetResource(fishPt, Resource(ResourceType::Fish, 4));
 
-    BOOST_TEST_REQUIRE(static_cast<unsigned>(farmhand.GetPointQuality(workPt))
-                       == static_cast<unsigned>(nofFarmhand::PointQuality::NotPossible));
+    BOOST_TEST_REQUIRE((fisher.GetPointQuality(workPt, false) == nofFarmhand::PointQuality::NotPossible));
 
     makeWaterPoint(world.GetNeighbour(fishPt, Direction::East));
 
-    BOOST_TEST_REQUIRE(static_cast<unsigned>(farmhand.GetPointQuality(workPt))
-                       == static_cast<unsigned>(nofFarmhand::PointQuality::Class1));
+    BOOST_TEST_REQUIRE((fisher.GetPointQuality(workPt, false) == nofFarmhand::PointQuality::Class1));
 }
 BOOST_AUTO_TEST_SUITE_END()