<Keep Alive>sync the main.v4 with the current master

.github/ISSUE_TEMPLATE/accessibility_issue.yaml

@@ -51,7 +51,7 @@ body:
   - type: input
     id: tool
     attributes:
-      label: Automated testing tool and ruleset
+      label: Automated testing tool and ruleset.
       description: 'Which tool and ruleset uncovered the issue?'
       placeholder: e.g. IBM Equal Access Accessibility Checker - Latest Deployment
   - type: input

.github/workflows/master.yml

@@ -44,7 +44,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Chrome
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -53,7 +53,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Firefox
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -92,7 +92,7 @@ jobs:
     - run: npm test
       working-directory: accessibility-checker/test-act-w3
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: ACT Text Results
         path: accessibility-checker/test-act-w3/act-report-v2.txt

.github/workflows/publish.yml

@@ -173,7 +173,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Chrome
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -195,7 +195,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Firefox
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -222,4 +222,46 @@ jobs:
         BLUEMIX_USERID: apikey
         BLUEMIX_PASS: ${{ secrets.BLUEMIX_PASS }}
         CLOUD_PWD: ${{ secrets.CLOUD_PWD }}
-        TRAVIS_BRANCH: prod
+        TRAVIS_BRANCH: prod
+
+  java-accessibility-checker-deploy:
+    runs-on: ubuntu-22.04
+    permissions:
+      packages: write
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'semeru' # See 'Supported distributions' for available options
+        java-version: '17'
+        server-id: central
+        server-username: ${{ secrets.MVN_GITHUB_USER }}
+        server-password: ${{ secrets.MVN_GITHUB_TOKEN }}
+    - uses: s4u/[email protected]
+      with:
+        servers: |
+          [{
+            "id": "central",
+            "username": "${{ secrets.MVN_GITHUB_USER }}",
+            "password": "${{ secrets.MVN_GITHUB_TOKEN }}"
+          }]
+    - name: Configure GPG Key
+      run: echo "$GPG_SIGNING_KEY" >private.key
+      env:
+        GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
+    - name: Import GPG Key
+      run: gpg --pinentry-mode=loopback --passphrase "$GPG_SIGNING_KEY_PASS" --import private.key
+      env:
+        GPG_SIGNING_KEY_PASS: ${{ secrets.GPG_SIGNING_KEY_PASS }}
+    - name: Set version
+      run: sed -i'.old' -e 's/<version>3\.0\.0<\/version>/<version>'"${GITHUB_REF:10}"'<\/version>/g' ./pom.xml
+      working-directory: java-accessibility-checker
+    - name: Publish package
+      run: mvn --batch-mode deploy -DskipTests -Dgpg.passphrase=$GPG_SIGNING_KEY_PASS
+      working-directory: java-accessibility-checker
+      env:
+        GPG_SIGNING_KEY_PASS: ${{ secrets.GPG_SIGNING_KEY_PASS }}

.github/workflows/test.yml

@@ -42,10 +42,15 @@ jobs:
     - run: npx mocha ./test/mocha/help/help.test.js
       working-directory: accessibility-checker-engine
     - name: Upload rule listing
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: Rule listing
         path: accessibility-checker-engine/dist/help/rules.html
+    - name: Upload rule mapping spreadsheet
+      uses: actions/upload-artifact@v4
+      with:
+        name: Rule mapping spreadsheet
+        path: accessibility-checker-engine/dist/help/rules.csv
 
 
   act-results:
@@ -84,7 +89,7 @@ jobs:
     - run: npm test
       working-directory: accessibility-checker/test-act-w3
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: ACT Text Results
         path: accessibility-checker/test-act-w3/act-report-v2.txt
@@ -361,6 +366,77 @@ jobs:
     - run: npm run wdio
       working-directory: accessibility-checker/test/webdriverio
 
+###############################################################################
+# Java test
+####
+  java-accessibility-checker-selenium-test:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'semeru' # See 'Supported distributions' for available options
+        java-version: '17'
+    - name: Latest Chrome
+      uses: browser-actions/setup-chrome@v1
+      with:
+        chrome-version: latest
+        install-chromedriver: true
+      id: setup-chrome
+    - run: npm install
+      working-directory: rule-server
+    - run: npm run build
+      working-directory: rule-server
+    - run: node main.js &
+      working-directory: rule-server/dist
+    - run: sleep 10
+      working-directory: rule-server/dist
+    - name: Test package
+      run: mvn --batch-mode test -Dtest="AccessibilityCheckerSeleniumTest"
+      working-directory: java-accessibility-checker
+      env: 
+        chromedriverpath: ${{ steps.setup-chrome.outputs.chromedriver-path }}
+        chromebinpath: ${{ steps.setup-chrome.outputs.chrome-path }}
+
+  java-accessibility-checker-playwright-test:
+    runs-on: ubuntu-22.04
+
+    strategy:
+      matrix:
+        node-version: [18.x]
+
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v4
+      with:
+        distribution: 'semeru' # See 'Supported distributions' for available options
+        java-version: '17'
+    - name: Latest Chrome
+      uses: browser-actions/setup-chrome@v1
+      with:
+        chrome-version: latest
+        install-chromedriver: true
+      id: setup-chrome
+    - run: npm install
+      working-directory: rule-server
+    - run: npm run build
+      working-directory: rule-server
+    - run: node main.js &
+      working-directory: rule-server/dist
+    - run: sleep 10
+      working-directory: rule-server/dist
+    - name: Test package
+      run: mvn --batch-mode test -Dtest="AccessibilityCheckerPlaywrightTest"
+      working-directory: java-accessibility-checker
+      env: 
+        chromedriverpath: ${{ steps.setup-chrome.outputs.chromedriver-path }}
+        chromebinpath: ${{ steps.setup-chrome.outputs.chrome-path }}
+
 ###############################################################################
 # Karma Tests
 ####
