Update test valid dictionaries (#1688)

* Update test data for valid-dictionary1

* Use valid-dictionary1 instead of valid-dictionary2

* Update test data

* Remove test of valid-dictionary2

* Remove valid-dictionary2 data

15 files changed, 54 insertions, 194 deletions

diff --git a/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json b/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
index 264f94c1..e1e81fc4 100644
--- a/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/kanji_bank_1.json
@@ -3,40 +3,40 @@
         "打",
         "ダ ダアス",
         "う.つ う.ち- ぶ.つ",
-        "ktag1 ktag2",
+        "K1 K2",
         [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
+            "utsu meaning 1",
+            "utsu meaning 2",
+            "utsu meaning 3",
+            "utsu meaning 4",
+            "utsu meaning 5"
         ],
         {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
+            "kstat1": "kanji stat 1 value",
+            "kstat2": "kanji stat 2 value",
+            "kstat3": "kanji stat 3 value",
+            "kstat4": "kanji stat 4 value",
+            "kstat5": "kanji stat 5 value"
         }
     ],
     [
         "込",
         "",
         "-こ.む こ.む こ.み -こ.み こ.める",
-        "ktag1 ktag2",
+        "K1 K2",
         [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
+            "komu meaning 1",
+            "komu meaning 2",
+            "komu meaning 3",
+            "komu meaning 4",
+            "komu meaning 5"
         ],
         {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
+            "kstat1": "kanji stat 1 value",
+            "kstat2": "kanji stat 2 value",
+            "kstat3": "kanji stat 3 value",
+            "kstat4": "kanji stat 4 value",
+            "kstat5": "kanji stat 5 value"
         }
     ]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_1.json b/test/data/dictionaries/valid-dictionary1/tag_bank_1.json
