glm backwards compatibility

[blank.git] / tst / net / PacketTest.hpp

diff --git a/tst/net/PacketTest.hpp b/tst/net/PacketTest.hpp
index 119c696de39b79159b525bb82ef5000336c7d70b..81cdd8280d0ac9a2c5011a65aff646f66d482ea1 100644 (file)
--- a/tst/net/PacketTest.hpp
+++ b/tst/net/PacketTest.hpp
@@ -1,14 +1,15 @@
 #ifndef BLANK_TEST_NET_PACKETTEST_HPP_
 #define BLANK_TEST_NET_PACKETTEST_HPP_
 
-#include "model/geometry.hpp"
+#include "geometry/primitive.hpp"
+#include "graphics/glm.hpp"
 #include "net/Packet.hpp"
 #include "world/EntityState.hpp"
 
 #include <cstdint>
+#include <limits>
 #include <string>
 #include <SDL_net.h>
-#include <glm/glm.hpp>
 #include <cppunit/extensions/HelperMacros.h>
 
 
@@ -20,6 +21,7 @@ class PacketTest
 
 CPPUNIT_TEST_SUITE(PacketTest);
 
+CPPUNIT_TEST(testSizes);
 CPPUNIT_TEST(testControl);
 CPPUNIT_TEST(testPing);
 CPPUNIT_TEST(testLogin);
@@ -32,6 +34,8 @@ CPPUNIT_TEST(testEntityUpdate);
 CPPUNIT_TEST(testPlayerCorrection);
 CPPUNIT_TEST(testChunkBegin);
 CPPUNIT_TEST(testChunkData);
+CPPUNIT_TEST(testBlockUpdate);
+CPPUNIT_TEST(testMessage);
 
 CPPUNIT_TEST_SUITE_END();
 
@@ -39,6 +43,7 @@ public:
        void setUp();
        void tearDown();
 
+       void testSizes();
        void testControl();
        void testPing();
        void testLogin();
@@ -51,6 +56,8 @@ public:
        void testPlayerCorrection();
        void testChunkBegin();
        void testChunkData();
+       void testBlockUpdate();
+       void testMessage();
 
 private:
        static void AssertPacket(
@@ -80,7 +87,8 @@ private:
        static void AssertEqual(
                const std::string &message,
                const glm::vec3 &expected,
-               const glm::vec3 &actual);
+               const glm::vec3 &actual,
+               float epsilon = std::numeric_limits<float>::epsilon());
        static void AssertEqual(
                const std::string &message,
                const glm::quat &expected,