From c0df8a3d804fb20a432a8ae6278be506728e31c1 Mon Sep 17 00:00:00 2001 From: John Date: Sat, 16 May 2020 00:11:08 +0800 Subject: [PATCH] improve version functions for package gstr --- text/gstr/gstr_version.go | 4 ++-- text/gstr/gstr_z_unit_version_test.go | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/text/gstr/gstr_version.go b/text/gstr/gstr_version.go index a72936975..f8ba94874 100644 --- a/text/gstr/gstr_version.go +++ b/text/gstr/gstr_version.go @@ -58,7 +58,7 @@ func CompareVersion(a, b string) int { return 0 } -// CompareVersion compares and as standard Golang version. +// CompareVersionGo compares and as standard Golang version. // It returns 1 if > . // It returns -1 if < . // It returns 0 if = . @@ -70,7 +70,7 @@ func CompareVersion(a, b string) int { // v0.0.0-20190626092158-b2ccc519800e // v4.20.0+incompatible // etc. -func CompareVersionGolang(a, b string) int { +func CompareVersionGo(a, b string) int { if a[0] == 'v' { a = a[1:] } diff --git a/text/gstr/gstr_z_unit_version_test.go b/text/gstr/gstr_z_unit_version_test.go index 469052ed6..c79eeee39 100644 --- a/text/gstr/gstr_z_unit_version_test.go +++ b/text/gstr/gstr_z_unit_version_test.go @@ -26,17 +26,17 @@ func Test_CompareVersion(t *testing.T) { }) } -func Test_CompareVersionGolang(t *testing.T) { +func Test_CompareVersionGo(t *testing.T) { gtest.C(t, func(t *gtest.T) { - t.AssertEQ(gstr.CompareVersionGolang("v1.0.1", "v1.1.0"), -1) - t.AssertEQ(gstr.CompareVersionGolang("1.0.1", "v1.1.0"), -1) - t.AssertEQ(gstr.CompareVersionGolang("1.0.0", "v0.1.0"), 1) - t.AssertEQ(gstr.CompareVersionGolang("1.0.0", "v1.0.0"), 0) - t.AssertEQ(gstr.CompareVersionGolang("v0.0.0-20190626092158-b2ccc519800e", "0.0.0-20190626092158"), 0) - t.AssertEQ(gstr.CompareVersionGolang("v0.0.0-20190626092159-b2ccc519800e", "0.0.0-20190626092158"), 1) - t.AssertEQ(gstr.CompareVersionGolang("v4.20.0+incompatible", "4.20.0"), 0) - t.AssertEQ(gstr.CompareVersionGolang("v4.20.0+incompatible", "4.20.1"), -1) + t.AssertEQ(gstr.CompareVersionGo("v1.0.1", "v1.1.0"), -1) + t.AssertEQ(gstr.CompareVersionGo("1.0.1", "v1.1.0"), -1) + t.AssertEQ(gstr.CompareVersionGo("1.0.0", "v0.1.0"), 1) + t.AssertEQ(gstr.CompareVersionGo("1.0.0", "v1.0.0"), 0) + t.AssertEQ(gstr.CompareVersionGo("v0.0.0-20190626092158-b2ccc519800e", "0.0.0-20190626092158"), 0) + t.AssertEQ(gstr.CompareVersionGo("v0.0.0-20190626092159-b2ccc519800e", "0.0.0-20190626092158"), 1) + t.AssertEQ(gstr.CompareVersionGo("v4.20.0+incompatible", "4.20.0"), 0) + t.AssertEQ(gstr.CompareVersionGo("v4.20.0+incompatible", "4.20.1"), -1) // Note that this comparison a < b. - t.AssertEQ(gstr.CompareVersionGolang("v1.12.2-0.20200413154443-b17e3a6804fa", "v1.12.2"), -1) + t.AssertEQ(gstr.CompareVersionGo("v1.12.2-0.20200413154443-b17e3a6804fa", "v1.12.2"), -1) }) }