V2024.6.1

Author: nlogozzo

CMakeLists.txt

@@ -20,7 +20,7 @@ endif()
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
 #libnick Definition
-project ("libnick" LANGUAGES C CXX VERSION 2024.6.0 DESCRIPTION "A cross-platform base for native Nickvision applications.")
+project ("libnick" LANGUAGES C CXX VERSION 2024.6.1 DESCRIPTION "A cross-platform base for native Nickvision applications.")
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 include(CTest)

src/update/version.cpp

@@ -112,25 +112,41 @@ namespace Nickvision::Update
 
     bool Version::operator<(const Version& compare) const
     {
-        if (m_major < compare.m_major)
+        if(m_major > compare.m_major)
+        {
+            return false;
+        }
+        else if(m_major < compare.m_major)
         {
             return true;
         }
         else
         {
-            if (m_minor < compare.m_minor)
+            if(m_minor > compare.m_minor)
+            {
+                return false;
+            }
+            else if(m_minor < compare.m_minor)
             {
                 return true;
             }
             else
             {
-                if (m_build < compare.m_build)
+                if(m_build > compare.m_build)
+                {
+                    return false;
+                }
+                else if(m_build < compare.m_build)
                 {
                     return true;
                 }
                 else
                 {
-                    if (!m_dev.empty() && compare.m_dev.empty()) //dev < stable
+                    if(m_dev.empty() && !compare.m_dev.empty())
+                    {
+                        return false;
+                    }
+                    else if(!m_dev.empty() && compare.m_dev.empty())
                     {
                         return true;
                     }
@@ -142,33 +158,49 @@ namespace Nickvision::Update
 
     bool Version::operator<=(const Version& compare) const
     {
-        return operator>(compare) || operator==(compare);
+        return operator<(compare) || operator==(compare);
     }
 
     bool Version::operator>(const Version& compare) const
     {
-        if (m_major > compare.m_major)
+        if(m_major > compare.m_major)
         {
             return true;
         }
+        else if(m_major < compare.m_major)
+        {
+            return false;
+        }
         else
         {
-            if (m_minor > compare.m_minor)
+            if(m_minor > compare.m_minor)
             {
                 return true;
             }
+            else if(m_minor < compare.m_minor)
+            {
+                return false;
+            }
             else
             {
-                if (m_build > compare.m_build)
+                if(m_build > compare.m_build)
                 {
                     return true;
                 }
+                else if(m_build < compare.m_build)
+                {
+                    return false;
+                }
                 else
                 {
-                    if (m_dev.empty() && !compare.m_dev.empty()) //stable > dev
+                    if(m_dev.empty() && !compare.m_dev.empty())
                     {
                         return true;
                     }
+                    else if(!m_dev.empty() && compare.m_dev.empty())
+                    {
+                        return false;
+                    }
                 }
             }
         }
@@ -177,7 +209,7 @@ namespace Nickvision::Update
 
     bool Version::operator>=(const Version& compare) const
     {
-        return operator<(compare) || operator==(compare);
+        return operator>(compare) || operator==(compare);
     }
 
     bool Version::operator==(const Version& compare) const

tests/versiontests.cpp

@@ -9,17 +9,6 @@ TEST(VersionTests, EmptyVersion)
     ASSERT_EQ(v.empty(), true);
 }
 
-TEST(VersionTests, VersionFromStrings)
-{
-    Version v1{ "2023.11.52" };
-    Version v2{ "2022.15.2" };
-    ASSERT_EQ(v1.toString(), "2023.11.52");
-    ASSERT_EQ(v2.toString(), "2022.15.2");
-    ASSERT_TRUE(v1 > v2);
-    ASSERT_TRUE(v2 < v1);
-    ASSERT_FALSE(v1 == v2);
-}
-
 TEST(VersionTests, BetaVersion1)
 {
     Version v{ "2010.5.0-beta1" };
@@ -39,4 +28,40 @@ TEST(VersionTests, BadVersion2)
 TEST(VersionTests, BadVersion3)
 {
     ASSERT_THROW(Version("2023-11-0"), std::invalid_argument);
+}
+
+TEST(VersionTests, CompareVersion1)
+{
+    Version v1{ "2023.2.0" };
+    Version v2{ "2024.1.0" };
+    ASSERT_TRUE(v1 < v2);
+    ASSERT_TRUE(v2 > v1);
+    ASSERT_FALSE(v1 == v2);
+}
+
+TEST(VersionTests, CompareVersion2)
+{
+    Version v1{ "2024.2.0" };
+    Version v2{ "2024.2.0-beta1" };
+    ASSERT_TRUE(v1 > v2);
+    ASSERT_TRUE(v2 < v1);
+    ASSERT_FALSE(v1 == v2);
+}
+
+TEST(VersionTests, CompareVersion3)
+{
+    Version v1{ "2024.6.0" };
+    Version v2{ "2023.5.1" };
+    ASSERT_TRUE(v1 > v2);
+    ASSERT_TRUE(v2 < v1);
+    ASSERT_FALSE(v1 == v2);
+}
+
+TEST(VersionTests, CompareVersion4)
+{
+    Version v1{ "2024.6.0" };
+    Version v2{ "2024.6.0" };
+    ASSERT_FALSE(v1 > v2);
+    ASSERT_FALSE(v2 < v1);
+    ASSERT_TRUE(v1 == v2);
 }