Move twofish example to test files

tobischo · Apr 19, 2024 · 299869c · 299869c
1 parent c50c154
commit 299869c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 29 deletions.
diff --git a/decoder_test.go b/decoder_test.go
@@ -11,13 +11,15 @@ func TestDecodeFile(t *testing.T) {
 		title          string
 		dbFilePath     string
 		newCredentials func() (*DBCredentials, error)
+		testContent    bool
 	}{
 		{
 			title:      "Database Format v3.1, password credentials",
 			dbFilePath: "tests/kdbx3/example.kdbx",
 			newCredentials: func() (*DBCredentials, error) {
 				return NewPasswordCredentials("abcdefg12345678"), nil
 			},
+			testContent: true,
 		},
 		{
 			title:      "Database Format v3.1, password+key credentials",
@@ -28,6 +30,7 @@ func TestDecodeFile(t *testing.T) {
 					"tests/kdbx3/example-key.key",
 				)
 			},
+			testContent: true,
 		},
 		{
 			title:      "Database Format v3.1, password+keydata credentials",
@@ -48,13 +51,15 @@ func TestDecodeFile(t *testing.T) {
 					keyData,
 				)
 			},
+			testContent: true,
 		},
 		{
 			title:      "Database Format v4, password credentials",
 			dbFilePath: "tests/kdbx4/example.kdbx",
 			newCredentials: func() (*DBCredentials, error) {
 				return NewPasswordCredentials("abcdefg12345678"), nil
 			},
+			testContent: true,
 		},
 		{
 			title:      "Database Format v4, password+key credentials",
@@ -65,6 +70,7 @@ func TestDecodeFile(t *testing.T) {
 					"tests/kdbx4/example-key.key",
 				)
 			},
+			testContent: true,
 		},
 		{
 			title:      "Database Format v4, password+keydata credentials",
@@ -85,20 +91,23 @@ func TestDecodeFile(t *testing.T) {
 					keyData,
 				)
 			},
+			testContent: true,
 		},
 		{
 			title:      "Database Format v4, without compression, password credentials",
 			dbFilePath: "tests/kdbx4/example-nocompression.kdbx",
 			newCredentials: func() (*DBCredentials, error) {
 				return NewPasswordCredentials("abcdefg12345678"), nil
 			},
+			testContent: true,
 		},
 		{
 			title:      "Database Format v4, chacha encryption, password credentials",
 			dbFilePath: "tests/kdbx4/example-chacha.kdbx",
 			newCredentials: func() (*DBCredentials, error) {
 				return NewPasswordCredentials("abcdefg12345678"), nil
 			},
+			testContent: true,
 		},
 		{
 			title: "Database Format v4, chacha encryption, " +
@@ -107,6 +116,15 @@ func TestDecodeFile(t *testing.T) {
 			newCredentials: func() (*DBCredentials, error) {
 				return NewPasswordCredentials("abcdefg12345678"), nil
 			},
+			testContent: true,
+		},
+		{
+			title:      "Database Format v4, twofish encryption, password credentials",
+			dbFilePath: "tests/kdbx4/example-twofish.kdbx",
+			newCredentials: func() (*DBCredentials, error) {
+				return NewPasswordCredentials("test1234test"), nil
+			},
+			testContent: false,
 		},
 	}
 
@@ -131,6 +149,10 @@ func TestDecodeFile(t *testing.T) {
 				t.Fatalf("Failed to decode file: %s", err)
 			}
 
+			if !c.testContent {
+				return
+			}
+
 			// Test binary file matching
 			binary := db.FindBinary(db.Content.Root.Groups[0].Groups[1].Entries[0].Binaries[0].Value.ID)
 			if binary == nil {

diff --git a/examples/twofish/example.go b/examples/twofish/example.go
diff --git a/examples/twofish/example.kdbx → tests/kdbx4/example-twofish.kdbx b/examples/twofish/example.kdbx → tests/kdbx4/example-twofish.kdbx