wip much better testing

conf.v

@@ -4,25 +4,16 @@ import os
 import toml
 import datatypes { Set }
 
-[params]
-pub struct LoadConfig {
-	prefix       string
-	file_suffix  string = '_FILE'
-	default_path string
-	// Allows overwriting
-	env map[string]string = os.environ()
-}
-
 // get_env_var tries to read the contents of the given environment variable. It
 // looks for either `${env.prefix}${field_name.to_upper()}` or
 // `${env.prefix}${field_name.to_upper()}${env.file_suffix}`, returning the
 // contents of the file instead if the latter. If both or neither exist, the
 // function returns an error.
-fn (ld LoadConfig) get_env_var(field_name string) !string {
+fn get_env_var(prefix string, field_name string, file_suffix string) !string {
-	env_var_name := '$ld.prefix$field_name.to_upper()'
+	env_var_name := '$prefix$field_name.to_upper()'
-	env_file_name := '$ld.prefix$field_name.to_upper()$ld.file_suffix'
+	env_file_name := '$prefix$field_name.to_upper()$file_suffix'
-	env_var := ld.env[env_var_name] or { '' }
+	env_var := os.getenv(env_var_name)
-	env_file := ld.env[env_file_name] or { '' }
+	env_file := os.getenv(env_file_name)
 
 	// If both are missing, we return an empty string
 	if env_var == '' && env_file == '' {
@@ -48,11 +39,18 @@ fn (ld LoadConfig) get_env_var(field_name string) !string {
 	}
 }
 
+[params]
+pub struct LoadConfig {
+	prefix       string
+	file_suffix  string = '_FILE'
+	default_path string
+}
+
 // load<T> attempts to create an object of type T from the given path to a toml
 // file & environment variables. For each field, it will select either a value
 // given from an environment variable, a value defined in the config file or a
 // configured default if present, in that order.
-pub fn load<T>(ld LoadConfig) !T {
+pub fn load<T>(conf LoadConfig) !T {
 	mut res := T{}
 
 	// This array allows us to determine later whether the variable is actually
@@ -60,7 +58,7 @@ pub fn load<T>(ld LoadConfig) !T {
 	mut has_value := Set<string>{}
 
 	// Later, this could be read from an env var as well.
-	path := ld.default_path
+	path := conf.default_path
 
 	if os.exists(path) {
 		// We don't use reflect here because reflect also sets any fields not
@@ -86,7 +84,7 @@ pub fn load<T>(ld LoadConfig) !T {
 	}
 
 	$for field in T.fields {
-		env_value := ld.get_env_var(field.name)!
+		env_value := get_env_var(conf.prefix, field.name, conf.file_suffix)!
 
 		// The value of an env var will always take precedence over the toml
 		// file.
@@ -125,5 +123,6 @@ pub fn load<T>(ld LoadConfig) !T {
 			return error("Missing config variable '$field.name' with no provided default. Either add it to the config file or provide it using an environment variable.")
 		}
 	}
+
 	return res
 }

int_test.v

@@ -0,0 +1 @@
+

string_test.v

@@ -8,14 +8,6 @@ struct SingleConfDefault {
 	some_string string = 'default'
 }
 
-const env = {
-	'SOME_STRING': 'env'
-}
-
-const prefix_env = {
-	'TEST_SOME_STRING': 'env'
-}
-
 fn test_string_present_no_default() {
 	conf := load<SingleConf>(default_path: 'test/string.toml')!
 	assert conf == SingleConf{
@@ -23,35 +15,11 @@ fn test_string_present_no_default() {
 	}
 }
 
-fn test_string_present_no_default_env() {
-	conf := load<SingleConf>(default_path: 'test/string.toml', env: .env)!
-	assert conf == SingleConf{
-		some_string: 'env'
-	}
-
-	conf2 := load<SingleConf>(default_path: 'test/string.toml', env: .prefix_env, prefix: 'TEST_')!
-	assert conf2 == SingleConf{
-		some_string: 'env'
-	}
-}
-
 fn test_string_absent_no_default() {
 	conf := load<SingleConf>(default_path: 'test/empty.toml') or { return }
 	assert false
 }
 
-fn test_string_absent_no_default_env() {
-	conf := load<SingleConf>(default_path: 'test/string.toml', env: .env)!
-	assert conf == SingleConf{
-		some_string: 'env'
-	}
-
-	conf2 := load<SingleConf>(default_path: 'test/string.toml', env: .prefix_env, prefix: 'TEST_')!
-	assert conf2 == SingleConf{
-		some_string: 'env'
-	}
-}
-
 fn test_string_present_default() {
 	conf := load<SingleConfDefault>(default_path: 'test/string.toml')!
 	assert conf == SingleConfDefault{
@@ -59,41 +27,9 @@ fn test_string_present_default() {
 	}
 }
 
-fn test_string_present_default_env() {
-	conf := load<SingleConfDefault>(default_path: 'test/string.toml', env: .env)!
-	assert conf == SingleConfDefault{
-		some_string: 'env'
-	}
-
-	conf2 := load<SingleConfDefault>(
-		default_path: 'test/string.toml'
-		env: .prefix_env
-		prefix: 'TEST_'
-	)!
-	assert conf2 == SingleConfDefault{
-		some_string: 'env'
-	}
-}
-
 fn test_string_absent_default() {
 	conf := load<SingleConfDefault>(default_path: 'test/empty.toml')!
 	assert conf == SingleConfDefault{
 		some_string: 'default'
 	}
 }
-
-fn test_string_absent_default_env() {
-	conf := load<SingleConfDefault>(default_path: 'test/empty.toml', env: .env)!
-	assert conf == SingleConfDefault{
-		some_string: 'env'
-	}
-
-	conf2 := load<SingleConfDefault>(
-		default_path: 'test/empty.toml'
-		env: .prefix_env
-		prefix: 'TEST_'
-	)!
-	assert conf2 == SingleConfDefault{
-		some_string: 'env'
-	}
-}