@@ -491,7 +567,7 @@ jobs:
       run: npm test
       working-directory: accessibility-checker-extension/test
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Chrome
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip
@@ -500,7 +576,7 @@ jobs:
     - run: npm run package:browser
       working-directory: accessibility-checker-extension
     - name: Upload packed extension
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: accessibility-checker-extension for Firefox
         path: accessibility-checker-extension/package/accessibility-checker-extension.zip

accessibility-checker-engine/help-v4/en-US/label_ref_valid.html

@@ -45,16 +45,16 @@ <h3 id="ruleMessage"></h3>
 
 ### Why is this important?
 
-A `<label>` element is attached to a specific `<input>` element through the `for` attribute. 
-When a `<label>` does not reference the corresponding unique `id` in a valid `<input>` element, 
+A `<label>` element is attached to a specific element, such as `<input>` and `<select>`, through the `for` attribute. 
+When a `<label>` does not reference the corresponding unique `id` in a valid element, 
 assistive technologies cannot associate the label with the element.
 
 <!-- This is where the code snippet is injected -->
 <div id="locSnippet"></div>
 
 ### What to do
 
-* Set the value of the `for` attribute to the `id` value of the valid `<input>` element to be labeled. Make sure the `id` value is unique. 
+* Set the value of the `for` attribute to the `id` value of the valid element to be labeled. Make sure the `id` value is unique. 
 
 For example:
 

accessibility-checker-engine/karma.conf.js

@@ -46,11 +46,13 @@
                 // { pattern: 'test/v2/checker/accessibility/rules/Rpt_Aria_RequiredParent_Native_Host_Sematics_ruleunit/ACT_ff89c9_pass4.html', watched: true },
                 //{ pattern: 'test/v2/checker/accessibility/rules/label_name_visible_ruleunit/label_offscreen.html', watched: true },
                 //{ pattern: 'test/v2/checker/accessibility/rules/aria_role_valid_ruleunit/td_attribute_invalid_copy.html', watched: true },
-                //{ pattern: 'test/v2/checker/accessibility/rules/label_name_visible_ruleunit/label_multiple_offscreen.html', watched: true },
+                //{ pattern: 'test/v2/checker/accessibility/rules/text_block_heading_ruleunit/Headings-noneUsedEmphasizedText.html', watched: true },
+                { pattern: 'test/v2/checker/accessibility/rules/aria_landmark_name_unique_ruleunit/*.html', watched: true },
+                // { pattern: 'test/v2/checker/accessibility/rules/aria_parent_required_ruleunit/webComponentPass2.html', watched: true },
 
 
-                { pattern: 'test/**/*_ruleunit/*.html', watched: true },
-                { pattern: 'test/**/*_ruleunit/*.htm', watched: true },
+                // { pattern: 'test/**/*_ruleunit/*.html', watched: true },
+                // { pattern: 'test/**/*_ruleunit/*.htm', watched: true },
                 // all files ending in "_test"
                 // { pattern: 'test/*_test.js', watched: true },
                 { pattern: 'test/**/*_test.js', watched: true }

accessibility-checker-engine/karmaaction.conf.js

