From d11af440a457d290aa6bc3b12ac251594060376f Mon Sep 17 00:00:00 2001 From: mcrakhman Date: Tue, 12 Jul 2022 10:55:09 +0200 Subject: [PATCH] Simplify paths to yaml tests --- acltree/acltree_test.go | 10 +++++----- acltree/treebuilder_test.go | 6 +++--- plaintextdocument/document_test.go | 4 ++-- testutils/threadbuilder/threadbuilder.go | 7 +++++++ testutils/threadbuilder/ymlentities_test.go | 2 +- .../invalidsnapshotexample.yml | 0 testutils/yamltests/path.go | 15 +++++++++++++++ .../userjoinexample.yml | 0 .../userjoinexampleupdate.yml | 0 .../userremovebeforeexample.yml | 0 .../userremoveexample.yml | 0 .../validsnapshotexample.yml | 0 12 files changed, 33 insertions(+), 11 deletions(-) rename testutils/{threadbuilder => yamltests}/invalidsnapshotexample.yml (100%) create mode 100644 testutils/yamltests/path.go rename testutils/{threadbuilder => yamltests}/userjoinexample.yml (100%) rename testutils/{threadbuilder => yamltests}/userjoinexampleupdate.yml (100%) rename testutils/{threadbuilder => yamltests}/userremovebeforeexample.yml (100%) rename testutils/{threadbuilder => yamltests}/userremoveexample.yml (100%) rename testutils/{threadbuilder => yamltests}/validsnapshotexample.yml (100%) diff --git a/acltree/acltree_test.go b/acltree/acltree_test.go index 8f5665ac..7ca67c5c 100644 --- a/acltree/acltree_test.go +++ b/acltree/acltree_test.go @@ -17,7 +17,7 @@ func (m *mockListener) Update(tree ACLTree) {} func (m *mockListener) Rebuild(tree ACLTree) {} func TestACLTree_UserJoinBuild(t *testing.T) { - thr, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/userjoinexample.yml") + thr, err := threadbuilder.NewThreadBuilderWithTestName("userjoinexample.yml") if err != nil { t.Fatal(err) } @@ -52,7 +52,7 @@ func TestACLTree_UserJoinBuild(t *testing.T) { } func TestACLTree_UserRemoveBuild(t *testing.T) { - thr, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/userremoveexample.yml") + thr, err := threadbuilder.NewThreadBuilderWithTestName("userremoveexample.yml") if err != nil { t.Fatal(err) } @@ -83,7 +83,7 @@ func TestACLTree_UserRemoveBuild(t *testing.T) { } func TestACLTree_UserRemoveBeforeBuild(t *testing.T) { - thr, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/userremovebeforeexample.yml") + thr, err := threadbuilder.NewThreadBuilderWithTestName("userremovebeforeexample.yml") if err != nil { t.Fatal(err) } @@ -115,7 +115,7 @@ func TestACLTree_UserRemoveBeforeBuild(t *testing.T) { } func TestACLTree_InvalidSnapshotBuild(t *testing.T) { - thr, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/invalidsnapshotexample.yml") + thr, err := threadbuilder.NewThreadBuilderWithTestName("invalidsnapshotexample.yml") if err != nil { t.Fatal(err) } @@ -146,7 +146,7 @@ func TestACLTree_InvalidSnapshotBuild(t *testing.T) { } func TestACLTree_ValidSnapshotBuild(t *testing.T) { - thr, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/validsnapshotexample.yml") + thr, err := threadbuilder.NewThreadBuilderWithTestName("validsnapshotexample.yml") if err != nil { t.Fatal(err) } diff --git a/acltree/treebuilder_test.go b/acltree/treebuilder_test.go index 02d0a317..cc586148 100644 --- a/acltree/treebuilder_test.go +++ b/acltree/treebuilder_test.go @@ -7,7 +7,7 @@ package acltree //} // //func TestACLTreeBuilder_UserJoinCorrectHeadsAndLen(t *testing.T) { -// thread, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/userjoinexample.yml") +// thread, err := threadbuilder.NewThreadBuilderWithTestName("threadbuilder/userjoinexample.yml") // if err != nil { // t.Fatal(err) // } @@ -22,7 +22,7 @@ package acltree //} // //func TestTreeBuilder_UserJoinTestTreeIterate(t *testing.T) { -// thread, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/userjoinexample.yml") +// thread, err := threadbuilder.NewThreadBuilderWithTestName("threadbuilder/userjoinexample.yml") // if err != nil { // t.Fatal(err) // } @@ -43,7 +43,7 @@ package acltree //} // //func TestTreeBuilder_UserRemoveTestTreeIterate(t *testing.T) { -// thread, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/userremoveexample.yml") +// thread, err := threadbuilder.NewThreadBuilderWithTestName("threadbuilder/userremoveexample.yml") // if err != nil { // t.Fatal(err) // } diff --git a/plaintextdocument/document_test.go b/plaintextdocument/document_test.go index b90f1f9c..0532240e 100644 --- a/plaintextdocument/document_test.go +++ b/plaintextdocument/document_test.go @@ -8,7 +8,7 @@ package plaintextdocument //) // //func TestDocument_Build(t *testing.T) { -// thread, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/userjoinexample.yml") +// thread, err := threadbuilder.NewThreadBuilderWithTestName("threadbuilder/userjoinexample.yml") // if err != nil { // t.Fatal(err) // } @@ -28,7 +28,7 @@ package plaintextdocument //} // //func TestDocument_Update(t *testing.T) { -// thread, err := threadbuilder.NewThreadBuilderFromFile("threadbuilder/userjoinexample.yml") +// thread, err := threadbuilder.NewThreadBuilderWithTestName("threadbuilder/userjoinexample.yml") // if err != nil { // t.Fatal(err) // } diff --git a/testutils/threadbuilder/threadbuilder.go b/testutils/threadbuilder/threadbuilder.go index 9cfd25f8..e5af56a3 100644 --- a/testutils/threadbuilder/threadbuilder.go +++ b/testutils/threadbuilder/threadbuilder.go @@ -4,8 +4,10 @@ import ( "context" "fmt" "github.com/anytypeio/go-anytype-infrastructure-experiments/aclchanges" + "github.com/anytypeio/go-anytype-infrastructure-experiments/testutils/yamltests" "github.com/anytypeio/go-anytype-infrastructure-experiments/util/slice" "io/ioutil" + "path" "github.com/gogo/protobuf/proto" "gopkg.in/yaml.v3" @@ -46,6 +48,11 @@ func NewThreadBuilder(keychain *Keychain) *ThreadBuilder { } } +func NewThreadBuilderWithTestName(name string) (*ThreadBuilder, error) { + filePath := path.Join(yamltests.Path(), name) + return NewThreadBuilderFromFile(filePath) +} + func NewThreadBuilderFromFile(file string) (*ThreadBuilder, error) { content, err := ioutil.ReadFile(file) if err != nil { diff --git a/testutils/threadbuilder/ymlentities_test.go b/testutils/threadbuilder/ymlentities_test.go index d2420eae..30c8f453 100644 --- a/testutils/threadbuilder/ymlentities_test.go +++ b/testutils/threadbuilder/ymlentities_test.go @@ -6,7 +6,7 @@ import ( ) func Test_YamlParse(t *testing.T) { - tb, _ := NewThreadBuilderFromFile("userjoinexample.yml") + tb, _ := NewThreadBuilderWithTestName("userjoinexample.yml") gr, _ := tb.Graph() fmt.Println(gr) } diff --git a/testutils/threadbuilder/invalidsnapshotexample.yml b/testutils/yamltests/invalidsnapshotexample.yml similarity index 100% rename from testutils/threadbuilder/invalidsnapshotexample.yml rename to testutils/yamltests/invalidsnapshotexample.yml diff --git a/testutils/yamltests/path.go b/testutils/yamltests/path.go new file mode 100644 index 00000000..c2dd2712 --- /dev/null +++ b/testutils/yamltests/path.go @@ -0,0 +1,15 @@ +package yamltests + +import ( + "path/filepath" + "runtime" +) + +var ( + _, b, _, _ = runtime.Caller(0) + basepath = filepath.Dir(b) +) + +func Path() string { + return basepath +} diff --git a/testutils/threadbuilder/userjoinexample.yml b/testutils/yamltests/userjoinexample.yml similarity index 100% rename from testutils/threadbuilder/userjoinexample.yml rename to testutils/yamltests/userjoinexample.yml diff --git a/testutils/threadbuilder/userjoinexampleupdate.yml b/testutils/yamltests/userjoinexampleupdate.yml similarity index 100% rename from testutils/threadbuilder/userjoinexampleupdate.yml rename to testutils/yamltests/userjoinexampleupdate.yml diff --git a/testutils/threadbuilder/userremovebeforeexample.yml b/testutils/yamltests/userremovebeforeexample.yml similarity index 100% rename from testutils/threadbuilder/userremovebeforeexample.yml rename to testutils/yamltests/userremovebeforeexample.yml diff --git a/testutils/threadbuilder/userremoveexample.yml b/testutils/yamltests/userremoveexample.yml similarity index 100% rename from testutils/threadbuilder/userremoveexample.yml rename to testutils/yamltests/userremoveexample.yml diff --git a/testutils/threadbuilder/validsnapshotexample.yml b/testutils/yamltests/validsnapshotexample.yml similarity index 100% rename from testutils/threadbuilder/validsnapshotexample.yml rename to testutils/yamltests/validsnapshotexample.yml