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
This commit is contained in:
toasted-nutbread 2021-05-18 19:50:11 -04:00 committed by GitHub
parent f3cf4d10c7
commit ae89a8f2ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 3234 additions and 7746 deletions

File diff suppressed because one or more lines are too long

View File

@ -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"
}
]
]

View File

@ -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]
]

View File

@ -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]
]

View File

@ -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]
]

View File

@ -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"]
]

View File

@ -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"]}
]
}
]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 B

View File

@ -1,6 +0,0 @@
{
"title": "Test Dictionary 2",
"format": 3,
"revision": "test",
"sequenced": true
}

View File

@ -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"
}
]
]

View File

@ -1,4 +0,0 @@
[
["打", "freq", 1],
["込", "freq", 2]
]

View File

@ -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]
]

View File

@ -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]
]

View File

@ -1,4 +0,0 @@
[
["ptag1", "pcategory1", 0, "ptag1 notes", 0],
["ptag2", "pcategory2", 0, "ptag2 notes", 0]
]

View File

@ -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, ""]
]

View File

@ -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}
]
}
]
]

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -29,7 +29,7 @@ function clone(value) {
async function createVM() {
const vm = new TranslatorVM();
const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', 'valid-dictionary2');
const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', 'valid-dictionary1');
await vm.prepare(dictionaryDirectory, 'Test Dictionary 2');
vm.execute([

View File

@ -162,8 +162,8 @@ async function testDatabase1() {
true
);
vm.assert.deepStrictEqual(counts, {
counts: [{kanji: 2, kanjiMeta: 2, terms: 33, termMeta: 12, tagMeta: 14, media: 1}],
total: {kanji: 2, kanjiMeta: 2, terms: 33, termMeta: 12, tagMeta: 14, media: 1}
counts: [{kanji: 2, kanjiMeta: 2, terms: 14, termMeta: 12, tagMeta: 15, media: 1}],
total: {kanji: 2, kanjiMeta: 2, terms: 14, termMeta: 12, tagMeta: 15, media: 1}
});
// Test find* functions
@ -211,19 +211,19 @@ async function testFindTermsBulkTest1(database, titles) {
}
],
expectedResults: {
total: 32,
total: 10,
terms: [
['打', 2],
['打つ', 17],
['打ち込む', 13]
['打つ', 4],
['打ち込む', 4]
],
readings: [
['だ', 1],
['ダース', 1],
['うつ', 15],
['うつ', 2],
['ぶつ', 2],
['うちこむ', 9],
['ぶちこむ', 4]
['うちこむ', 2],
['ぶちこむ', 2]
]
}
},
@ -248,13 +248,13 @@ async function testFindTermsBulkTest1(database, titles) {
}
],
expectedResults: {
total: 13,
total: 4,
terms: [
['打ち込む', 13]
['打ち込む', 4]
],
readings: [
['うちこむ', 9],
['ぶちこむ', 4]
['うちこむ', 2],
['ぶちこむ', 2]
]
}
},
@ -300,16 +300,16 @@ async function testTindTermsExactBulk1(database, titles) {
}
],
expectedResults: {
total: 25,
total: 5,
terms: [
['打', 1],
['打つ', 15],
['打ち込む', 9]
['打つ', 2],
['打ち込む', 2]
],
readings: [
['だ', 1],
['うつ', 15],
['うちこむ', 9]
['うつ', 2],
['うちこむ', 2]
]
}
},
@ -339,12 +339,12 @@ async function testTindTermsExactBulk1(database, titles) {
}
],
expectedResults: {
total: 17,
total: 4,
terms: [
['打つ', 17]
['打つ', 4]
],
readings: [
['うつ', 15],
['うつ', 2],
['ぶつ', 2]
]
}
@ -400,20 +400,20 @@ async function testFindTermsBySequenceBulk1(database, mainDictionary) {
}
],
expectedResults: {
total: 33,
total: 11,
terms: [
['打', 2],
['打つ', 17],
['打ち込む', 13],
['打つ', 4],
['打ち込む', 4],
['画像', 1]
],
readings: [
['だ', 1],
['ダース', 1],
['うつ', 15],
['うつ', 2],
['ぶつ', 2],
['うちこむ', 9],
['ぶちこむ', 4],
['うちこむ', 2],
['ぶちこむ', 2],
['がぞう', 1]
]
}
@ -457,12 +457,12 @@ async function testFindTermsBySequenceBulk1(database, mainDictionary) {
}
],
expectedResults: {
total: 17,
total: 4,
terms: [
['打つ', 17]
['打つ', 4]
],
readings: [
['うつ', 15],
['うつ', 2],
['ぶつ', 2]
]
}
@ -474,13 +474,13 @@ async function testFindTermsBySequenceBulk1(database, mainDictionary) {
}
],
expectedResults: {
total: 13,
total: 4,
terms: [
['打ち込む', 13]
['打ち込む', 4]
],
readings: [
['うちこむ', 9],
['ぶちこむ', 4]
['うちこむ', 2],
['ぶちこむ', 2]
]
}
},
@ -715,21 +715,21 @@ async function testFindTagForTitle1(database, title) {
{
inputs: [
{
name: 'tag1'
name: 'E1'
}
],
expectedResults: {
value: {category: 'category1', dictionary: title, name: 'tag1', notes: 'tag1 notes', order: 0, score: 0}
value: {category: 'default', dictionary: title, name: 'E1', notes: 'example tag 1', order: 0, score: 0}
}
},
{
inputs: [
{
name: 'ktag1'
name: 'K1'
}
],
expectedResults: {
value: {category: 'kcategory1', dictionary: title, name: 'ktag1', notes: 'ktag1 notes', order: 0, score: 0}
value: {category: 'default', dictionary: title, name: 'K1', notes: 'example kanji tag 1', order: 0, score: 0}
}
},
{
@ -739,7 +739,7 @@ async function testFindTagForTitle1(database, title) {
}
],
expectedResults: {
value: {category: 'kcategory3', dictionary: title, name: 'kstat1', notes: 'kstat1 notes', order: 0, score: 0}
value: {category: 'class', dictionary: title, name: 'kstat1', notes: 'kanji stat 1', order: 0, score: 0}
}
},
{

View File

@ -29,7 +29,6 @@ function createTestDictionaryArchive(dictionary, dictionaryName) {
async function main() {
const dictionaries = [
{name: 'valid-dictionary1', valid: true},
{name: 'valid-dictionary2', valid: true},
{name: 'invalid-dictionary1', valid: false},
{name: 'invalid-dictionary2', valid: false},
{name: 'invalid-dictionary3', valid: false},

View File

@ -31,7 +31,7 @@ async function main() {
const write = (process.argv[2] === '--write');
const translatorVM = new TranslatorVM();
const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', 'valid-dictionary2');
const dictionaryDirectory = path.join(__dirname, 'data', 'dictionaries', 'valid-dictionary1');
await translatorVM.prepare(dictionaryDirectory, 'Test Dictionary 2');
const testInputsFilePath = path.join(__dirname, 'data', 'translator-test-inputs.json');