configfile: use map[flagIota] for feature flags

This should make things saner and more extensible. It prepares
the infrastructure for "required feature flags" that will be used
to deprecate old gocryptfs version.

1 files changed, 16 insertions, 7 deletions

diff --git a/internal/configfile/config_test.go b/internal/configfile/config_test.go
index c83c4bd..d0540c3 100644
--- a/internal/configfile/config_test.go
+++ b/internal/configfile/config_test.go
@@ -72,14 +72,23 @@ func TestCreateConfFile(t *testing.T) {
 }
 
 func TestIsFeatureFlagKnown(t *testing.T) {
-	var cf ConfFile
-	if !cf.isFeatureFlagKnown(FlagDirIV) {
-		t.Errorf("This flag should be known")
+	// Test a few hardcoded values
+	testKnownFlags := []string{"DirIV", "PlaintextNames", "EMENames", "GCMIV128", "LongNames"}
+	// And also everything in knownFlags (yes, it is likely that we end up with
+	// some duplicates. Does not matter.)
+	for _, f := range knownFlags {
+		testKnownFlags = append(testKnownFlags, f)
 	}
-	if !cf.isFeatureFlagKnown(FlagPlaintextNames) {
-		t.Errorf("This flag should be known")
+
+	var cf ConfFile
+	for _, f := range testKnownFlags {
+		if !cf.isFeatureFlagKnown(f) {
+			t.Errorf("flag %q should be known", f)
+		}
 	}
-	if cf.isFeatureFlagKnown("StrangeFeatureFlag") {
-		t.Errorf("This flag should be NOT known")
+
+	f := "StrangeFeatureFlag"
+	if cf.isFeatureFlagKnown(f) {
+		t.Errorf("flag %q should be NOT known", f)
 	}
 }