From 2ffea4027df85b879d50844a7d0d7989f760317b Mon Sep 17 00:00:00 2001 From: Harlow Ward Date: Sat, 25 May 2019 12:06:38 -0700 Subject: [PATCH] Fix updated func name in tests --- checkpoint/mysql/mysql_test.go | 18 +++++++++--------- checkpoint/postgres/postgres_test.go | 18 +++++++++--------- checkpoint/redis/redis_test.go | 6 +++--- consumer_test.go | 10 +++++----- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/checkpoint/mysql/mysql_test.go b/checkpoint/mysql/mysql_test.go index 137726c..afc3cc0 100644 --- a/checkpoint/mysql/mysql_test.go +++ b/checkpoint/mysql/mysql_test.go @@ -72,7 +72,7 @@ func TestNew_WithMaxIntervalOption(t *testing.T) { ck.Shutdown() } -func TestCheckpoint_Get(t *testing.T) { +func TestCheckpoint_GetCheckpoint(t *testing.T) { appName := "streamConsumer" tableName := "checkpoint" connString := "user:password@/dbname" @@ -98,7 +98,7 @@ func TestCheckpoint_Get(t *testing.T) { tableName) mock.ExpectQuery(expectedSQLRegexString).WithArgs(namespace, shardID).WillReturnRows(expectedRows) - gotSequenceNumber, err := ck.Get(streamName, shardID) + gotSequenceNumber, err := ck.GetCheckpoint(streamName, shardID) if gotSequenceNumber != expectedSequenceNumber { t.Errorf("expected sequence number equals %v, but got %v", expectedSequenceNumber, gotSequenceNumber) @@ -134,7 +134,7 @@ func TestCheckpoint_Get_NoRows(t *testing.T) { tableName) mock.ExpectQuery(expectedSQLRegexString).WithArgs(namespace, shardID).WillReturnError(sql.ErrNoRows) - gotSequenceNumber, err := ck.Get(streamName, shardID) + gotSequenceNumber, err := ck.GetCheckpoint(streamName, shardID) if gotSequenceNumber != "" { t.Errorf("expected sequence number equals empty, but got %v", gotSequenceNumber) @@ -170,7 +170,7 @@ func TestCheckpoint_Get_QueryError(t *testing.T) { tableName) mock.ExpectQuery(expectedSQLRegexString).WithArgs(namespace, shardID).WillReturnError(errors.New("an error")) - gotSequenceNumber, err := ck.Get(streamName, shardID) + gotSequenceNumber, err := ck.GetCheckpoint(streamName, shardID) if gotSequenceNumber != "" { t.Errorf("expected sequence number equals empty, but got %v", gotSequenceNumber) @@ -184,7 +184,7 @@ func TestCheckpoint_Get_QueryError(t *testing.T) { ck.Shutdown() } -func TestCheckpoint_Set(t *testing.T) { +func TestCheckpoint_SetCheckpoint(t *testing.T) { appName := "streamConsumer" tableName := "checkpoint" connString := "user:password@/dbname" @@ -197,7 +197,7 @@ func TestCheckpoint_Set(t *testing.T) { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } - err = ck.Set(streamName, shardID, expectedSequenceNumber) + err = ck.SetCheckpoint(streamName, shardID, expectedSequenceNumber) if err != nil { t.Errorf("expected error equals nil, but got %v", err) @@ -218,7 +218,7 @@ func TestCheckpoint_Set_SequenceNumberEmpty(t *testing.T) { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } - err = ck.Set(streamName, shardID, expectedSequenceNumber) + err = ck.SetCheckpoint(streamName, shardID, expectedSequenceNumber) if err == nil { t.Errorf("expected error equals not nil, but got %v", err) @@ -249,7 +249,7 @@ func TestCheckpoint_Shutdown(t *testing.T) { result := sqlmock.NewResult(0, 1) mock.ExpectExec(expectedSQLRegexString).WithArgs(namespace, shardID, expectedSequenceNumber).WillReturnResult(result) - err = ck.Set(streamName, shardID, expectedSequenceNumber) + err = ck.SetCheckpoint(streamName, shardID, expectedSequenceNumber) if err != nil { t.Fatalf("unable to set checkpoint for data initialization. cause: %v", err) @@ -287,7 +287,7 @@ func TestCheckpoint_Shutdown_SaveError(t *testing.T) { expectedSQLRegexString := fmt.Sprintf(`REPLACE INTO %s \(namespace, shard_id, sequence_number\) VALUES \(\?, \?, \?\)`, tableName) mock.ExpectExec(expectedSQLRegexString).WithArgs(namespace, shardID, expectedSequenceNumber).WillReturnError(errors.New("an error")) - err = ck.Set(streamName, shardID, expectedSequenceNumber) + err = ck.SetCheckpoint(streamName, shardID, expectedSequenceNumber) if err != nil { t.Fatalf("unable to set checkpoint for data initialization. cause: %v", err) diff --git a/checkpoint/postgres/postgres_test.go b/checkpoint/postgres/postgres_test.go index c6b3bab..640da72 100644 --- a/checkpoint/postgres/postgres_test.go +++ b/checkpoint/postgres/postgres_test.go @@ -72,7 +72,7 @@ func TestNew_WithMaxIntervalOption(t *testing.T) { ck.Shutdown() } -func TestCheckpoint_Get(t *testing.T) { +func TestCheckpoint_GetCheckpoint(t *testing.T) { appName := "streamConsumer" tableName := "checkpoint" connString := "UserID=root;Password=myPassword;Host=localhost;Port=5432;Database=myDataBase;" @@ -98,7 +98,7 @@ func TestCheckpoint_Get(t *testing.T) { tableName) mock.ExpectQuery(expectedSQLRegexString).WithArgs(namespace, shardID).WillReturnRows(expectedRows) - gotSequenceNumber, err := ck.Get(streamName, shardID) + gotSequenceNumber, err := ck.GetCheckpoint(streamName, shardID) if gotSequenceNumber != expectedSequenceNumber { t.Errorf("expected sequence number equals %v, but got %v", expectedSequenceNumber, gotSequenceNumber) @@ -134,7 +134,7 @@ func TestCheckpoint_Get_NoRows(t *testing.T) { tableName) mock.ExpectQuery(expectedSQLRegexString).WithArgs(namespace, shardID).WillReturnError(sql.ErrNoRows) - gotSequenceNumber, err := ck.Get(streamName, shardID) + gotSequenceNumber, err := ck.GetCheckpoint(streamName, shardID) if gotSequenceNumber != "" { t.Errorf("expected sequence number equals empty, but got %v", gotSequenceNumber) @@ -170,7 +170,7 @@ func TestCheckpoint_Get_QueryError(t *testing.T) { tableName) mock.ExpectQuery(expectedSQLRegexString).WithArgs(namespace, shardID).WillReturnError(errors.New("an error")) - gotSequenceNumber, err := ck.Get(streamName, shardID) + gotSequenceNumber, err := ck.GetCheckpoint(streamName, shardID) if gotSequenceNumber != "" { t.Errorf("expected sequence number equals empty, but got %v", gotSequenceNumber) @@ -184,7 +184,7 @@ func TestCheckpoint_Get_QueryError(t *testing.T) { ck.Shutdown() } -func TestCheckpoint_Set(t *testing.T) { +func TestCheckpoint_SetCheckpoint(t *testing.T) { appName := "streamConsumer" tableName := "checkpoint" connString := "UserID=root;Password=myPassword;Host=localhost;Port=5432;Database=myDataBase;" @@ -197,7 +197,7 @@ func TestCheckpoint_Set(t *testing.T) { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } - err = ck.Set(streamName, shardID, expectedSequenceNumber) + err = ck.SetCheckpoint(streamName, shardID, expectedSequenceNumber) if err != nil { t.Errorf("expected error equals nil, but got %v", err) @@ -218,7 +218,7 @@ func TestCheckpoint_Set_SequenceNumberEmpty(t *testing.T) { t.Fatalf("error occurred during the checkpoint creation. cause: %v", err) } - err = ck.Set(streamName, shardID, expectedSequenceNumber) + err = ck.SetCheckpoint(streamName, shardID, expectedSequenceNumber) if err == nil { t.Errorf("expected error equals not nil, but got %v", err) @@ -249,7 +249,7 @@ func TestCheckpoint_Shutdown(t *testing.T) { result := sqlmock.NewResult(0, 1) mock.ExpectExec(expectedSQLRegexString).WithArgs(namespace, shardID, expectedSequenceNumber).WillReturnResult(result) - err = ck.Set(streamName, shardID, expectedSequenceNumber) + err = ck.SetCheckpoint(streamName, shardID, expectedSequenceNumber) if err != nil { t.Fatalf("unable to set checkpoint for data initialization. cause: %v", err) @@ -287,7 +287,7 @@ func TestCheckpoint_Shutdown_SaveError(t *testing.T) { expectedSQLRegexString := fmt.Sprintf(`INSERT INTO %s \(namespace, shard_id, sequence_number\) VALUES\(\$1, \$2, \$3\) ON CONFLICT \(namespace, shard_id\) DO UPDATE SET sequence_number= \$3;`, tableName) mock.ExpectExec(expectedSQLRegexString).WithArgs(namespace, shardID, expectedSequenceNumber).WillReturnError(errors.New("an error")) - err = ck.Set(streamName, shardID, expectedSequenceNumber) + err = ck.SetCheckpoint(streamName, shardID, expectedSequenceNumber) if err != nil { t.Fatalf("unable to set checkpoint for data initialization. cause: %v", err) diff --git a/checkpoint/redis/redis_test.go b/checkpoint/redis/redis_test.go index 5c0d02d..0d23a70 100644 --- a/checkpoint/redis/redis_test.go +++ b/checkpoint/redis/redis_test.go @@ -12,10 +12,10 @@ func Test_CheckpointLifecycle(t *testing.T) { } // set - c.Set("streamName", "shardID", "testSeqNum") + c.SetCheckpoint("streamName", "shardID", "testSeqNum") // get - val, err := c.Get("streamName", "shardID") + val, err := c.GetCheckpoint("streamName", "shardID") if err != nil { t.Fatalf("get checkpoint error: %v", err) } @@ -30,7 +30,7 @@ func Test_SetEmptySeqNum(t *testing.T) { t.Fatalf("new checkpoint error: %v", err) } - err = c.Set("streamName", "shardID", "") + err = c.SetCheckpoint("streamName", "shardID", "") if err == nil { t.Fatalf("should not allow empty sequence number") } diff --git a/consumer_test.go b/consumer_test.go index caaa04b..2f792b0 100644 --- a/consumer_test.go +++ b/consumer_test.go @@ -90,7 +90,7 @@ func TestScan(t *testing.T) { t.Errorf("counter error expected %d, got %d", 2, val) } - val, err := cp.Get("myStreamName", "myShard") + val, err := cp.GetCheckpoint("myStreamName", "myShard") if err != nil && val != "lastSeqNum" { t.Errorf("checkout error expected %s, got %s", "lastSeqNum", val) } @@ -156,7 +156,7 @@ func TestScanShard(t *testing.T) { } // sets checkpoint - val, err := cp.Get("myStreamName", "myShard") + val, err := cp.GetCheckpoint("myStreamName", "myShard") if err != nil && val != "lastSeqNum" { t.Fatalf("checkout error expected %s, got %s", "lastSeqNum", val) } @@ -240,7 +240,7 @@ func TestScanShard_SkipCheckpoint(t *testing.T) { t.Fatalf("scan shard error: %v", err) } - val, err := cp.Get("myStreamName", "myShard") + val, err := cp.GetCheckpoint("myStreamName", "myShard") if err != nil && val != "firstSeqNum" { t.Fatalf("checkout error expected %s, got %s", "firstSeqNum", val) } @@ -301,7 +301,7 @@ type fakeCheckpoint struct { mu sync.Mutex } -func (fc *fakeCheckpoint) Set(streamName, shardID, sequenceNumber string) error { +func (fc *fakeCheckpoint) SetCheckpoint(streamName, shardID, sequenceNumber string) error { fc.mu.Lock() defer fc.mu.Unlock() @@ -310,7 +310,7 @@ func (fc *fakeCheckpoint) Set(streamName, shardID, sequenceNumber string) error return nil } -func (fc *fakeCheckpoint) Get(streamName, shardID string) (string, error) { +func (fc *fakeCheckpoint) GetCheckpoint(streamName, shardID string) (string, error) { fc.mu.Lock() defer fc.mu.Unlock()