Skip to content

Commit

Permalink
CLDR-17078 keyboard to keyboard3: test fix
Browse files Browse the repository at this point in the history
  • Loading branch information
srl295 committed Sep 18, 2023
1 parent e6a0fbf commit bd40148
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ public void TestNewDtdData() {
/** paths that can be empty elements. Each item starts with '!' because of showPath. */
static final Set<String> ALLOWED_EMPTY_NO_VALUE_PATHS =
Collections.unmodifiableSet(
new HashSet<>(Arrays.asList("!//keyboardTest/tests/test/backspace")));
new HashSet<>(Arrays.asList("!//keyboardTest3/tests/test/backspace")));

// TESTING CODE
static final Set<String> orderedElements =
Expand Down Expand Up @@ -757,7 +757,7 @@ public boolean isDistinguishingOld(DtdType dtdType, String elementName, String a
&& attribute.equals("order"));

case keyboard3:
if (elementName.equals("keyboard") && attribute.equals("locale")
if (elementName.equals("keyboard3") && attribute.equals("locale")
|| elementName.equals("vkeys") && attribute.equals("from")
|| elementName.equals("layers") && attribute.equals("form")
|| elementName.equals("layers") && attribute.equals("minDeviceWidth")
Expand All @@ -776,7 +776,7 @@ public boolean isDistinguishingOld(DtdType dtdType, String elementName, String a
}
// fall through to old keyboard
return attribute.equals("_q")
|| elementName.equals("keyboard") && attribute.equals("locale")
|| elementName.equals("keyboard3") && attribute.equals("locale")
|| elementName.equals("keyMap") && attribute.equals("modifiers")
|| elementName.equals("key") && attribute.equals("flicks")
|| elementName.equals("transforms") && attribute.equals("type")
Expand Down

0 comments on commit bd40148

Please sign in to comment.