From c89e06bd6fab16096cdf778b0b949a0b32e31607 Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Mon, 9 May 2022 14:17:36 +0200 Subject: [PATCH] Add tests for duplicate entries --- .../storage/tables/event_state_keys_table_test.go | 9 ++++++--- roomserver/storage/tables/event_types_table_test.go | 12 +++++++----- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/roomserver/storage/tables/event_state_keys_table_test.go b/roomserver/storage/tables/event_state_keys_table_test.go index c432ec788..a856fe551 100644 --- a/roomserver/storage/tables/event_state_keys_table_test.go +++ b/roomserver/storage/tables/event_state_keys_table_test.go @@ -48,14 +48,17 @@ func Test_EventStateKeysTable(t *testing.T) { // create some dummy data for i := 0; i < 10; i++ { stateKey := fmt.Sprintf("@user%d:localhost", i) - stateKeyNID, err = tab.InsertEventStateKeyNID( - ctx, nil, stateKey, - ) + stateKeyNID, err = tab.InsertEventStateKeyNID(ctx, nil, stateKey) assert.NoError(t, err) gotEventStateKey, err = tab.SelectEventStateKeyNID(ctx, nil, stateKey) assert.NoError(t, err) assert.Equal(t, stateKeyNID, gotEventStateKey) } + // This should fail, since @user0:localhost already exists + stateKey := fmt.Sprintf("@user%d:localhost", 0) + _, err = tab.InsertEventStateKeyNID(ctx, nil, stateKey) + assert.Error(t, err) + stateKeyNIDsMap, err := tab.BulkSelectEventStateKeyNID(ctx, nil, []string{"@user0:localhost", "@user1:localhost"}) assert.NoError(t, err) wantStateKeyNIDs := make([]types.EventStateKeyNID, 0, len(stateKeyNIDsMap)) diff --git a/roomserver/storage/tables/event_types_table_test.go b/roomserver/storage/tables/event_types_table_test.go index 8ad41c14e..30f1bf31c 100644 --- a/roomserver/storage/tables/event_types_table_test.go +++ b/roomserver/storage/tables/event_types_table_test.go @@ -49,16 +49,18 @@ func Test_EventTypesTable(t *testing.T) { eventTypeMap := make(map[string]types.EventTypeNID) for i := 0; i < 10; i++ { eventType := fmt.Sprintf("dummyEventType%d", i) - if eventTypeNID, err = tab.InsertEventTypeNID( - ctx, nil, eventType, - ); err != nil { - t.Fatalf("unable to insert eventJSON: %s", err) - } + eventTypeNID, err = tab.InsertEventTypeNID(ctx, nil, eventType) + assert.NoError(t, err) eventTypeMap[eventType] = eventTypeNID gotEventTypeNID, err = tab.SelectEventTypeNID(ctx, nil, eventType) assert.NoError(t, err) assert.Equal(t, eventTypeNID, gotEventTypeNID) } + // This should fail, since the dummyEventType0 already exists + eventType := fmt.Sprintf("dummyEventType%d", 0) + _, err = tab.InsertEventTypeNID(ctx, nil, eventType) + assert.Error(t, err) + eventTypeNIDs, err := tab.BulkSelectEventTypeNID(ctx, nil, []string{"dummyEventType0", "dummyEventType3"}) assert.NoError(t, err) // verify that BulkSelectEventTypeNID and InsertEventTypeNID return the same values