index 109ad395..3cdc322e 100644
--- a/test/data/dictionaries/valid-dictionary1/tag_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/tag_bank_1.json
@@ -1,7 +1,8 @@
 [
-    ["tag1", "category1", 0, "tag1 notes", 0],
-    ["tag2", "category2", 0, "tag2 notes", 0],
-    ["tag3", "category3", 0, "tag3 notes", 0],
-    ["tag4", "category4", 0, "tag4 notes", 0],
-    ["tag5", "category5", 0, "tag5 notes", 0]
+    ["E1", "default", 0, "example tag 1", 0],
+    ["E2", "default", 0, "example tag 2", 0],
+    ["P", "popular", 0, "popular term", 0],
+    ["n", "partOfSpeech", 0, "noun", 0],
+    ["vt", "partOfSpeech", 0, "transitive verb", 0],
+    ["abbr", "default", 0, "abbreviation", 0]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_2.json b/test/data/dictionaries/valid-dictionary1/tag_bank_2.json
index 5e7936b3..34a9905d 100644
--- a/test/data/dictionaries/valid-dictionary1/tag_bank_2.json
+++ b/test/data/dictionaries/valid-dictionary1/tag_bank_2.json
@@ -1,9 +1,9 @@
 [
-    ["ktag1", "kcategory1", 0, "ktag1 notes", 0],
-    ["ktag2", "kcategory2", 0, "ktag2 notes", 0],
-    ["kstat1", "kcategory3", 0, "kstat1 notes", 0],
-    ["kstat2", "kcategory4", 0, "kstat2 notes", 0],
-    ["kstat3", "kcategory5", 0, "kstat3 notes", 0],
-    ["kstat4", "kcategory6", 0, "kstat4 notes", 0],
-    ["kstat5", "kcategory7", 0, "kstat5 notes", 0]
+    ["K1", "default", 0, "example kanji tag 1", 0],
+    ["K2", "default", 0, "example kanji tag 2", 0],
+    ["kstat1", "class", 0, "kanji stat 1", 0],
+    ["kstat2", "code", 0, "kanji stat 2", 0],
+    ["kstat3", "index", 0, "kanji stat 3", 0],
+    ["kstat4", "misc", 0, "kanji stat 4", 0],
+    ["kstat5", "misc", 0, "kanji stat 5", 0]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/tag_bank_3.json b/test/data/dictionaries/valid-dictionary1/tag_bank_3.json
index 572221fe..b5970584 100644
--- a/test/data/dictionaries/valid-dictionary1/tag_bank_3.json
+++ b/test/data/dictionaries/valid-dictionary1/tag_bank_3.json
@@ -1,4 +1,4 @@
 [
-    ["ptag1", "pcategory1", 0, "ptag1 notes", 0],
-    ["ptag2", "pcategory2", 0, "ptag2 notes", 0]
+    ["P1", "default", 0, "example pitch tag 1", 0],
+    ["P2", "default", 0, "example pitch tag 2", 0]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/term_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
index b86f6219..5094dd0f 100644
--- a/test/data/dictionaries/valid-dictionary1/term_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
@@ -1,35 +1,16 @@
 [
-    ["打", "だ", "tag1 tag2", "", 2, ["definition1a (打, だ)", "definition1b (打, だ)"], 1, "tag3 tag4 tag5"],
-    ["打", "ダース", "tag1 tag2", "", 1, ["definition1a (打, ダース)", "definition1b (打, ダース)"], 2, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 3, ["definition1a (打つ, うつ)", "definition1b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 4, ["definition2a (打つ, うつ)", "definition2b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 5, ["definition3a (打つ, うつ)", "definition3b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 6, ["definition4a (打つ, うつ)", "definition4b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 7, ["definition5a (打つ, うつ)", "definition5b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 8, ["definition6a (打つ, うつ)", "definition6b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 9, ["definition7a (打つ, うつ)", "definition7b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 10, ["definition8a (打つ, うつ)", "definition8b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 11, ["definition9a (打つ, うつ)", "definition9b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 12, ["definition10a (打つ, うつ)", "definition10b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 13, ["definition11a (打つ, うつ)", "definition11b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 14, ["definition12a (打つ, うつ)", "definition12b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 15, ["definition13a (打つ, うつ)", "definition13b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 16, ["definition14a (打つ, うつ)", "definition14b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 17, ["definition15a (打つ, うつ)", "definition15b (打つ, うつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 18, ["definition1a (打つ, ぶつ)", "definition1b (打つ, ぶつ)"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 19, ["definition2a (打つ, ぶつ)", "definition2b (打つ, ぶつ)"], 3, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 20, ["definition1a (打ち込む, うちこむ)", "definition1b (打ち込む, うちこむ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 21, ["definition2a (打ち込む, うちこむ)", "definition2b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 22, ["definition3a (打ち込む, うちこむ)", "definition3b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 23, ["definition4a (打ち込む, うちこむ)", "definition4b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 24, ["definition5a (打ち込む, うちこむ)", "definition5b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 25, ["definition6a (打ち込む, うちこむ)", "definition6b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 26, ["definition7a (打ち込む, うちこむ)", "definition7b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 27, ["definition8a (打ち込む, うちこむ)", "definition8b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 28, ["definition9a (打ち込む, うちこむ)", "definition9b (打ち込む, うちこむ)"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 29, ["definition1a (打ち込む, ぶちこむ)", "definition1b (打ち込む, ぶちこむ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 30, ["definition2a (打ち込む, ぶちこむ)", "definition2b (打ち込む, ぶちこむ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 31, ["definition3a (打ち込む, ぶちこむ)", "definition3b (打ち込む, ぶちこむ)"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 32, ["definition4a (打ち込む, ぶちこむ)", "definition4b (打ち込む, ぶちこむ)"], 4, "tag3 tag4 tag5"],
-    ["画像", "がぞう", "tag1 tag2", "", 33, ["definition1a (画像, がぞう)", {"type": "image", "path": "image.gif", "width": 350, "height": 350, "description": "An image", "pixelated": true}], 5, "tag3 tag4 tag5"]
+    ["打", "だ", "n", "n", 1, ["da definition 1", "da definition 2"], 1, "E1"],
+    ["打", "ダース", "n abbr", "n", 1, ["daasu definition 1", "daasu definition 2"], 2, "E1"],
+    ["打つ", "うつ", "vt", "v5", 10, ["utsu definition 1", "utsu definition 2"], 3, "P E1"],
+    ["打つ", "うつ", "vt", "v5", 1,  ["utsu definition 3", "utsu definition 4"], 3, "P E2"],
+    ["打つ", "ぶつ", "vt", "v5", 10, ["butsu definition 1", "butsu definition 2"], 3, "P E1"],
+    ["打つ", "ぶつ", "vt", "v5", 1,  ["butsu definition 3", "butsu definition 4"], 3, "P E2"],
+    ["打ち込む", "うちこむ", "vt", "v5", 10, ["uchikomu definition 1", "uchikomu definition 2"], 4, "P E1"],
+    ["打ち込む", "うちこむ", "vt", "v5", 1,  ["uchikomu definition 3", "uchikomu definition 4"], 4, "P E2"],
+    ["打ち込む", "ぶちこむ", "vt", "v5", 10, ["buchikomu definition 1", "buchikomu definition 2"], 4, "P E1"],
+    ["打ち込む", "ぶちこむ", "vt", "v5", 1,  ["buchikomu definition 3", "buchikomu definition 4"], 4, "P E2"],
+    ["画像", "がぞう", "n", "n", 1, ["gazou definition 1", {"type": "image", "path": "image.gif", "width": 350, "height": 350, "description": "gazou definition 2", "pixelated": true}], 5, "P E1"],
+    ["読む", "よむ", "vt", "v5", 100, ["to read"], 6, "P E1"],
+    ["強み", "つよみ", "n", "n", 90, ["strong point"], 7, "P E1"],
+    ["テキスト", "テキスト", "n", "n", 1, ["text definition 1", {"type": "text", "text": "text definition 2"}], 8, "P E1"]
 ]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
index 73d74e68..829f5eeb 100644
--- a/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/term_meta_bank_1.json
@@ -36,9 +36,9 @@
         {
             "reading": "おてまえ",
             "pitches": [
-                {"position": 2, "tags": ["ptag1"]},
-                {"position": 2, "tags": ["ptag2"]},
-                {"position": 0, "tags": ["ptag2"]}
+                {"position": 2, "tags": ["P1"]},
+                {"position": 2, "tags": ["P2"]},
+                {"position": 0, "tags": ["P2"]}
             ]
         }
     ]
diff --git a/test/data/dictionaries/valid-dictionary2/image.gif b/test/data/dictionaries/valid-dictionary2/image.gif
deleted file mode 100644
index f089d07c..00000000
--- a/test/data/dictionaries/valid-dictionary2/image.gif
+++ /dev/null
diff --git a/test/data/dictionaries/valid-dictionary2/index.json b/test/data/dictionaries/valid-dictionary2/index.json
deleted file mode 100644
index 6a957ad5..00000000
--- a/test/data/dictionaries/valid-dictionary2/index.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "title": "Test Dictionary 2",
-    "format": 3,
-    "revision": "test",
-    "sequenced": true
-}
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/kanji_bank_1.json b/test/data/dictionaries/valid-dictionary2/kanji_bank_1.json
deleted file mode 100644
index 264f94c1..00000000
--- a/test/data/dictionaries/valid-dictionary2/kanji_bank_1.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-    [
-        "打",
-        "ダ ダアス",
-        "う.つ う.ち- ぶ.つ",
-        "ktag1 ktag2",
-        [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
-        ],
-        {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
-        }
-    ],
-    [
-        "込",
-        "",
-        "-こ.む こ.む こ.み -こ.み こ.める",
-        "ktag1 ktag2",
-        [
-            "meaning1",
-            "meaning2",
-            "meaning3",
-            "meaning4",
-            "meaning5"
-        ],
-        {
-            "kstat1": "1",
-            "kstat2": "2",
-            "kstat3": "3",
-            "kstat4": "4",
-            "kstat5": "5"
-        }
-    ]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/kanji_meta_bank_1.json b/test/data/dictionaries/valid-dictionary2/kanji_meta_bank_1.json
deleted file mode 100644
index 73e75b8a..00000000
--- a/test/data/dictionaries/valid-dictionary2/kanji_meta_bank_1.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-    ["打", "freq", 1],
-    ["込", "freq", 2]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/tag_bank_1.json b/test/data/dictionaries/valid-dictionary2/tag_bank_1.json
deleted file mode 100644
index d66db94b..00000000
--- a/test/data/dictionaries/valid-dictionary2/tag_bank_1.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    ["tag1", "category1", 0, "tag1 notes", 0],
-    ["tag2", "category2", 0, "tag2 notes", 0],
-    ["tag3", "category3", 0, "tag3 notes", 0],
-    ["tag4", "category4", 0, "tag4 notes", 0],
-    ["tag5", "category5", 0, "tag5 notes", 0],
-    ["popular", "popular", 0, "popular term", 0],
-    ["vt", "partOfSpeech", 0, "transitive verb", 0]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/tag_bank_2.json b/test/data/dictionaries/valid-dictionary2/tag_bank_2.json
deleted file mode 100644
index 5e7936b3..00000000
--- a/test/data/dictionaries/valid-dictionary2/tag_bank_2.json
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-    ["ktag1", "kcategory1", 0, "ktag1 notes", 0],
-    ["ktag2", "kcategory2", 0, "ktag2 notes", 0],
-    ["kstat1", "kcategory3", 0, "kstat1 notes", 0],
-    ["kstat2", "kcategory4", 0, "kstat2 notes", 0],
-    ["kstat3", "kcategory5", 0, "kstat3 notes", 0],
-    ["kstat4", "kcategory6", 0, "kstat4 notes", 0],
-    ["kstat5", "kcategory7", 0, "kstat5 notes", 0]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/tag_bank_3.json b/test/data/dictionaries/valid-dictionary2/tag_bank_3.json
deleted file mode 100644
index 572221fe..00000000
--- a/test/data/dictionaries/valid-dictionary2/tag_bank_3.json
+++ /dev/null
@@ -1,4 +0,0 @@
-[
-    ["ptag1", "pcategory1", 0, "ptag1 notes", 0],
-    ["ptag2", "pcategory2", 0, "ptag2 notes", 0]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/term_bank_1.json b/test/data/dictionaries/valid-dictionary2/term_bank_1.json
deleted file mode 100644
index fcfe7365..00000000
--- a/test/data/dictionaries/valid-dictionary2/term_bank_1.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-    ["打", "だ", "tag1 tag2", "", 1, ["definition1", "definition2"], 1, "tag3 tag4 tag5"],
-    ["打", "ダース", "tag1 tag2", "", 1, ["definition3", "definition4"], 2, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 10, ["definition5", "definition6"], 3, "tag3 tag4 tag5"],
-    ["打つ", "うつ", "tag1 tag2", "v5", 1, ["definition7", "definition8"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 10, ["definition9", "definition10"], 3, "tag3 tag4 tag5"],
-    ["打つ", "ぶつ", "tag1 tag2", "v5", 1, ["definition11", "definition12"], 3, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 10, ["definition13", "definition14"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "うちこむ", "tag1 tag2", "v5", 1, ["definition15", "definition16"], 4, "tag5 tag6 tag7"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 10, ["definition17", "definition18"], 4, "tag3 tag4 tag5"],
-    ["打ち込む", "ぶちこむ", "tag1 tag2", "v5", 1, ["definition19", "definition20"], 4, "tag3 tag4 tag5"],
-    ["画像", "がぞう", "tag1 tag2", "", 1, ["definition21", {"type": "image", "path": "image.gif", "width": 350, "height": 350, "description": "An image", "pixelated": true}], 5, "tag3 tag4 tag5"],
-    ["読む", "よむ", "popular", "v5", 100, ["to read"], 6, "vt"],
-    ["強み", "つよみ", "popular", "n", 90, ["strong point"], 7, ""]
-]
\ No newline at end of file
diff --git a/test/data/dictionaries/valid-dictionary2/term_meta_bank_1.json b/test/data/dictionaries/valid-dictionary2/term_meta_bank_1.json
deleted file mode 100644
index 587dfdd4..00000000
--- a/test/data/dictionaries/valid-dictionary2/term_meta_bank_1.json
+++ /dev/null
@@ -1,33 +0,0 @@
-[
-    ["打", "freq", 1],
-    ["打つ", "freq", 2],
-    ["打ち込む", "freq", 3],
-    ["打", "freq", {"reading": "だ", "frequency": 4}],
-    ["打", "freq", {"reading": "ダース", "frequency": 5}],
-    ["打つ", "freq", {"reading": "うつ", "frequency": 6}],
-    ["打つ", "freq", {"reading": "ぶつ", "frequency": 7}],
-    ["打ち込む", "freq", {"reading": "うちこむ", "frequency": 8}],
-    ["打ち込む", "freq", {"reading": "ぶちこむ", "frequency": 9}],
-    [
-        "打ち込む",
-        "pitch",
-        {
-            "reading": "うちこむ",
-            "pitches": [
-                {"position": 0},
-                {"position": 3}
-            ]
-        }
-    ],
-    [
-        "打ち込む",
-        "pitch",
-        {
-            "reading": "ぶちこむ",
-            "pitches": [
-                {"position": 0},
-                {"position": 3}
-            ]
-        }
-    ]
-]
\ No newline at end of file