Updated a bunch of tests

Author: britzl

ludobits/m/settings.lua

@@ -2,13 +2,37 @@ local savetable = require "ludobits.m.io.savetable"
 
 local M = {}
 
-local settings = savetable.open("__settings").load() or {}
+local settings_filename
+local settings
 
---- Save settings to disk. The settings will be saved to a file named __settings
-function M.save()
-	savetable.open("__settings").save(settings)
+--- Load settings from disk
+-- @param filename File to load from or nil for the default file ("__settings")
+function M.load(filename)
+	settings_filename = filename or "__settings"
+	settings = savetable.open(settings_filename).load() or {}
 end
 
+--- Get the filename of the currently loaded settings file
+-- @return Filename
+function M.filename()
+	return settings_filename
+end
+
+--- Check if the settings are empty
+-- @return true if empty
+function M.is_empty()
+	return next(settings) == nil
+end
+
+--- Save settings to disk
+-- @param filename File to save to or nil for the currently loaded file
+function M.save(filename)
+	settings_filename = filename or settings_filename
+	savetable.open(settings_filename).save(settings)
+end
+
+M.load()
+
 local mt = {}
 function mt.__index(t, k)
 	return settings[k]

test/test_broadcast.lua

@@ -1,10 +1,13 @@
 local mock = require "deftest.mock.mock"
+local unload = require "deftest.util.unload"
 
 return function()
-	local broadcast = require "ludobits.m.broadcast"
+	local broadcast
 
 	describe("broadcast", function()
 		before(function()
+			unload.unload("ludobits.")
+			broadcast = require "ludobits.m.broadcast"
 			mock.mock(msg)
 			msg.post.replace(function() end)
 		end)

test/test_file.lua

@@ -1,12 +1,15 @@
 local mock = require "deftest.mock.mock"
 local mock_fs = require "deftest.mock.fs"
+local unload = require "deftest.util.unload"
 
 return function()
-	local file = require "ludobits.m.io.file"
+	local file
 
 	describe("file", function()
 		before(function()
+			unload.unload("ludobits.")
 			mock_fs.mock()
+			file = require "ludobits.m.io.file"
 		end)
 
 		after(function()

test/test_flow.lua

@@ -1,4 +1,5 @@
 local mock = require "deftest.mock.mock"
+local unload = require "deftest.util.unload"
 
 return function()
 	local flow
@@ -9,6 +10,7 @@ return function()
 
 	describe("flow", function()
 		before(function()
+			unload.unload("ludobits.")
 			flow = require "ludobits.m.flow"
 			mock.mock(msg)
 			msg.post.replace(function() end)

test/test_listener.lua

@@ -1,10 +1,12 @@
 local mock = require "deftest.mock.mock"
+local unload = require "deftest.util.unload"
 
 return function()
-	local listener = nil
+	local listener
 
 	describe("listener", function()
 		before(function()
+			unload.unload("ludobits.")
 			listener = require "ludobits.m.listener"
 			mock.mock(msg)
 			msg.post.replace(function() end)

test/test_savefile.lua

@@ -1,12 +1,15 @@
 local mock = require "deftest.mock.mock"
 local mock_fs = require "deftest.mock.fs"
+local unload = require "deftest.util.unload"
 
 return function()
-	local savefile = require "ludobits.m.io.savefile"
+	local savefile
 
 	describe("savefile", function()
 		before(function()
+			unload.unload("ludobits.")
 			mock_fs.mock()
+			savefile = require "ludobits.m.io.savefile"
 		end)
 
 		after(function()

test/test_savetable.lua

@@ -1,12 +1,15 @@
 local mock = require "deftest.mock.mock"
 local mock_fs = require "deftest.mock.fs"
+local unload = require "deftest.util.unload"
 
 return function()
-	local savetable = require "ludobits.m.io.savetable"
+	local savetable
 
 	describe("savetable", function()
 		before(function()
+			unload.unload("ludobits.")
 			mock_fs.mock()
+			savetable = require "ludobits.m.io.savetable"
 		end)
 
 		after(function()

test/test_settings.lua

@@ -1,20 +1,23 @@
 local mock = require "deftest.mock.mock"
 local mock_fs = require "deftest.mock.fs"
+local unload = require "deftest.util.unload"
 
 return function()
-	local settings = require "ludobits.m.settings"
+	local settings
 
 	describe("settings", function()
 		before(function()
+			unload.unload("ludobits.")
 			mock_fs.mock()
+			settings = require "ludobits.m.settings"
 		end)
 
 		after(function()
 			mock_fs.unmock()
 		end)
 
 		it("should start empty", function()
-			assert(settings.foo == nil)
+			assert(settings.is_empty())
 		end)
 
 		it("should be possible to set and get values", function()
@@ -24,6 +27,7 @@ return function()
 			settings.boo = "car"
 			assert(settings.foo == "bar")
 			assert(settings.boo == "car")
+			assert(not settings.is_empty())
 		end)
 
 		it("should be possible to set, save and later load values", function()
@@ -39,5 +43,31 @@ return function()
 			assert(newsettings.foo == "bar")
 			assert(newsettings.boo == "car")
 		end)
+		
+		it("should be possible to load and save to multiple files", function()
+			-- set and save to default file
+			assert(settings.is_empty())
+			settings.foo = "foodefault"
+			settings.save()
+
+			-- set and save to file1
+			settings.load("file1")
+			assert(settings.filename() == "file1")
+			assert(settings.is_empty())
+			settings.foo = "foofile1"
+			settings.save()
+
+			-- load default file again and save it to a file2
+			settings.load()
+			assert(settings.foo == "foodefault")
+			settings.foo = "foofile2"
+			settings.save("file2")
+			assert(settings.filename() == "file2")			
+
+			-- load file1 and make sure it is unchanged
+			settings.load("file1")
+			assert(settings.filename() == "file1")
+			assert(settings.foo == "foofile1")
+		end)
 	end)
 end