From 462530fb8933f8cc2db3a210d58869bdc4ad32b6 Mon Sep 17 00:00:00 2001
From: "Steven R. Loomis" <srl295@gmail.com>
Date: Tue, 3 Oct 2023 18:11:57 -0500
Subject: [PATCH] CLDR-17089 kbd: mixed children test/data fix

---
 keyboards/3.0/fr-t-k0-azerty.xml              | 29 +++++++++----------
 .../unicode/cldr/unittest/TestDtdData.java    | 15 +++++-----
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/keyboards/3.0/fr-t-k0-azerty.xml b/keyboards/3.0/fr-t-k0-azerty.xml
index a210f1ecc3a..942ffe83f58 100644
--- a/keyboards/3.0/fr-t-k0-azerty.xml
+++ b/keyboards/3.0/fr-t-k0-azerty.xml
@@ -67,27 +67,24 @@
 
 		<!-- test key -->
 		<key id="a" flicks="a" to="a" longPress="à â á ä ã å ā" />
-		<flicks>
-			<flick id="a">
-				<flickSegment directions="nw" to="\u{1234}" />
-				<flickSegment directions="nw se" to="\u{FFFF}" />
-				<flickSegment directions="e" to="\u{FFF0}" />
-			</flick>
-		</flicks>
-
 		<!-- test key -->
 		<key id="A" flicks="b" to="A" longPress="À Á Ä Ã Å Ā" />
-
-		<!-- test flick -->
-		<flicks id="b">
-			<flick directions="nw" to="\u{4567}" />
-			<flick directions="nw se" to="\u{FFFF}" />
-			<flick directions="e" to="\u{FFF0}" />
-		</flicks>
-
 		<!-- TODO: all additional maps, hardware and touch -->
 	</keys>
 
+	<flicks>
+		<flick id="a">
+			<flickSegment directions="nw" to="\u{1234}" />
+			<flickSegment directions="nw se" to="\u{FFFF}" />
+			<flickSegment directions="e" to="\u{FFF0}" />
+		</flick>
+		<flick id="b">
+			<flickSegment directions="nw" to="\u{4567}" />
+			<flickSegment directions="nw se" to="\u{FFFF}" />
+			<flickSegment directions="e" to="\u{FFF0}" />
+		</flick>
+	</flicks>
+
 	<layers form="iso">
 		<!-- in DTD: required if conformsTo ≥ 41 -->
 		<layer modifier="none">
diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java
index 95e3f00aa36..2faff226d3b 100644
--- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java
+++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestDtdData.java
@@ -1,9 +1,5 @@
 package org.unicode.cldr.unittest;
 
-import com.google.common.base.Joiner;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.TreeMultimap;
-import com.ibm.icu.dev.test.TestFmwk;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -17,6 +13,7 @@
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
+
 import org.unicode.cldr.util.CLDRConfig;
 import org.unicode.cldr.util.CLDRPaths;
 import org.unicode.cldr.util.DtdData;
@@ -34,6 +31,11 @@
 import org.unicode.cldr.util.XMLFileReader;
 import org.unicode.cldr.util.XPathParts;
 
+import com.google.common.base.Joiner;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.TreeMultimap;
+import com.ibm.icu.dev.test.TestFmwk;
+
 public class TestDtdData extends TestFmwk {
     private static final String COMMON_DIR = CLDRPaths.BASE_DIRECTORY + "common/";
     static CLDRConfig testInfo = CLDRConfig.getInstance();
@@ -787,13 +789,12 @@ public boolean isDistinguishingOld(DtdType dtdType, String elementName, String a
                         || elementName.equals("backspace") && attribute.equals("from")
                         || elementName.equals("backspace") && attribute.equals("after")
                         || elementName.equals("vkeys") && attribute.equals("type")
-                        || elementName.equals("flick") && attribute.equals("directions")
+                        || elementName.equals("flickSegment") && attribute.equals("directions")
                         // || elementName.equals("row") && attribute.equals("keys")
                         || elementName.equals("vkey") && attribute.equals("iso")
                         || elementName.equals("display") && attribute.equals("to")
                         || elementName.equals("display") && attribute.equals("id")
-                        || elementName.equals("flicks") && attribute.equals("id")
-                        || elementName.equals("flick") && attribute.equals("directions");
+                        || elementName.equals("flick") && attribute.equals("id");
             case keyboardTest3:
                 return elementName.equals("tests") && attribute.equals("name")
                         || elementName.equals("test") && attribute.equals("name")