From c6e5a5210458f37ac157622c28bb6476fe6dfd46 Mon Sep 17 00:00:00 2001 From: jroam Date: Fri, 14 Jun 2019 23:47:00 +0800 Subject: [PATCH 01/16] add test file --- g/container/gqueue/gqueue_unit_test.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 g/container/gqueue/gqueue_unit_test.go diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go new file mode 100644 index 000000000..5d0a63369 --- /dev/null +++ b/g/container/gqueue/gqueue_unit_test.go @@ -0,0 +1,15 @@ +package gqueue_test +import ( + "testing" + "github.com/gogf/gf/g/container/gqueue" + "github.com/gogf/gf/g/test/gtest" +) + + +func TestQueue_Size(t *testing.T) { + q1:=gqueue.New(3) + q1.Push(1) + q1.Push(2) + q1.Push(3) + gtest.Assert(q1.Size(),3) +} From 142154c0df492ac815b11b634f27b7a4c82bdc11 Mon Sep 17 00:00:00 2001 From: jroam Date: Sat, 15 Jun 2019 18:35:36 +0800 Subject: [PATCH 02/16] add gqueue unit tests --- g/container/gqueue/gqueue_unit_test.go | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index 5d0a63369..b6fe22191 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -1,15 +1,33 @@ package gqueue_test + import ( - "testing" "github.com/gogf/gf/g/container/gqueue" "github.com/gogf/gf/g/test/gtest" + "testing" ) func TestQueue_Size(t *testing.T) { - q1:=gqueue.New(3) + q1:=gqueue.New(2) + q1.Push(1) + q1.Push(2) + gtest.Assert(q1.Len(),2) +} + +func TestQueue_Pop(t *testing.T) { + q1:=gqueue.New() q1.Push(1) q1.Push(2) q1.Push(3) - gtest.Assert(q1.Size(),3) + i1:=q1.Pop() + gtest.Assert(i1,1) +} + +func TestQueue_Close(t *testing.T) { + q1:=gqueue.New() + q1.Push(1) + q1.Push(2) + gtest.Assert(q1.Size(),2) + q1.Close() + gtest.Assert(q1.Size(),2) } From ab38b709b2ecc8370f930b711d4cef9127877086 Mon Sep 17 00:00:00 2001 From: jroam Date: Sat, 15 Jun 2019 18:44:22 +0800 Subject: [PATCH 03/16] add gqueue tests --- g/container/gqueue/gqueue_unit_test.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index b6fe22191..d5f76f4fc 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -6,28 +6,28 @@ import ( "testing" ) - -func TestQueue_Size(t *testing.T) { - q1:=gqueue.New(2) +func TestQueue_Len(t *testing.T) { + q1 := gqueue.New(2) q1.Push(1) q1.Push(2) - gtest.Assert(q1.Len(),2) + gtest.Assert(q1.Len(), 2) + gtest.Assert(q1.Size(), 2) } func TestQueue_Pop(t *testing.T) { - q1:=gqueue.New() + q1 := gqueue.New() q1.Push(1) q1.Push(2) q1.Push(3) - i1:=q1.Pop() - gtest.Assert(i1,1) + i1 := q1.Pop() + gtest.Assert(i1, 1) } func TestQueue_Close(t *testing.T) { - q1:=gqueue.New() + q1 := gqueue.New() q1.Push(1) q1.Push(2) - gtest.Assert(q1.Size(),2) + gtest.Assert(q1.Len(), 2) q1.Close() - gtest.Assert(q1.Size(),2) + gtest.Assert(q1.Len(), 2) } From a7f15a4e00a178f8308e6db9c4497fb07d3b5f5e Mon Sep 17 00:00:00 2001 From: jroam Date: Sat, 15 Jun 2019 21:40:36 +0800 Subject: [PATCH 04/16] change gqueue unit tests --- g/container/gqueue/gqueue_unit_test.go | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index d5f76f4fc..2e187dab9 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -7,27 +7,17 @@ import ( ) func TestQueue_Len(t *testing.T) { - q1 := gqueue.New(2) + q1 := gqueue.New() q1.Push(1) - q1.Push(2) + q1.Push(5) gtest.Assert(q1.Len(), 2) - gtest.Assert(q1.Size(), 2) } func TestQueue_Pop(t *testing.T) { q1 := gqueue.New() q1.Push(1) q1.Push(2) - q1.Push(3) - i1 := q1.Pop() + i1:=q1.Pop() gtest.Assert(i1, 1) } -func TestQueue_Close(t *testing.T) { - q1 := gqueue.New() - q1.Push(1) - q1.Push(2) - gtest.Assert(q1.Len(), 2) - q1.Close() - gtest.Assert(q1.Len(), 2) -} From 677549ec1510d37beedb5f8fe6f950ae4e5fc433 Mon Sep 17 00:00:00 2001 From: jroam Date: Sun, 16 Jun 2019 16:41:12 +0800 Subject: [PATCH 05/16] add some gqueue tests --- g/container/gqueue/gqueue_unit_test.go | 47 +++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index 2e187dab9..a99fda022 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -7,17 +7,54 @@ import ( ) func TestQueue_Len(t *testing.T) { - q1 := gqueue.New() - q1.Push(1) - q1.Push(5) - gtest.Assert(q1.Len(), 2) + q1 := gqueue.New(300) + for i := 0; i < 200; i++ { + q1.Push(i) + } + gtest.Assert(q1.Len(), 200) } func TestQueue_Pop(t *testing.T) { q1 := gqueue.New() + q1.Push(1) q1.Push(2) - i1:=q1.Pop() + i1 := q1.Pop() gtest.Assert(i1, 1) + q1.Close() + i1 = q1.Pop() + gtest.Assert(i1, 2) + + maxs := 12 + q2 := gqueue.New(maxs) + for i := 0; i < maxs; i++ { + q2.Push(i) + } + + i3 := q2.Pop() + gtest.Assert(i3, 0) + } +func TestQueue_Pop2(t *testing.T) { + + maxs := 14 + q2 := gqueue.New(maxs) + for i := 1; i < maxs; i++ { + q2.Push(i) + } + i3 := q2.Pop() + gtest.Assert(i3, 1) + +} + +func TestQueue_Close(t *testing.T) { + q1 := gqueue.New() + q1.Push(1) + q1.Push(2) + gtest.Assert(q1.Len(), 2) + + q1.Close() + gtest.Assert(q1.Len(), 2) + +} From 78b0cae892fd1e38286f832045457a02a1d0d94b Mon Sep 17 00:00:00 2001 From: jroam Date: Sun, 16 Jun 2019 22:05:15 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E5=85=88=E5=8F=96=E6=B6=88=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- g/container/gqueue/gqueue_unit_test.go | 60 -------------------------- 1 file changed, 60 deletions(-) delete mode 100644 g/container/gqueue/gqueue_unit_test.go diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go deleted file mode 100644 index a99fda022..000000000 --- a/g/container/gqueue/gqueue_unit_test.go +++ /dev/null @@ -1,60 +0,0 @@ -package gqueue_test - -import ( - "github.com/gogf/gf/g/container/gqueue" - "github.com/gogf/gf/g/test/gtest" - "testing" -) - -func TestQueue_Len(t *testing.T) { - q1 := gqueue.New(300) - for i := 0; i < 200; i++ { - q1.Push(i) - } - gtest.Assert(q1.Len(), 200) -} - -func TestQueue_Pop(t *testing.T) { - q1 := gqueue.New() - - q1.Push(1) - q1.Push(2) - i1 := q1.Pop() - gtest.Assert(i1, 1) - q1.Close() - i1 = q1.Pop() - gtest.Assert(i1, 2) - - maxs := 12 - q2 := gqueue.New(maxs) - for i := 0; i < maxs; i++ { - q2.Push(i) - } - - i3 := q2.Pop() - gtest.Assert(i3, 0) - -} - -func TestQueue_Pop2(t *testing.T) { - - maxs := 14 - q2 := gqueue.New(maxs) - for i := 1; i < maxs; i++ { - q2.Push(i) - } - i3 := q2.Pop() - gtest.Assert(i3, 1) - -} - -func TestQueue_Close(t *testing.T) { - q1 := gqueue.New() - q1.Push(1) - q1.Push(2) - gtest.Assert(q1.Len(), 2) - - q1.Close() - gtest.Assert(q1.Len(), 2) - -} From 168c08a6f6ccd6d30af96cc3dcae0b89298714cf Mon Sep 17 00:00:00 2001 From: jroam Date: Sun, 16 Jun 2019 22:55:07 +0800 Subject: [PATCH 07/16] Create gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 60 ++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 g/container/gqueue/gqueue_unit_test.go diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go new file mode 100644 index 000000000..a99fda022 --- /dev/null +++ b/g/container/gqueue/gqueue_unit_test.go @@ -0,0 +1,60 @@ +package gqueue_test + +import ( + "github.com/gogf/gf/g/container/gqueue" + "github.com/gogf/gf/g/test/gtest" + "testing" +) + +func TestQueue_Len(t *testing.T) { + q1 := gqueue.New(300) + for i := 0; i < 200; i++ { + q1.Push(i) + } + gtest.Assert(q1.Len(), 200) +} + +func TestQueue_Pop(t *testing.T) { + q1 := gqueue.New() + + q1.Push(1) + q1.Push(2) + i1 := q1.Pop() + gtest.Assert(i1, 1) + q1.Close() + i1 = q1.Pop() + gtest.Assert(i1, 2) + + maxs := 12 + q2 := gqueue.New(maxs) + for i := 0; i < maxs; i++ { + q2.Push(i) + } + + i3 := q2.Pop() + gtest.Assert(i3, 0) + +} + +func TestQueue_Pop2(t *testing.T) { + + maxs := 14 + q2 := gqueue.New(maxs) + for i := 1; i < maxs; i++ { + q2.Push(i) + } + i3 := q2.Pop() + gtest.Assert(i3, 1) + +} + +func TestQueue_Close(t *testing.T) { + q1 := gqueue.New() + q1.Push(1) + q1.Push(2) + gtest.Assert(q1.Len(), 2) + + q1.Close() + gtest.Assert(q1.Len(), 2) + +} From 5b71e927762c58c1e9288ecc22940a5ace2dd938 Mon Sep 17 00:00:00 2001 From: jroam Date: Sun, 16 Jun 2019 23:24:03 +0800 Subject: [PATCH 08/16] Update gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index a99fda022..81143df1d 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -7,11 +7,16 @@ import ( ) func TestQueue_Len(t *testing.T) { - q1 := gqueue.New(300) - for i := 0; i < 200; i++ { - q1.Push(i) + maxs := 100 + for n := 10; n < maxs; n++ { + q1 := gqueue.New(maxs) + for i := 0; i < maxs; i++ { + q1.Push(i) + + } + gtest.Assert(q1.Len(), maxs) } - gtest.Assert(q1.Len(), 200) + } func TestQueue_Pop(t *testing.T) { @@ -36,18 +41,6 @@ func TestQueue_Pop(t *testing.T) { } -func TestQueue_Pop2(t *testing.T) { - - maxs := 14 - q2 := gqueue.New(maxs) - for i := 1; i < maxs; i++ { - q2.Push(i) - } - i3 := q2.Pop() - gtest.Assert(i3, 1) - -} - func TestQueue_Close(t *testing.T) { q1 := gqueue.New() q1.Push(1) From 0ab60cb770f49178ba840b56aaab97ecbb25640b Mon Sep 17 00:00:00 2001 From: jroam Date: Sun, 16 Jun 2019 23:26:49 +0800 Subject: [PATCH 09/16] Update gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index 81143df1d..d0ae9d7c4 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -12,7 +12,6 @@ func TestQueue_Len(t *testing.T) { q1 := gqueue.New(maxs) for i := 0; i < maxs; i++ { q1.Push(i) - } gtest.Assert(q1.Len(), maxs) } From 97d2b9e1f97c2d953fbd255a4258713c4c305f1e Mon Sep 17 00:00:00 2001 From: jroam Date: Mon, 17 Jun 2019 11:04:56 +0800 Subject: [PATCH 10/16] Update gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index d0ae9d7c4..6117efd5c 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -15,12 +15,10 @@ func TestQueue_Len(t *testing.T) { } gtest.Assert(q1.Len(), maxs) } - } func TestQueue_Pop(t *testing.T) { q1 := gqueue.New() - q1.Push(1) q1.Push(2) i1 := q1.Pop() @@ -37,7 +35,6 @@ func TestQueue_Pop(t *testing.T) { i3 := q2.Pop() gtest.Assert(i3, 0) - } func TestQueue_Close(t *testing.T) { From fd4843c3a1531d38d06a6be2e0d5df9fbed5ac4c Mon Sep 17 00:00:00 2001 From: jroam Date: Mon, 17 Jun 2019 11:31:03 +0800 Subject: [PATCH 11/16] Update gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index 6117efd5c..19b4a0405 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -21,6 +21,8 @@ func TestQueue_Pop(t *testing.T) { q1 := gqueue.New() q1.Push(1) q1.Push(2) + q1.Push(3) + q1.Push(4) i1 := q1.Pop() gtest.Assert(i1, 1) q1.Close() From 53b5de330eb3c6303e7768097d9496f64fb03c6d Mon Sep 17 00:00:00 2001 From: jroam Date: Mon, 17 Jun 2019 11:40:40 +0800 Subject: [PATCH 12/16] Update gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index 19b4a0405..eb8908a14 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -25,18 +25,7 @@ func TestQueue_Pop(t *testing.T) { q1.Push(4) i1 := q1.Pop() gtest.Assert(i1, 1) - q1.Close() - i1 = q1.Pop() - gtest.Assert(i1, 2) - maxs := 12 - q2 := gqueue.New(maxs) - for i := 0; i < maxs; i++ { - q2.Push(i) - } - - i3 := q2.Pop() - gtest.Assert(i3, 0) } func TestQueue_Close(t *testing.T) { @@ -44,8 +33,5 @@ func TestQueue_Close(t *testing.T) { q1.Push(1) q1.Push(2) gtest.Assert(q1.Len(), 2) - q1.Close() - gtest.Assert(q1.Len(), 2) - } From 9fad898ee32ad8d6e10b3917b2d0193205232e31 Mon Sep 17 00:00:00 2001 From: jroam Date: Mon, 17 Jun 2019 22:03:41 +0800 Subject: [PATCH 13/16] Update gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index 8b947ca75..085c55cfc 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -53,4 +53,6 @@ func TestQueue_Close(t *testing.T) { q1.Push(2) gtest.Assert(q1.Len(), 2) q1.Close() + q1.Pop() + gtest.Assert(q1.Len(), 2) } From fe795d49f3cb9d5142b2aea30f1ca303c68fcb3b Mon Sep 17 00:00:00 2001 From: jroam Date: Mon, 17 Jun 2019 22:46:36 +0800 Subject: [PATCH 14/16] fix gfile test of a bug fix gfile test of bug --- g/os/gfile/gfile_z_test.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/g/os/gfile/gfile_z_test.go b/g/os/gfile/gfile_z_test.go index c0315f9f5..b7d438434 100644 --- a/g/os/gfile/gfile_z_test.go +++ b/g/os/gfile/gfile_z_test.go @@ -337,9 +337,7 @@ func TestCopy(t *testing.T) { defer delTestFiles(topath) gtest.Assert(gfile.IsFile(testpath()+topath), true) - gtest.AssertNE(gfile.Copy("", ""), nil) - }) } @@ -365,7 +363,7 @@ func TestDirNames(t *testing.T) { readlist, err = gfile.DirNames(testpath() + paths) gtest.Assert(err, nil) - gtest.Assert(havelist, readlist) + gtest.AssertIN(readlist, havelist) _, err = gfile.DirNames("") gtest.AssertNE(err, nil) @@ -653,8 +651,8 @@ func TestMkdir(t *testing.T) { func TestStat(t *testing.T) { gtest.Case(t, func() { var ( - tpath1 = "/testfile_t1.txt" - tpath2 = "./testfile_t1_no.txt" + tpath1 = "/testfile_t1.txt" + tpath2 = "./testfile_t1_no.txt" err error fileiofo os.FileInfo ) From 28d25e7812fb64c935f9a0af6f26d9e7be1840ce Mon Sep 17 00:00:00 2001 From: jroam Date: Mon, 17 Jun 2019 23:16:22 +0800 Subject: [PATCH 15/16] Update gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index 085c55cfc..8b947ca75 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -53,6 +53,4 @@ func TestQueue_Close(t *testing.T) { q1.Push(2) gtest.Assert(q1.Len(), 2) q1.Close() - q1.Pop() - gtest.Assert(q1.Len(), 2) } From 19d7ad734b2fa92c95dba6ff3e7683f8bde61efc Mon Sep 17 00:00:00 2001 From: jroam Date: Tue, 18 Jun 2019 11:20:10 +0800 Subject: [PATCH 16/16] Update gqueue_unit_test.go --- g/container/gqueue/gqueue_unit_test.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/g/container/gqueue/gqueue_unit_test.go b/g/container/gqueue/gqueue_unit_test.go index 8b947ca75..322c63985 100644 --- a/g/container/gqueue/gqueue_unit_test.go +++ b/g/container/gqueue/gqueue_unit_test.go @@ -15,7 +15,6 @@ import ( ) func TestQueue_Len(t *testing.T) { - max := 100 for n := 10; n < max; n++ { q1 := gqueue.New(max) @@ -44,7 +43,6 @@ func TestQueue_Pop(t *testing.T) { q1.Push(4) i1 := q1.Pop() gtest.Assert(i1, 1) - } func TestQueue_Close(t *testing.T) {