@@ -63,7 +63,7 @@ module.exports = (config) => {
         customLaunchers: {
             ChromeCustom: {
                 base: 'ChromeHeadless',
-                flags: ['--disable-web-security', '--no-sandbox']
+                flags: ['--disable-gpu', '--disable-web-security', '--no-sandbox']
             }
         },
         preprocessors: {

accessibility-checker-engine/src/genHelp.ts

@@ -135,7 +135,7 @@ width="16px" height="16px" viewBox="0 0 16 16" style="enable-background:new 0 0
     return `<span class="issueLevel">${icon}&nbsp;${val}</span>`;
 }
 
-function processRules() {
+function processRules(includePass?: boolean) {
     let retVal = [];
     for (const ruleset of a11yRulesets as Guideline[]) {
         if (ruleset.type === "extension") continue;
@@ -183,7 +183,7 @@ function processRules() {
                         if (msgCode === "group") return;
                         let re = new RegExp(`\\.Rule([^()) ]+)[ ()]+["']${msgCode}["']`);
                         let reMatch = re.exec(rule.run.toString());
-                        if (reMatch && reMatch[1] !== "Pass") {
+                        if (includePass || (reMatch && reMatch[1] !== "Pass")) {
                             ruleInfo.reasons.push({
                                 id: msgCode,
                                 message: rule.messages["en-US"][msgCode],
@@ -200,6 +200,8 @@ function processRules() {
                         if (b.level === "Potential") return 1;
                         if (a.level === "Manual") return -1;
                         if (b.level === "Manual") return 1;
+                        if (a.level === "Pass") return -1;
+                        if (b.level === "Pass") return 1;
                         return 0;
                     })
                     cpInfo.rules.push(ruleInfo);
@@ -214,6 +216,9 @@ function processRules() {
                     if (retVal === 0) {
                         retVal = b.reasons.filter(reasonInfo => (reasonInfo.type === "Manual")).length - a.reasons.filter(reasonInfo => (reasonInfo.type === "Manual")).length;
                     }
+                    if (retVal === 0) {
+                        retVal = b.reasons.filter(reasonInfo => (reasonInfo.type === "Pass")).length - a.reasons.filter(reasonInfo => (reasonInfo.type === "Pass")).length;
+                    }
                     return retVal;
                 }
                 if (a.level === "VIOLATION") return -1;
@@ -304,7 +309,73 @@ ${cpSections}
     writeFileSync(path.join(__dirname, '..', 'dist', "help", "rules.html"), rulesHTML);
 }
 
+function buildRuleMapping() {
+    const vMap = {
+        "VIOLATION_Fail": "Violation",
+        "VIOLATION_Potential": "Violation Potential",
+        "VIOLATION_Manual": "Violation Manual",
+        "VIOLATION_Pass": "Pass",
+        "RECOMMENDATION_Fail": "Rec",
+        "RECOMMENDATION_Potential": "Rec Potential",
+        "RECOMMENDATION_Manual": "Rec Manual",
+        "RECOMMENDATION_Pass": "Pass"
+    }
+    const actMap = {
+        "Pass": "pass",
+        "Fail": "fail",
+        "Potential": "cantTell",
+        "Manual": "cantTell"
+    }
+    const csv = (str : string) => {
+        if (str === null) {
+            return '"null"';
+        } else if (!str || str.length == 0) {
+            return '""';
+        } else {
+            str = str.replace(/"/g, '""');
+            return `"${str}"`;
+        }
+    }
+    let rsInfo = processRules(true);
+    let csvStr = `Rule ID, Reason Code, Rule message, Reason message, Violation Level, Toolkit Level, WCAG Requirements, ACT mapping\n`;
+    let ruleset = rsInfo.filter(rs => rs.id === "IBM_Accessibility")[0];
+    for (const checkpoint of ruleset.checkpoints) {
+        for (const rule of checkpoint.rules) {
+            for (const reason of rule.reasons) {
+                let vLevelStrings = [];
+                let tkLevelStrings = [];
+                let rsStrings = [];
+                let actStrings = [];
+                for (const rsInfo of rule.rule.rulesets) {
+                    tkLevelStrings.push(rsInfo.toolkitLevel);
+                    vLevelStrings.push(vMap[`${rsInfo.level}_${reason.type}`]);
+                    rsStrings.push(rsInfo.num);
+                }
+                if (typeof rule.rule.act === typeof "") {
+                    actStrings.push(rule.rule.act+":"+actMap[reason.type]);
+                } else if (rule.rule.act.length) {
+                    for (const actInfo of rule.rule.act) {
+                        if (typeof actInfo === typeof "") {
+                            actStrings.push(actInfo+":"+actMap[reason.type]);
+                        } else {
+                            for (const key in actInfo) {
+                                if (reason.id in actInfo[key]) {
+                                    actStrings.push(key+":"+actInfo[key][reason.id])
+                                }
+                            }
+                        }
+                    }
+                }
+                let csvStrLine = `${csv(rule.rule.id)},${csv(reason.id)},${csv(rule.rule.messages['en-US'].group)},${csv(reason.message)},${csv(vLevelStrings.join(" | "))},${csv(tkLevelStrings.join(" | "))},${csv(rsStrings.join(" | "))},${csv(actStrings.join(" | "))}\n`;
+                csvStr += csvStrLine;
+            }
+        }
+    }
+    writeFileSync(path.join(__dirname, '..', 'dist', "help", "rules.csv"), csvStr);
+}
+
 (async () => {
     await buildV4();
     await buildRuleViewer();
+    await buildRuleMapping();
 })();