From 93cdbe4b718f9f7a2cd0d6efc545ec51d049812f Mon Sep 17 00:00:00 2001
From: Stephen Kraus <8003332+stephenmk@users.noreply.github.com>
Date: Fri, 22 Dec 2023 19:17:17 -0600
Subject: Add support for alt attribute on structured content images (#359)

* Add support for alt attribute on structured content images

* Add new `alt` property for structured content images

* Update test script with new media file count

---------

Co-authored-by: stephenmk <stephenmk@users.noreply.github.com>
---
 test/data/dictionaries/valid-dictionary1/aosaba_auto.png | Bin 0 -> 1699 bytes
 test/data/dictionaries/valid-dictionary1/aosaba_mono.png | Bin 0 -> 1807 bytes
 .../data/dictionaries/valid-dictionary1/term_bank_1.json |   9 ++++++++-
 test/database.test.js                                    |  12 ++++++------
 4 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 test/data/dictionaries/valid-dictionary1/aosaba_auto.png
 create mode 100644 test/data/dictionaries/valid-dictionary1/aosaba_mono.png

(limited to 'test')

diff --git a/test/data/dictionaries/valid-dictionary1/aosaba_auto.png b/test/data/dictionaries/valid-dictionary1/aosaba_auto.png
new file mode 100644
index 00000000..ddef36ac
Binary files /dev/null and b/test/data/dictionaries/valid-dictionary1/aosaba_auto.png differ
diff --git a/test/data/dictionaries/valid-dictionary1/aosaba_mono.png b/test/data/dictionaries/valid-dictionary1/aosaba_mono.png
new file mode 100644
index 00000000..a0776098
Binary files /dev/null and b/test/data/dictionaries/valid-dictionary1/aosaba_mono.png differ
diff --git a/test/data/dictionaries/valid-dictionary1/term_bank_1.json b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
index 38b022fa..14f66d95 100644
--- a/test/data/dictionaries/valid-dictionary1/term_bank_1.json
+++ b/test/data/dictionaries/valid-dictionary1/term_bank_1.json
@@ -66,7 +66,7 @@
                 "莢\n"
             ]},
             {"type": "structured-content", "content": [
-                "Imgae aspect ratio tests:\nあ",
+                "Image aspect ratio tests:\nあ",
                 {"tag": "img", "path": "character2.gif", "height": 1.1, "imageRendering": "crisp-edges", "appearance": "monochrome", "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false},
                 "あ\nあ",
                 {"tag": "img", "path": "character2.gif", "width": 0.4125, "imageRendering": "crisp-edges", "appearance": "monochrome", "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false},
@@ -76,6 +76,13 @@
                 {"tag": "img", "path": "character3.gif", "height": 0.4125, "imageRendering": "crisp-edges", "appearance": "monochrome", "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false},
                 "あ"
             ]},
+            {"type": "structured-content", "content": [
+                "Image alt text tests.\n𬵪 = Unicode character\n",
+                {"tag": "img", "alt": "𬵪", "path": "aosaba_mono.png", "height": 1.0, "width": 1.0, "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false, "appearance": "monochrome"},
+                " = monochrome PNG\n",
+                {"tag": "img", "alt": "𬵪", "path": "aosaba_auto.png", "height": 1.0, "width": 1.0, "background": false, "sizeUnits": "em", "collapsed": false, "collapsible": false, "appearance": "auto"},
+                " = color PNG"
+            ]},
             {"type": "structured-content", "content": [
                 {"tag": "div", "style": {"fontStyle": "normal"}, "content": "fontStyle:normal"},
                 {"tag": "div", "style": {"fontStyle": "italic"}, "content": "fontStyle:italic"},
diff --git a/test/database.test.js b/test/database.test.js
index 702de9f8..86c69a41 100644
--- a/test/database.test.js
+++ b/test/database.test.js
@@ -163,7 +163,7 @@ async function testDatabase1() {
                 counts: {
                     kanji: {total: 2},
                     kanjiMeta: {total: 6, freq: 6},
-                    media: {total: 4},
+                    media: {total: 6},
                     tagMeta: {total: 15},
                     termMeta: {total: 38, freq: 31, pitch: 7},
                     terms: {total: 21}
@@ -193,13 +193,13 @@ async function testDatabase1() {
                 true
             );
             expect(counts).toStrictEqual({
-                counts: [{kanji: 2, kanjiMeta: 6, terms: 21, termMeta: 38, tagMeta: 15, media: 4}],
-                total: {kanji: 2, kanjiMeta: 6, terms: 21, termMeta: 38, tagMeta: 15, media: 4}
+                counts: [{kanji: 2, kanjiMeta: 6, terms: 21, termMeta: 38, tagMeta: 15, media: 6}],
+                total: {kanji: 2, kanjiMeta: 6, terms: 21, termMeta: 38, tagMeta: 15, media: 6}
             });
 
             // Test find* functions
             await testFindTermsBulkTest1(dictionaryDatabase, titles);
-            await testTindTermsExactBulk1(dictionaryDatabase, titles);
+            await testFindTermsExactBulk1(dictionaryDatabase, titles);
             await testFindTermsBySequenceBulk1(dictionaryDatabase, title);
             await testFindTermMetaBulk1(dictionaryDatabase, titles);
             await testFindKanjiBulk1(dictionaryDatabase, titles);
@@ -335,8 +335,8 @@ async function testFindTermsBulkTest1(database, titles) {
  * @param {DictionaryDatabase} database
  * @param {import('dictionary-database').DictionarySet} titles
  */
-async function testTindTermsExactBulk1(database, titles) {
-    test('TindTermsExactBulk1', async () => {
+async function testFindTermsExactBulk1(database, titles) {
+    test('FindTermsExactBulk1', async () => {
         /** @type {{inputs: {termList: {term: string, reading: string}[]}[], expectedResults: {total: number, terms: [key: string, count: number][], readings: [key: string, count: number][]}}[]} */
         const data = [
             {
-- 
cgit v1.2.3