From 94df91fd4430ffd066490a1c2ce1bb72acd67600 Mon Sep 17 00:00:00 2001 From: Pavel Safronov Date: Tue, 7 Feb 2023 17:53:12 -0800 Subject: [PATCH] Update tests to handle the new return type. --- go/store/nbs/aws_table_persister_test.go | 6 +++--- go/store/nbs/file_table_persister_test.go | 6 +++--- go/store/nbs/mem_table_test.go | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/go/store/nbs/aws_table_persister_test.go b/go/store/nbs/aws_table_persister_test.go index 7cdc10b916..4151157455 100644 --- a/go/store/nbs/aws_table_persister_test.go +++ b/go/store/nbs/aws_table_persister_test.go @@ -45,7 +45,7 @@ func TestAWSTablePersisterPersist(t *testing.T) { mt := newMemTable(testMemTableSize) for _, c := range testChunks { - assert.True(t, mt.addChunk(computeAddr(c), c)) + assert.Equal(t, mt.addChunk(computeAddr(c), c), chunkAdded) } t.Run("PersistToS3", func(t *testing.T) { @@ -89,8 +89,8 @@ func TestAWSTablePersisterPersist(t *testing.T) { existingTable := newMemTable(testMemTableSize) for _, c := range testChunks { - assert.True(mt.addChunk(computeAddr(c), c)) - assert.True(existingTable.addChunk(computeAddr(c), c)) + assert.Equal(mt.addChunk(computeAddr(c), c), chunkAdded) + assert.Equal(existingTable.addChunk(computeAddr(c), c), chunkAdded) } s3svc, ddb := makeFakeS3(t), makeFakeDTS(makeFakeDDB(t), nil) diff --git a/go/store/nbs/file_table_persister_test.go b/go/store/nbs/file_table_persister_test.go index cb5cff1081..a9a489387d 100644 --- a/go/store/nbs/file_table_persister_test.go +++ b/go/store/nbs/file_table_persister_test.go @@ -139,7 +139,7 @@ func TestFSTablePersisterPersist(t *testing.T) { func persistTableData(p tablePersister, chunx ...[]byte) (src chunkSource, err error) { mt := newMemTable(testMemTableSize) for _, c := range chunx { - if !mt.addChunk(computeAddr(c), c) { + if mt.addChunk(computeAddr(c), c) == chunkNotAdded { return nil, fmt.Errorf("memTable too full to add %s", computeAddr(c)) } } @@ -152,8 +152,8 @@ func TestFSTablePersisterPersistNoData(t *testing.T) { existingTable := newMemTable(testMemTableSize) for _, c := range testChunks { - assert.True(mt.addChunk(computeAddr(c), c)) - assert.True(existingTable.addChunk(computeAddr(c), c)) + assert.Equal(mt.addChunk(computeAddr(c), c), chunkAdded) + assert.Equal(existingTable.addChunk(computeAddr(c), c), chunkAdded) } dir := makeTempDir(t) diff --git a/go/store/nbs/mem_table_test.go b/go/store/nbs/mem_table_test.go index f8a615fc51..acdfff9e8e 100644 --- a/go/store/nbs/mem_table_test.go +++ b/go/store/nbs/mem_table_test.go @@ -90,7 +90,7 @@ func TestMemTableAddHasGetChunk(t *testing.T) { } for _, c := range chunks { - assert.True(mt.addChunk(computeAddr(c), c)) + assert.Equal(mt.addChunk(computeAddr(c), c), chunkAdded) } assertChunksInReader(chunks, mt, assert) @@ -115,9 +115,9 @@ func TestMemTableAddOverflowChunk(t *testing.T) { { bigAddr := computeAddr(big) mt := newMemTable(memTableSize) - assert.True(mt.addChunk(bigAddr, big)) + assert.Equal(mt.addChunk(bigAddr, big), chunkAdded) assert.True(mt.has(bigAddr)) - assert.False(mt.addChunk(computeAddr(little), little)) + assert.Equal(mt.addChunk(computeAddr(little), little), chunkNotAdded) assert.False(mt.has(computeAddr(little))) } @@ -125,12 +125,12 @@ func TestMemTableAddOverflowChunk(t *testing.T) { big := big[:memTableSize-1] bigAddr := computeAddr(big) mt := newMemTable(memTableSize) - assert.True(mt.addChunk(bigAddr, big)) + assert.Equal(mt.addChunk(bigAddr, big), chunkAdded) assert.True(mt.has(bigAddr)) - assert.True(mt.addChunk(computeAddr(little), little)) + assert.Equal(mt.addChunk(computeAddr(little), little), chunkAdded) assert.True(mt.has(computeAddr(little))) other := []byte("o") - assert.False(mt.addChunk(computeAddr(other), other)) + assert.Equal(mt.addChunk(computeAddr(other), other), chunkNotAdded) assert.False(mt.has(computeAddr(other))) } } @@ -147,7 +147,7 @@ func TestMemTableWrite(t *testing.T) { } for _, c := range chunks { - assert.True(mt.addChunk(computeAddr(c), c)) + assert.Equal(mt.addChunk(computeAddr(c), c), chunkAdded) } td1, _, err := buildTable(chunks[1:2]) @@ -207,7 +207,7 @@ func TestMemTableSnappyWriteOutOfLine(t *testing.T) { } for _, c := range chunks { - assert.True(mt.addChunk(computeAddr(c), c)) + assert.Equal(mt.addChunk(computeAddr(c), c), chunkAdded) } mt.snapper = &outOfLineSnappy{[]bool{false, true, false}} // chunks[1] should trigger a panic