refactor: Remove unused code and update dependencies

This commit is contained in:
Marvin Zhang
2024-07-13 11:08:56 +08:00
parent 54cf19f679
commit 9073f1ca02
8 changed files with 154 additions and 134 deletions

View File

@@ -2,6 +2,7 @@ package client_test
import (
"context"
"github.com/apex/log"
"github.com/crawlab-team/crawlab/core/grpc/server"
"github.com/crawlab-team/crawlab/core/models/client"
"github.com/crawlab-team/crawlab/core/models/models/v2"
@@ -28,13 +29,27 @@ func teardownTestDB() {
db.Drop(context.Background())
}
func startSvr(svr *server.GrpcServerV2) {
err := svr.Start()
if err != nil {
log.Errorf("failed to start grpc server: %v", err)
}
}
func stopSvr(svr *server.GrpcServerV2) {
err := svr.Stop()
if err != nil {
log.Errorf("failed to stop grpc server: %v", err)
}
}
func TestModelServiceV2_GetById(t *testing.T) {
setupTestDB()
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -45,7 +60,7 @@ func TestModelServiceV2_GetById(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -61,8 +76,8 @@ func TestModelServiceV2_GetOne(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -73,7 +88,7 @@ func TestModelServiceV2_GetOne(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -89,8 +104,8 @@ func TestModelServiceV2_GetMany(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -101,7 +116,7 @@ func TestModelServiceV2_GetMany(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -118,8 +133,8 @@ func TestModelServiceV2_DeleteById(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -130,7 +145,7 @@ func TestModelServiceV2_DeleteById(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -148,8 +163,8 @@ func TestModelServiceV2_DeleteOne(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -160,7 +175,7 @@ func TestModelServiceV2_DeleteOne(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -178,8 +193,8 @@ func TestModelServiceV2_DeleteMany(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -190,7 +205,7 @@ func TestModelServiceV2_DeleteMany(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -208,8 +223,8 @@ func TestModelServiceV2_UpdateById(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -220,7 +235,7 @@ func TestModelServiceV2_UpdateById(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -238,8 +253,8 @@ func TestModelServiceV2_UpdateOne(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -250,7 +265,7 @@ func TestModelServiceV2_UpdateOne(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -268,8 +283,8 @@ func TestModelServiceV2_UpdateMany(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m1 := TestModel{
Name: "Test Name",
@@ -284,7 +299,7 @@ func TestModelServiceV2_UpdateMany(t *testing.T) {
require.Nil(t, err)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -302,8 +317,8 @@ func TestModelServiceV2_ReplaceById(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -314,7 +329,7 @@ func TestModelServiceV2_ReplaceById(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -333,8 +348,8 @@ func TestModelServiceV2_ReplaceOne(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
m := TestModel{
Name: "Test Name",
@@ -345,7 +360,7 @@ func TestModelServiceV2_ReplaceOne(t *testing.T) {
m.SetId(id)
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -364,10 +379,10 @@ func TestModelServiceV2_InsertOne(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
@@ -388,25 +403,25 @@ func TestModelServiceV2_InsertMany(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()
clientSvc := client.NewModelServiceV2[TestModel]()
models := []TestModel{
testModels := []TestModel{
{Name: "Test Name 1"},
{Name: "Test Name 2"},
}
ids, err := clientSvc.InsertMany(models)
ids, err := clientSvc.InsertMany(testModels)
require.Nil(t, err)
for i, id := range ids {
res, err := clientSvc.GetById(id)
require.Nil(t, err)
assert.Equal(t, res.Name, models[i].Name)
assert.Equal(t, res.Name, testModels[i].Name)
}
}
@@ -415,8 +430,8 @@ func TestModelServiceV2_Count(t *testing.T) {
defer teardownTestDB()
svr, err := server.NewGrpcServerV2()
require.Nil(t, err)
go svr.Start()
defer svr.Stop()
go startSvr(svr)
defer stopSvr(svr)
modelSvc := service.NewModelServiceV2[TestModel]()
for i := 0; i < 5; i++ {
@@ -427,7 +442,7 @@ func TestModelServiceV2_Count(t *testing.T) {
}
time.Sleep(100 * time.Millisecond)
c, err := grpc.Dial("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
c, err := grpc.NewClient("localhost:9666", grpc.WithTransportCredentials(insecure.NewCredentials()))
require.Nil(t, err)
c.Connect()