From d53aa02c0f6cc0b153d227167fcf3b5c74e12d3a Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Fri, 11 May 2018 07:53:17 +0300 Subject: Add test for DeleteSession() and fix potential bug in roomlist CheckTag() --- config/session_test.go | 25 +++++++++++++++++++++++++ ui/room-list.go | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/config/session_test.go b/config/session_test.go index 8b8bfff..5a7558b 100644 --- a/config/session_test.go +++ b/config/session_test.go @@ -136,3 +136,28 @@ func TestSession_PutRoom(t *testing.T) { assert.Equal(t, "foobar", reloadedRoom.PrevBatch, "%v %v", room, reloadedRoom) assert.True(t, reloadedRoom.HasLeft, "%v %v", room, reloadedRoom) } + +func TestConfig_DeleteSession(t *testing.T) { + defer os.RemoveAll("/tmp/gomuks-test-12") + + cfg := config.NewConfig("/tmp/gomuks-test-12", "/tmp/gomuks-test-12") + cfg.Load() + cfg.LoadSession("@tulir:maunium.net") + cfg.Session.SaveNextBatch("@tulir:maunium.net", "foobar") + cfg.Session.SaveFilterID("@tulir:maunium.net", "1234") + + cfg.DeleteSession() + + assert.Nil(t, cfg.Session) + + sessFile, err := os.Stat("/tmp/gomuks-test-12/@tulir:maunium.net.session") + assert.Nil(t, sessFile) + assert.True(t, os.IsNotExist(err)) + + mediaDir, err := os.Stat("/tmp/gomuks-test-12/media") + assert.True(t, mediaDir.IsDir()) + assert.Nil(t, err) + historyDir, err := os.Stat("/tmp/gomuks-test-12/history") + assert.True(t, historyDir.IsDir()) + assert.Nil(t, err) +} diff --git a/ui/room-list.go b/ui/room-list.go index 3ef64c3..8096c8d 100644 --- a/ui/room-list.go +++ b/ui/room-list.go @@ -274,7 +274,7 @@ func (list *RoomList) CheckTag(tag string) { tagRoomList, ok := list.items[tag] if ok && tagRoomList.IsEmpty() { - delete(list.items, tag) + //delete(list.items, tag) ok = false } -- cgit v1.2.3