这是indexloc提供的服务，不要输入任何密码
Skip to content

Refactor unit tests #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 22, 2021
Merged

Refactor unit tests #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ fmt: show-env
@echo ">> formatting code"
$(GO) fmt $(PACKAGES)

.PHONY: mock
mock: show-env
@echo ">> generating mocks"
mockgen -source=./metastore/storage.go -destination=./mock/metastore/storage.go

.PHONY: test
test: show-env
@echo ">> testing all packages"
Expand Down
55 changes: 41 additions & 14 deletions analysis/analyzer/detector_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,29 @@ func TestNewLanguageDetectorEn(t *testing.T) {
text := "Hello world."
analyzer := detector.DetectAnalyzer(text)

ts := analyzer.Analyze([]byte(text))
freqs, _ := analysis.TokenFrequency(ts, true, 0)
tokens := make([]string, 0)
for token := range freqs {
tokens = append(tokens, token)
actual := analyzer.Analyze([]byte(text))

expected := analysis.TokenStream{
&analysis.Token{
Start: 0,
End: 5,
PositionIncr: 1,
Type: 0,
Term: []byte("hello"),
},
&analysis.Token{
Start: 6,
End: 11,
PositionIncr: 1,
Type: 0,
Term: []byte("world"),
},
}
if !reflect.DeepEqual(tokens, []string{"hello", "world"}) {
t.Fatalf("unexpected %v\n", tokens)

if !reflect.DeepEqual(actual, expected) {
t.Fatalf("unexpected %v\n", actual)
}

}

func TestNewLanguageDetectorJa(t *testing.T) {
Expand All @@ -41,13 +55,26 @@ func TestNewLanguageDetectorJa(t *testing.T) {
text := "本日は晴天なり"
analyzer := detector.DetectAnalyzer(text)

ts := analyzer.Analyze([]byte(text))
freqs, _ := analysis.TokenFrequency(ts, true, 0)
tokens := make([]string, 0)
for token := range freqs {
tokens = append(tokens, token)
actual := analyzer.Analyze([]byte(text))

expected := analysis.TokenStream{
&analysis.Token{
Start: 0,
End: 6,
PositionIncr: 1,
Type: 1,
Term: []byte("本日"),
},
&analysis.Token{
Start: 9,
End: 15,
PositionIncr: 2,
Type: 1,
Term: []byte("晴天"),
},
}
if !reflect.DeepEqual(tokens, []string{"本日", "晴天"}) {
t.Fatalf("unexpected %v\n", tokens)

if !reflect.DeepEqual(actual, expected) {
t.Fatalf("unexpected %v\n", actual)
}
}
4 changes: 4 additions & 0 deletions clients/etcd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ func NewEtcdClientWithUri(uri string) (*clientv3.Client, error) {
endpoints = strings.Split(str, ",")
}

return NewEtcdClient(endpoints)
}

func NewEtcdClient(endpoints []string) (*clientv3.Client, error) {
cfg := clientv3.Config{
Endpoints: endpoints,
DialTimeout: 2 * time.Second,
Expand Down
5 changes: 5 additions & 0 deletions directory/directory_fs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ func NewFileSystemDirectoryWithUri(uri string, lockManager lock.LockManager, log
}

func (d *FileSystemDirectory) Lock() error {
// 1. create lockmanager
// 2. lock

if _, err := d.lockManager.Lock(); err != nil {
d.logger.Error(err.Error(), zap.String("path", d.path))
return err
Expand All @@ -61,6 +64,8 @@ func (d *FileSystemDirectory) Lock() error {
}

func (d *FileSystemDirectory) Unlock() error {
// 1. unlock
// 2. remove lockmanager
if err := d.lockManager.Unlock(); err != nil {
d.logger.Error(err.Error(), zap.String("path", d.path))
return err
Expand Down
258 changes: 129 additions & 129 deletions directory/directory_minio_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,131 +1,131 @@
package directory

import (
"testing"

"github.com/blugelabs/bluge/index"
"github.com/mosuka/phalanx/lock"
"github.com/mosuka/phalanx/logging"
)

func TestNewMinioDirectoryWithUri(t *testing.T) {
logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
if err != nil {
t.Fatalf("%v\n", err)
}

uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
if directory == nil {
t.Fatalf("failed to create MinIO directory\n")
}
}

func TestMinioDirectorySetup(t *testing.T) {
logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
if err != nil {
t.Fatalf("%v\n", err)
}

uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
if directory == nil {
t.Fatalf("failed to create MinIO directory\n")
}

if err := directory.Setup(false); err != nil {
t.Fatalf("%v\n", err)
}
}

func TestMinioDirectoryList(t *testing.T) {
logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
if err != nil {
t.Fatalf("%v\n", err)
}

uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
if directory == nil {
t.Fatalf("failed to create MinIO directory\n")
}

if err := directory.Setup(false); err != nil {
t.Fatalf("%v\n", err)
}

kind := index.ItemKindSegment

_, err = directory.List(kind)
if err != nil {
t.Fatalf("%v\n", err)
}
}

func TestMinioDirectoryLoad(t *testing.T) {
logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
if err != nil {
t.Fatalf("%v\n", err)
}

uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
if directory == nil {
t.Fatalf("failed to create MinIO directory\n")
}

if err := directory.Setup(false); err != nil {
t.Fatalf("%v\n", err)
}

kind := index.ItemKindSegment

ids, err := directory.List(kind)
if err != nil {
t.Fatalf("%v\n", err)
}

id := ids[0]

_, _, err = directory.Load(kind, id)
if err != nil {
t.Fatalf("%v\n", err)
}
}

func TestMinioDirectoryLock(t *testing.T) {
logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
if err != nil {
t.Fatalf("%v\n", err)
}

uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
if directory == nil {
t.Fatalf("failed to create MinIO directory\n")
}

if err := directory.Setup(false); err != nil {
t.Fatalf("%v\n", err)
}

if err := directory.Lock(); err != nil {
t.Fatalf("%v\n", err)
}
defer directory.Unlock()
}
// import (
// "testing"

// "github.com/blugelabs/bluge/index"
// "github.com/mosuka/phalanx/lock"
// "github.com/mosuka/phalanx/logging"
// )

// func TestNewMinioDirectoryWithUri(t *testing.T) {
// logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

// lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
// lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
// if err != nil {
// t.Fatalf("%v\n", err)
// }

// uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
// directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
// if directory == nil {
// t.Fatalf("failed to create MinIO directory\n")
// }
// }

// func TestMinioDirectorySetup(t *testing.T) {
// logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

// lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
// lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
// if err != nil {
// t.Fatalf("%v\n", err)
// }

// uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
// directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
// if directory == nil {
// t.Fatalf("failed to create MinIO directory\n")
// }

// if err := directory.Setup(false); err != nil {
// t.Fatalf("%v\n", err)
// }
// }

// func TestMinioDirectoryList(t *testing.T) {
// logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

// lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
// lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
// if err != nil {
// t.Fatalf("%v\n", err)
// }

// uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
// directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
// if directory == nil {
// t.Fatalf("failed to create MinIO directory\n")
// }

// if err := directory.Setup(false); err != nil {
// t.Fatalf("%v\n", err)
// }

// kind := index.ItemKindSegment

// _, err = directory.List(kind)
// if err != nil {
// t.Fatalf("%v\n", err)
// }
// }

// func TestMinioDirectoryLoad(t *testing.T) {
// logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

// lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
// lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
// if err != nil {
// t.Fatalf("%v\n", err)
// }

// uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
// directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
// if directory == nil {
// t.Fatalf("failed to create MinIO directory\n")
// }

// if err := directory.Setup(false); err != nil {
// t.Fatalf("%v\n", err)
// }

// kind := index.ItemKindSegment

// ids, err := directory.List(kind)
// if err != nil {
// t.Fatalf("%v\n", err)
// }

// id := ids[0]

// _, _, err = directory.Load(kind, id)
// if err != nil {
// t.Fatalf("%v\n", err)
// }
// }

// func TestMinioDirectoryLock(t *testing.T) {
// logger := logging.NewLogger("WARN", "", 500, 3, 30, false)

// lock_uri := "etcd://phalanx-test/locks/wikipedia_en?endpoints=localhost:2379"
// lockManager, err := lock.NewLockManagerWithUri(lock_uri, logger)
// if err != nil {
// t.Fatalf("%v\n", err)
// }

// uri := "minio://phalanx-test/indexes/wikipedia_en?endpoint=localhost:9000&access_key=minio&secret_key=miniosecret&secure=false&region=us-east-1"
// directory := NewMinioDirectoryWithUri(uri, lockManager, logger)
// if directory == nil {
// t.Fatalf("failed to create MinIO directory\n")
// }

// if err := directory.Setup(false); err != nil {
// t.Fatalf("%v\n", err)
// }

// if err := directory.Lock(); err != nil {
// t.Fatalf("%v\n", err)
// }
// defer directory.Unlock()
// }
Loading