From a3a7054bf26bb1b7731a5840c6e2d2b85e16a0cf Mon Sep 17 00:00:00 2001
From: Mark Davis <mark@macchiato.com>
Date: Thu, 11 Oct 2018 16:34:04 +0000
Subject: [PATCH] git-svn-id: https://unicode.org/repos/unicodetools/trunk@1566
 13e8329f-0b23-4da4-9fe8-d0f6fe080806

---
 .../unicode/tools/emoji/CandidateData.java    |  59 ++++--
 .../org/unicode/tools/emoji/CountEmoji.java   |   6 +-
 .../org/unicode/tools/emoji/EmojiData.java    |  23 ++-
 .../unicode/tools/emoji/EmojiDataSource.java  |   2 +
 .../tools/emoji/EmojiDataSourceCombined.java  |  12 ++
 .../tools/emoji/GenerateEmojiData.java        |   9 +-
 .../org/unicode/tools/emoji/candidateData.txt | 165 ++++++++--------
 .../unicode/tools/emoji/unittest/TestAll.java |  32 ++++
 .../emoji/unittest/TestCandidateData.java     |   5 +-
 .../emoji/unittest/TestCombinedEmojiData.java | 108 +++++++++++
 .../tools/emoji/unittest/TestEmojiData.java   | 180 ++++++++++++++----
 11 files changed, 462 insertions(+), 139 deletions(-)
 create mode 100644 unicodetools/org/unicode/tools/emoji/unittest/TestAll.java
 create mode 100644 unicodetools/org/unicode/tools/emoji/unittest/TestCombinedEmojiData.java

diff --git a/unicodetools/org/unicode/tools/emoji/CandidateData.java b/unicodetools/org/unicode/tools/emoji/CandidateData.java
index 1670f2446..bf78fdb84 100644
--- a/unicodetools/org/unicode/tools/emoji/CandidateData.java
+++ b/unicodetools/org/unicode/tools/emoji/CandidateData.java
@@ -39,6 +39,8 @@
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.text.Transform;
 import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.text.UnicodeSet.SpanCondition;
+import com.ibm.icu.text.UnicodeSetSpanner;
 import com.ibm.icu.util.ICUException;
 import com.ibm.icu.util.ULocale;
 import com.ibm.icu.util.VersionInfo;
@@ -150,7 +152,7 @@ private CandidateData(String sourceFile) {
                 if (line.startsWith("#") || line.isEmpty()) { // comment
                     continue;
                 } else if (line.startsWith("U+")) { // data
-                    fixGenderSkin(source); // old source
+                    fixGenderSkin(source); // fix old source. we do it here so we know the properties
 
                     source = Utility.fromHex(line);
                     if (allCharacters.contains(source)) {
@@ -318,6 +320,7 @@ private CandidateData(String sourceFile) {
         textPresentation.freeze();
 
         emoji_Modifier_Base.freeze();
+
         emoji_Gender_Base.freeze();
         takesSign.freeze();
         emoji_Component.freeze();
@@ -392,34 +395,52 @@ private void fixGenderSkin(String source) {
         if (source == null) {
             return;
         }
-        int single = UnicodeSet.getSingleCodePoint(source);
-        if (single == Integer.MAX_VALUE) {
-            return;
+        if (source.equals("👩‍🦯️")) {
+            int debug = 0;
         }
-        boolean isModBase = emoji_Modifier_Base.contains(source);
-        if (isModBase) {
+
+
+        boolean hasModifierBase = emoji_Modifier_Base.containsSome(source) 
+                || EmojiData.EMOJI_DATA_BETA.getModifierBases().containsSome(source);
+        if (hasModifierBase) {
+            // find the point where it occurs; not efficient but we don't care
+            UnicodeSet all_Emoji_Modifier_Base = new UnicodeSet(emoji_Modifier_Base)
+                    .addAll(EmojiData.EMOJI_DATA_BETA.getModifierBases())
+                    .freeze();
+
+            int start = all_Emoji_Modifier_Base.span(source, SpanCondition.NOT_CONTAINED);
+            int end = all_Emoji_Modifier_Base.span(source, start, SpanCondition.CONTAINED);
+            
+            String prefix = source.substring(0, end);
+            String postfix = source.substring(end);
             for (String mod : EmojiData.MODIFIERS) {
-                addCombo(source, source + mod, "", ": " + EmojiData.EMOJI_DATA.getName(mod));
+                addCombo(source, prefix + mod + postfix, "", ": " + EmojiData.EMOJI_DATA_BETA.getName(mod));
             }
         }
+
+        int single = UnicodeSet.getSingleCodePoint(source);
+        if (single == Integer.MAX_VALUE) {
+            return;
+        }
+
         boolean isGenderBase = emoji_Gender_Base.contains(source);
         if (isGenderBase) {
             for (String gen : Emoji.GENDER_MARKERS) {
                 String genSuffix = Emoji.JOINER_STR + gen + Emoji.EMOJI_VARIANT_STRING;
                 String genPrefix = gen.equals(Emoji.MALE) ? "man " : "woman ";
                 addCombo(source, source + genSuffix, genPrefix, "");
-                if (isModBase) {
+                if (hasModifierBase) {
                     for (String mod : EmojiData.MODIFIERS) {
-                        addCombo(source, source + mod + genSuffix, genPrefix, ": " + EmojiData.EMOJI_DATA.getName(mod));
+                        addCombo(source, source + mod + genSuffix, genPrefix, ": " + EmojiData.EMOJI_DATA_BETA.getName(mod));
                     }
                 }
             }
         }
-        if (isGenderBase && isModBase) {
+        if (isGenderBase && hasModifierBase) {
             addComment(source, "Combinations of gender and skin-tone produce 17 more emoji sequences.");
         } else if (isGenderBase) {
             addComment(source, "Combinations of gender and skin-tone produce 2 more emoji sequences.");
-        } else if (isModBase) {
+        } else if (hasModifierBase) {
             addComment(source, "Combinations of gender and skin-tone produce 5 more emoji sequences.");
         }
         // Comment=There will be 55 emoji sequences with combinations of gender and skin-tone
@@ -470,7 +491,7 @@ public int compare(String o1, String o2) {
 
             String cat1 = getCategory(o1);
             int catOrder1 = EmojiOrder.STD_ORDER.getGroupOrder(cat1); 
-            
+
             String cat2 = getCategory(o2);
             int catOrder2 = EmojiOrder.STD_ORDER.getGroupOrder(cat2);
             if (catOrder1 != catOrder2) {
@@ -785,7 +806,7 @@ public String transform(String source) {
                 break main;
             }
             if (source.contains(EmojiData.ZWJ_HANDSHAKE_ZWJ)) {
-                temp = EmojiData.EMOJI_DATA.getFallbackName(source);
+                temp = EmojiData.EMOJI_DATA_BETA.getFallbackName(source);
                 break main;
             }
             switch(CountEmoji.Category.getBucket(source)) {
@@ -965,4 +986,16 @@ public String addEmojiVariants(String s1) {
     public String getVersionString() {
         return "candidates:" + DateFormat.getInstanceForSkeleton("yyyyMMdd", ULocale.ROOT).format(date);
     }
+
+    /** We don't expect to have any more of these */
+    @Override
+    public UnicodeSet getExplicitGender() {
+        return UnicodeSet.EMPTY;
+    }
+
+    /** We don't expect to have any more of these */
+    @Override
+    public UnicodeSet getMultiPersonGroupings() {
+        return UnicodeSet.EMPTY;
+    }
 }
diff --git a/unicodetools/org/unicode/tools/emoji/CountEmoji.java b/unicodetools/org/unicode/tools/emoji/CountEmoji.java
index d4b9f5710..22b9f78e3 100644
--- a/unicodetools/org/unicode/tools/emoji/CountEmoji.java
+++ b/unicodetools/org/unicode/tools/emoji/CountEmoji.java
@@ -342,7 +342,7 @@ enum Attribute {
         singleton, zwj, skin, gender, role, family, hair, dup
     }
 
-    enum Category {
+    public enum Category {
         character("char"), 
         keycap_seq,
         flag_seq,
@@ -393,6 +393,10 @@ public String toString() {
         public String toStringPlain() {
             return displayName;
         }
+        /** added to make migration easier */
+        static public Category getType(String s) {
+            return getBucket(s);
+        }
         static public Category getBucket(String s) {
             try {
                 String noVariants = EmojiData.removeEmojiVariants(s);
diff --git a/unicodetools/org/unicode/tools/emoji/EmojiData.java b/unicodetools/org/unicode/tools/emoji/EmojiData.java
index dd34fa270..6ad380881 100644
--- a/unicodetools/org/unicode/tools/emoji/EmojiData.java
+++ b/unicodetools/org/unicode/tools/emoji/EmojiData.java
@@ -16,10 +16,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.regex.Pattern;
 
-import javax.xml.stream.events.Characters;
-
 import org.unicode.cldr.draft.FileUtilities;
-import org.unicode.cldr.tool.GenerateBirth;
 import org.unicode.cldr.util.Annotations;
 import org.unicode.cldr.util.Annotations.AnnotationSet;
 import org.unicode.cldr.util.CldrUtility;
@@ -43,10 +40,7 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.ImmutableSet.Builder;
-import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Multimap;
-import com.google.common.collect.SortedSetMultimap;
 import com.google.common.collect.TreeMultimap;
 import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.lang.CharSequences;
@@ -55,9 +49,6 @@
 import com.ibm.icu.text.Transform;
 import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
-import com.ibm.icu.text.UnicodeSet.SpanCondition;
-import com.ibm.icu.text.UnicodeSetSpanner;
-import com.ibm.icu.text.UnicodeSetSpanner.CountMethod;
 import com.ibm.icu.util.ULocale;
 import com.ibm.icu.util.VersionInfo;
 
@@ -121,6 +112,7 @@ public enum DefaultPresentation {text, emoji}
     private UnicodeSet otherHuman;
     private UnicodeSet genderBase;
     private UnicodeMap<String> toNeutral;
+    private UnicodeSet multiPersonGrouping;
 
     public static final Splitter semi = Splitter.onPattern("[;#]").trimResults();
     public static final Splitter semiOnly = Splitter.onPattern(";").trimResults();
@@ -506,11 +498,13 @@ private EmojiData(VersionInfo version) {
 
         if (DEBUG) System.out.println("rawHairBases: " + rawHairBases.toPattern(false));
 
-        explicitGender.addAll(new UnicodeSet("[[👦-👩 👴 👵 🤴 👸 👲 🧕 🤵 👰 🤰 🤱 🎅 🤶 💃 🕺 🕴 👫-👭]]"))
+        explicitGender.addAll(new UnicodeSet("[[👦-👩 🧔 👴 👵 🤴 👸 👲 🧕 🤵 👰 🤰 🤱 🎅 🤶 💃 🕺 🕴 👫-👭]]"))
         .freeze();
 
         explicitHair.addAll(new UnicodeSet("[👱]"))
         .freeze();
+        
+        multiPersonGrouping = new UnicodeSet("[👯 🤼 👫-👭 💏 💑 👪 🤝]");
 
         hairBases.addAll(rawHairBases)
         .retainAll(modifierBases)
@@ -915,6 +909,7 @@ public UnicodeSet getSortingChars() {
     }
 
     public static final EmojiData EMOJI_DATA = of(Emoji.VERSION_TO_GENERATE);
+    public static final EmojiData EMOJI_DATA_BETA = of(Emoji.VERSION_BETA);
 
     public UnicodeSet getFlagSequences() {
         return flagSequences;
@@ -1387,6 +1382,7 @@ public static void main(String[] args) {
         UnicodeSet explicitGendered = new UnicodeSet()
                 .addAll(e11a.maleToOther.keySet())
                 .addAll(e11a.femaleToOther.keySet())
+                .add(new UnicodeSet("[🧔]"))
                 .freeze();
 
         UnicodeSet gendered = new UnicodeSet()
@@ -1394,6 +1390,7 @@ public static void main(String[] args) {
                 .addAll(e11a.femaleToOther.keySet())
                 .addAll(e11a.otherHuman)
                 .freeze();
+        
         UnicodeSet people = new UnicodeSet()
                 .addAll(EmojiOrder.BETA_ORDER.majorGroupings.getSet(MajorGroup.People))
                 .removeAll(EmojiOrder.BETA_ORDER.charactersToOrdering.getSet("body"))
@@ -1401,6 +1398,7 @@ public static void main(String[] args) {
                 .removeAll(EmojiOrder.BETA_ORDER.charactersToOrdering.getSet("clothing"))
                 .retainAll(e11a.allEmojiWithoutDefectives)
                 .freeze();
+        
         diff2("gendered", gendered, "people", people);
 
         System.out.println("genderBase:\t" + e11a.getGenderBase().size() + "\t" + e11a.getGenderBase().toPattern(false));
@@ -1891,4 +1889,9 @@ static UnicodeSet getWithoutMods(UnicodeSet chars) {
     public UnicodeSet getGenderBase() {
         return genderBase;
     }
+
+    @Override
+    public UnicodeSet getMultiPersonGroupings() {
+        return multiPersonGrouping;
+    }
 }
\ No newline at end of file
diff --git a/unicodetools/org/unicode/tools/emoji/EmojiDataSource.java b/unicodetools/org/unicode/tools/emoji/EmojiDataSource.java
index cfa8aa59e..d5eaa550a 100644
--- a/unicodetools/org/unicode/tools/emoji/EmojiDataSource.java
+++ b/unicodetools/org/unicode/tools/emoji/EmojiDataSource.java
@@ -55,5 +55,7 @@ public default UnicodeSet getEmojiForSortRules() {
     
     public String addEmojiVariants(String s1);
     public String getVersionString();
+    public UnicodeSet getExplicitGender();
+    public UnicodeSet getMultiPersonGroupings();
 }
 
diff --git a/unicodetools/org/unicode/tools/emoji/EmojiDataSourceCombined.java b/unicodetools/org/unicode/tools/emoji/EmojiDataSourceCombined.java
index 5f9c80fe2..bd32474b7 100644
--- a/unicodetools/org/unicode/tools/emoji/EmojiDataSourceCombined.java
+++ b/unicodetools/org/unicode/tools/emoji/EmojiDataSourceCombined.java
@@ -140,6 +140,18 @@ public String addEmojiVariants(String s1) {
     public String getVersionString() {
         return emojiData.getVersion() + " + " + candidates.getVersionString();
     }
+
+    @Override
+    public UnicodeSet getExplicitGender() {
+        return add(emojiData.getExplicitGender(),
+                candidates.getExplicitGender());
+    }
+
+    @Override
+    public UnicodeSet getMultiPersonGroupings() {
+        return add(emojiData.getMultiPersonGroupings(),
+                candidates.getMultiPersonGroupings());
+    }
     
 //    public static void main(String[] args) {
 //        UnicodeSet allChars = EMOJI_DATA.getAllEmojiWithDefectives();
diff --git a/unicodetools/org/unicode/tools/emoji/GenerateEmojiData.java b/unicodetools/org/unicode/tools/emoji/GenerateEmojiData.java
index 56149bdc3..d6ca5afb7 100644
--- a/unicodetools/org/unicode/tools/emoji/GenerateEmojiData.java
+++ b/unicodetools/org/unicode/tools/emoji/GenerateEmojiData.java
@@ -129,10 +129,15 @@ public static <T> void printData(UnicodeMap<String> extraNames) throws IOExcepti
         
         try (TempPrintWriter outText2 = new TempPrintWriter(OUTPUT_DIR, "internal/emoji-internal.txt")) {
             UnicodeSet emojiGenderBase = EmojiDataSourceCombined.EMOJI_DATA.getGenderBases();
+            UnicodeSet emojiExplicitGender = EmojiDataSourceCombined.EMOJI_DATA.getExplicitGender();
+            UnicodeSet emojiMultiPersonGroupings = EmojiDataSourceCombined.EMOJI_DATA.getMultiPersonGroupings();
             outText2.println(Utility.getBaseDataHeader("emoji-internal", 51, "Emoji Data Internal", Emoji.VERSION_STRING));
             
             
-            int width = maxLength("Emoji_Gender_Base");
+            int width = maxLength("Emoji_Gender_Base", 
+                    "Emoji_Explicit_Gender",
+                    "Multi_Person_Groupings"
+                    );
 
             //            outText2.println("# Warning: the format has changed from Version 1.0");
             outText2.println("# Format: ");
@@ -140,6 +145,8 @@ public static <T> void printData(UnicodeMap<String> extraNames) throws IOExcepti
             outText2.println("# Note: there is no guarantee as to the structure of whitespace or comments");
             outText2.println(ORDERING_NOTE);
             printer.show(outText2, "Emoji_Gender_Base", null, width, 14, emojiGenderBase, true, true, false);
+            printer.show(outText2, "Emoji_Explicit_Gender", null, width, 14, emojiExplicitGender, true, true, false);
+            printer.show(outText2, "Multi_Person_Groupings", null, width, 14, emojiMultiPersonGroupings, true, true, false);
             outText2.println("\n#EOF");
         }
 
diff --git a/unicodetools/org/unicode/tools/emoji/candidateData.txt b/unicodetools/org/unicode/tools/emoji/candidateData.txt
index 2a9e7be6a..3584461bb 100644
--- a/unicodetools/org/unicode/tools/emoji/candidateData.txt
+++ b/unicodetools/org/unicode/tools/emoji/candidateData.txt
@@ -443,104 +443,107 @@ Proposal=L2/17-082, L2/17-011, L2/16-147, L2/16130, L2/16-008, L2/14-173
 After=👱
 U+1F468 U+200D U+1F9B0 
 Name=man, red haired
-U+1F468 U+1F3FB U+200D U+1F9B0 
-Name=man, red haired: light skin tone
-U+1F468 U+1F3FC U+200D U+1F9B0 
-Name=man, red haired: medium-light skin tone
-U+1F468 U+1F3FD U+200D U+1F9B0 
-Name=man, red haired: medium skin tone
-U+1F468 U+1F3FE U+200D U+1F9B0 
-Name=man, red haired: medium-dark skin tone
-U+1F468 U+1F3FF U+200D U+1F9B0 
-Name=man, red haired: dark skin tone
-U+1F469 U+200D U+1F9B0 
+# U+1F468 U+1F3FB U+200D U+1F9B0 
+# Name=man, red haired: light skin tone
+# U+1F468 U+1F3FC U+200D U+1F9B0 
+# Name=man, red haired: medium-light skin tone
+# U+1F468 U+1F3FD U+200D U+1F9B0 
+# Name=man, red haired: medium skin tone
+# U+1F468 U+1F3FE U+200D U+1F9B0 
+# Name=man, red haired: medium-dark skin tone
+# U+1F468 U+1F3FF U+200D U+1F9B0 
+# Name=man, red haired: dark skin tone
 
+U+1F469 U+200D U+1F9B0 
 Name=woman, red haired
-U+1F469 U+1F3FB U+200D U+1F9B0 
-Name=woman, red haired: light skin tone
-U+1F469 U+1F3FC U+200D U+1F9B0 
-Name=woman, red haired: medium-light skin tone
-U+1F469 U+1F3FD U+200D U+1F9B0 
-Name=woman, red haired: medium skin tone
-U+1F469 U+1F3FE U+200D U+1F9B0 
-Name=woman, red haired: medium-dark skin tone
-U+1F469 U+1F3FF U+200D U+1F9B0 
-Name=woman, red haired: dark skin tone
+# U+1F469 U+1F3FB U+200D U+1F9B0 
+# Name=woman, red haired: light skin tone
+# U+1F469 U+1F3FC U+200D U+1F9B0 
+# Name=woman, red haired: medium-light skin tone
+# U+1F469 U+1F3FD U+200D U+1F9B0 
+# Name=woman, red haired: medium skin tone
+# U+1F469 U+1F3FE U+200D U+1F9B0 
+# Name=woman, red haired: medium-dark skin tone
+# U+1F469 U+1F3FF U+200D U+1F9B0 
+# Name=woman, red haired: dark skin tone
 
 U+1F468 U+200D U+1F9B1 
 Name=man, curly haired
-U+1F468 U+1F3FB U+200D U+1F9B1 
-Name=man, curly haired: light skin tone
-U+1F468 U+1F3FC U+200D U+1F9B1 
-Name=man, curly haired: medium-light skin tone
-U+1F468 U+1F3FD U+200D U+1F9B1 
-Name=man, curly haired: medium skin tone
-U+1F468 U+1F3FE U+200D U+1F9B1 
-Name=man, curly haired: medium-dark skin tone
-U+1F468 U+1F3FF U+200D U+1F9B1 
-Name=man, curly haired: dark skin tone
+# U+1F468 U+1F3FB U+200D U+1F9B1 
+# Name=man, curly haired: light skin tone
+# U+1F468 U+1F3FC U+200D U+1F9B1 
+# Name=man, curly haired: medium-light skin tone
+# U+1F468 U+1F3FD U+200D U+1F9B1 
+# Name=man, curly haired: medium skin tone
+# U+1F468 U+1F3FE U+200D U+1F9B1 
+# Name=man, curly haired: medium-dark skin tone
+# U+1F468 U+1F3FF U+200D U+1F9B1 
+# Name=man, curly haired: dark skin tone
+
 U+1F469 U+200D U+1F9B1 
 Name=woman, curly haired
-U+1F469 U+1F3FB U+200D U+1F9B1 
-Name=woman, curly haired: light skin tone
-U+1F469 U+1F3FC U+200D U+1F9B1 
-Name=woman, curly haired: medium-light skin tone
-U+1F469 U+1F3FD U+200D U+1F9B1 
-Name=woman, curly haired: medium skin tone
-U+1F469 U+1F3FE U+200D U+1F9B1 
-Name=woman, curly haired: medium-dark skin tone
-U+1F469 U+1F3FF U+200D U+1F9B1 
-Name=woman, curly haired: dark skin tone
+# U+1F469 U+1F3FB U+200D U+1F9B1 
+# Name=woman, curly haired: light skin tone
+# U+1F469 U+1F3FC U+200D U+1F9B1 
+# Name=woman, curly haired: medium-light skin tone
+# U+1F469 U+1F3FD U+200D U+1F9B1 
+# Name=woman, curly haired: medium skin tone
+# U+1F469 U+1F3FE U+200D U+1F9B1 
+# Name=woman, curly haired: medium-dark skin tone
+# U+1F469 U+1F3FF U+200D U+1F9B1 
+# Name=woman, curly haired: dark skin tone
 
 U+1F468 U+200D U+1F9B3 
 Name=man, white haired
-U+1F468 U+1F3FB U+200D U+1F9B3 
-Name=man, white haired: light skin tone
-U+1F468 U+1F3FC U+200D U+1F9B3 
-Name=man, white haired: medium-light skin tone
-U+1F468 U+1F3FD U+200D U+1F9B3 
-Name=man, white haired: medium skin tone
-U+1F468 U+1F3FE U+200D U+1F9B3 
-Name=man, white haired: medium-dark skin tone
-U+1F468 U+1F3FF U+200D U+1F9B3 
-Name=man, white haired: dark skin tone
+# U+1F468 U+1F3FB U+200D U+1F9B3 
+# Name=man, white haired: light skin tone
+# U+1F468 U+1F3FC U+200D U+1F9B3 
+# Name=man, white haired: medium-light skin tone
+# U+1F468 U+1F3FD U+200D U+1F9B3 
+# Name=man, white haired: medium skin tone
+# U+1F468 U+1F3FE U+200D U+1F9B3 
+# Name=man, white haired: medium-dark skin tone
+# U+1F468 U+1F3FF U+200D U+1F9B3 
+# Name=man, white haired: dark skin tone
+
 U+1F469 U+200D U+1F9B3 
 Name=woman, white haired
-U+1F469 U+1F3FB U+200D U+1F9B3 
-Name=woman, white haired: light skin tone
-U+1F469 U+1F3FC U+200D U+1F9B3 
-Name=woman, white haired: medium-light skin tone
-U+1F469 U+1F3FD U+200D U+1F9B3 
-Name=woman, white haired: medium skin tone
-U+1F469 U+1F3FE U+200D U+1F9B3 
-Name=woman, white haired: medium-dark skin tone
-U+1F469 U+1F3FF U+200D U+1F9B3 
-Name=woman, white haired: dark skin tone
+# U+1F469 U+1F3FB U+200D U+1F9B3 
+# Name=woman, white haired: light skin tone
+# U+1F469 U+1F3FC U+200D U+1F9B3 
+# Name=woman, white haired: medium-light skin tone
+# U+1F469 U+1F3FD U+200D U+1F9B3 
+# Name=woman, white haired: medium skin tone
+# U+1F469 U+1F3FE U+200D U+1F9B3 
+# Name=woman, white haired: medium-dark skin tone
+# U+1F469 U+1F3FF U+200D U+1F9B3 
+# Name=woman, white haired: dark skin tone
 
 U+1F468 U+200D U+1F9B2 
 Name=man, bald
-U+1F468 U+1F3FB U+200D U+1F9B2 
-Name=man, bald: light skin tone
-U+1F468 U+1F3FC U+200D U+1F9B2 
-Name=man, bald: medium-light skin tone
-U+1F468 U+1F3FD U+200D U+1F9B2 
-Name=man, bald: medium skin tone
-U+1F468 U+1F3FE U+200D U+1F9B2 
-Name=man, bald: medium-dark skin tone
-U+1F468 U+1F3FF U+200D U+1F9B2 
-Name=man, bald: dark skin tone
+# U+1F468 U+1F3FB U+200D U+1F9B2 
+# Name=man, bald: light skin tone
+# U+1F468 U+1F3FC U+200D U+1F9B2 
+# Name=man, bald: medium-light skin tone
+# U+1F468 U+1F3FD U+200D U+1F9B2 
+# Name=man, bald: medium skin tone
+# U+1F468 U+1F3FE U+200D U+1F9B2 
+# Name=man, bald: medium-dark skin tone
+# U+1F468 U+1F3FF U+200D U+1F9B2 
+# Name=man, bald: dark skin tone
+
 U+1F469 U+200D U+1F9B2 
 Name=woman, bald
-U+1F469 U+1F3FB U+200D U+1F9B2 
-Name=woman, bald: light skin tone
-U+1F469 U+1F3FC U+200D U+1F9B2 
-Name=woman, bald: medium-light skin tone
-U+1F469 U+1F3FD U+200D U+1F9B2 
-Name=woman, bald: medium skin tone
-U+1F469 U+1F3FE U+200D U+1F9B2 
-Name=woman, bald: medium-dark skin tone
-U+1F469 U+1F3FF U+200D U+1F9B2 
-Name=woman, bald: dark skin tone
+# U+1F469 U+1F3FB U+200D U+1F9B2 
+# Name=woman, bald: light skin tone
+# U+1F469 U+1F3FC U+200D U+1F9B2 
+# Name=woman, bald: medium-light skin tone
+# U+1F469 U+1F3FD U+200D U+1F9B2 
+# Name=woman, bald: medium skin tone
+# U+1F469 U+1F3FE U+200D U+1F9B2 
+# Name=woman, bald: medium-dark skin tone
+# U+1F469 U+1F3FF U+200D U+1F9B2 
+# Name=woman, bald: dark skin tone
 
 Proposal=L2/18-018
 After= ♣
diff --git a/unicodetools/org/unicode/tools/emoji/unittest/TestAll.java b/unicodetools/org/unicode/tools/emoji/unittest/TestAll.java
new file mode 100644
index 000000000..2a73389aa
--- /dev/null
+++ b/unicodetools/org/unicode/tools/emoji/unittest/TestAll.java
@@ -0,0 +1,32 @@
+package org.unicode.tools.emoji.unittest;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.unicode.cldr.draft.FileUtilities;
+
+import com.ibm.icu.dev.test.TestFmwk;
+
+public class TestAll extends TestFmwk.TestGroup {
+    public static void main(String[] args) throws Exception {
+        new TestAll().run(args);
+    }
+
+    public TestAll() {
+        super(getDirNames(TestAll.class));
+    }
+
+    private static String[] getDirNames(Class<?> class1) {
+        String dirName = FileUtilities.getRelativeFileName(TestAll.class, ".");
+        List<String> result = new ArrayList<>();
+        for (String s : new File(dirName).list()) {
+            if (s.endsWith(".java") || s.endsWith(".class")) {
+                if (!s.startsWith("TestAll.")) {
+                    result.add(s.substring(0, s.lastIndexOf('.')));
+                }
+            }
+        };
+        return result.toArray(new String[result.size()]);
+    }
+}
diff --git a/unicodetools/org/unicode/tools/emoji/unittest/TestCandidateData.java b/unicodetools/org/unicode/tools/emoji/unittest/TestCandidateData.java
index d47bdf0e8..12691f7e6 100644
--- a/unicodetools/org/unicode/tools/emoji/unittest/TestCandidateData.java
+++ b/unicodetools/org/unicode/tools/emoji/unittest/TestCandidateData.java
@@ -6,12 +6,15 @@
 
 public class TestCandidateData extends TestFmwkPlus {
     public static void main(String[] args) {
-        System.out.println("Version: " + Emoji.VERSION_TO_GENERATE + "; isBeta: " + Emoji.IS_BETA);
         new TestCandidateData().run(args);
     }
     
     CandidateData CANDIDATES = CandidateData.getInstance();
     
+    public void TestA() {
+        System.out.print(" (Version: " + CANDIDATES.getVersionString() + ") ");
+    }
+    
     public void TestEmojification() {
         assertTrue("X265F: chess pawn", CANDIDATES.getAllCharacters().contains(0x265F));
         assertTrue("X267E: infinite", CANDIDATES.getAllCharacters().contains(0x267E));
diff --git a/unicodetools/org/unicode/tools/emoji/unittest/TestCombinedEmojiData.java b/unicodetools/org/unicode/tools/emoji/unittest/TestCombinedEmojiData.java
new file mode 100644
index 000000000..9133014db
--- /dev/null
+++ b/unicodetools/org/unicode/tools/emoji/unittest/TestCombinedEmojiData.java
@@ -0,0 +1,108 @@
+package org.unicode.tools.emoji.unittest;
+
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Set;
+
+import org.unicode.tools.emoji.EmojiDataSourceCombined;
+
+public class TestCombinedEmojiData extends TestEmojiData {
+
+    public TestCombinedEmojiData() {
+        super(new EmojiDataSourceCombined());
+    }
+
+    public static void main(String[] args) {
+        new TestCombinedEmojiData().run(args);
+    }
+
+    public void TestA() {
+        super.TestA();
+        boolean errorShown = false;
+        Set<String> myMethods = new HashSet<>();
+        for (Method method : TestCombinedEmojiData.class.getMethods()) {
+            Class<?> declaringClass = method.getDeclaringClass();
+            if (declaringClass == TestCombinedEmojiData.class) {
+                myMethods.add(method.getName());
+            }
+        }
+
+        for (Method method : TestEmojiData.class.getMethods()) {
+            Class<?> declaringClass = method.getDeclaringClass();
+            if (declaringClass == TestEmojiData.class) {
+                String name = method.getName();
+                if (myMethods.contains(name)) {
+                    continue;
+                }
+                String lower = name.toLowerCase(Locale.ROOT);
+                if (!lower.contains("test")) {
+                    continue;
+                }
+                if (!errorShown) {
+                    errln("Missing methods from TestEmojiData. Need to add these so hack works:\n");
+                    errorShown = true;
+                }
+                System.out.println("    @Override\n    public void " + name
+                        + "() {\n        super." + name
+                        + "();\n    }\n");
+            }
+        };
+    }
+
+    @Override
+    public void TestPublicEmojiTest() {
+        super.TestPublicEmojiTest();
+    }
+
+    @Override
+    public void TestHandshake() {
+        super.TestHandshake();
+    }
+
+    @Override
+    public void TestCompoundNames() {
+        super.TestCompoundNames();
+    }
+
+    @Override
+    public void TestDefectives() {
+        super.TestDefectives();
+    }
+
+    @Override
+    public void TestFlags() {
+        super.TestFlags();
+    }
+
+//    @Override
+//    public void TestZwjCategories() {
+//        super.TestZwjCategories();
+//    }
+
+    @Override
+    public void TestOrderRules() {
+        super.TestOrderRules();
+    }
+
+    @Override
+    public void TestAnnotationsCompleteness() {
+        super.TestAnnotationsCompleteness();
+    }
+    
+    @Override
+    public void TestGroupEmoji() {
+        super.TestGroupEmoji();
+    }
+    
+    @Override
+    public void TestExplicitGender() {
+        super.TestExplicitGender();
+    }
+
+    @Override
+    public void TestCombinations() {
+        super.TestCombinations();
+    }
+
+}
diff --git a/unicodetools/org/unicode/tools/emoji/unittest/TestEmojiData.java b/unicodetools/org/unicode/tools/emoji/unittest/TestEmojiData.java
index 1357bf82b..d43466b47 100644
--- a/unicodetools/org/unicode/tools/emoji/unittest/TestEmojiData.java
+++ b/unicodetools/org/unicode/tools/emoji/unittest/TestEmojiData.java
@@ -1,14 +1,17 @@
 package org.unicode.tools.emoji.unittest;
 
+import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.unicode.cldr.draft.FileUtilities;
 import org.unicode.cldr.unittest.TestFmwkPlus;
 import org.unicode.cldr.util.StandardCodes.LstrType;
 import org.unicode.cldr.util.Validity;
@@ -18,24 +21,106 @@
 import org.unicode.tools.emoji.Emoji;
 import org.unicode.tools.emoji.EmojiAnnotations;
 import org.unicode.tools.emoji.EmojiData;
+import org.unicode.tools.emoji.EmojiData.VariantStatus;
+import org.unicode.tools.emoji.EmojiDataSource;
+import org.unicode.tools.emoji.EmojiDataSourceCombined;
 import org.unicode.tools.emoji.EmojiOrder;
+import org.unicode.tools.emoji.GenerateEmojiData;
 
+import com.google.common.base.Splitter;
 import com.ibm.icu.dev.util.CollectionUtilities;
 import com.ibm.icu.dev.util.UnicodeMap;
 import com.ibm.icu.text.CollationElementIterator;
 import com.ibm.icu.text.RuleBasedCollator;
-import com.ibm.icu.text.UTF16;
 import com.ibm.icu.text.UnicodeSet;
+import com.ibm.icu.util.ICUException;
 
 public class TestEmojiData extends TestFmwkPlus {
+    final EmojiData released = EmojiData.of(Emoji.VERSION_LAST_RELEASED);
+    final EmojiDataSource beta;
 
     public static void main(String[] args) {
-        System.out.println("Version: " + Emoji.VERSION_TO_GENERATE + "; isBeta: " + Emoji.IS_BETA);
         new TestEmojiData().run(args);
     }
     
+    /**
+     * We structure the test this way so that we can run it with two different sets of data.
+     */
+    public TestEmojiData(EmojiDataSource beta) {
+        this.beta = beta;
+    }
+
+    public TestEmojiData() {
+        this(EmojiData.of(Emoji.VERSION_BETA));
+    }
+    
+    public void TestA() {
+        System.out.print(" Version: " + beta.getVersionString()
+                + "; class: " + beta.getClass()
+                );
+    }
+
+    public static final Splitter semi = Splitter.onPattern("[;#]").trimResults();
+
+    public void TestPublicEmojiTest() {
+        if (beta instanceof EmojiDataSourceCombined) {
+            return; // only test the beta stuff without combining
+        }
+        UnicodeMap<VariantStatus> tests = new UnicodeMap<>();
+        for (String line : FileUtilities.in(GenerateEmojiData.OUTPUT_DIR, "emoji-test.txt")) {
+                int hashPos = line.indexOf('#');
+                if (hashPos >= 0) {
+                    line = line.substring(0, hashPos);
+                }
+                if (line.isEmpty()) continue;
+                List<String> list = semi.splitToList(line);
+                String source = Utility.fromHex(list.get(0));
+                //# subgroup: face-concerned
+                // 2639 FE0F                                  ; fully-qualified     # ☹️ frowning face
+                VariantStatus variantStatus = VariantStatus.forString(list.get(1));
+                tests.put(source, variantStatus);
+        }
+        tests.freeze();
+        assertEqualsUS(VariantStatus.full.toString(), 
+                "emoji-test", 
+                tests.getSet(VariantStatus.full), 
+                "EmojiData", 
+                new UnicodeSet(beta.getBasicSequences())
+                .addAll(beta.getKeycapSequences())
+                .addAll(beta.getFlagSequences())
+                .addAll(beta.getTagSequences())
+                .addAll(beta.getModifierSequences())
+                .addAll(beta.getZwjSequencesNormal())
+                .removeAll(new UnicodeSet("[🇦-🇿🏻-🏿🦰-🦳{#️}{*️}{0️}{1️}{2️}{3️}{4️}{5️}{6️}{7️}{8️}{9️}]"))
+                );
+        assertEqualsUS(VariantStatus.component.toString(), 
+                "emoji-test", 
+                tests.getSet(VariantStatus.component), 
+                "EmojiData", 
+                new UnicodeSet(beta.getEmojiComponents())
+                .removeAll(new UnicodeSet("[#*0-9‍⃣️🇦-🇿󠀠-󠁿]"))
+                );
+//        assertEqualsUS(VariantStatus.other + " = emoji", 
+//                "?", 
+//                new UnicodeSet(tests.getSet(VariantStatus.other)).add(tests.getSet(VariantStatus.initial)), "?", new UnicodeSet(beta.getAllEmojiWithDefectives()).removeAll(beta.getAllEmojiWithoutDefectives()));
+    }
+    
+    private void assertEqualsUS(String message, String s1Name, UnicodeSet s1, String s2Name, UnicodeSet s2) {
+        if (s1.equals(s2)) {
+            return;
+        }
+        assertContains(message, s1Name, s1, s2Name, s2);
+        assertContains(message, s2Name, s2, s1Name, s1);
+    }
+
+    private void assertContains(String message, String s1Name, UnicodeSet s1, String s2Name, UnicodeSet s2) {
+        UnicodeSet s2minuss1 = new UnicodeSet(s2).removeAll(s1);
+        if (!s2minuss1.isEmpty()) {
+            errln(message + ", " + s2Name + " - " + s1Name + " ≠ ∅: " + s2minuss1.toPattern(false));
+        }
+    }
+
     public void TestHandshake() {
-        EmojiData beta = EmojiData.of(Emoji.VERSION_BETA);
         beta.getName("👩"); // warm up
         assertEquals("👩‍🤝‍👩", "two women holding hands", beta.getName("👩‍🤝‍👩"));
         assertEquals("👩🏿‍🤝‍👩🏻", "two women holding hands: dark skin tone, light skin tone", beta.getName("👩🏿‍🤝‍👩🏻"));
@@ -44,7 +129,6 @@ public void TestHandshake() {
     }
     
     public void TestCompoundNames() {
-        EmojiData beta = EmojiData.of(Emoji.VERSION_BETA);
         beta.getName("👩"); // warm up
         assertEquals("🚶🏻‍♂️", "man walking: light skin tone", beta.getName("🚶🏻‍♂️"));
         assertEquals("🧍", "person standing", beta.getName("🧍"));
@@ -54,14 +138,12 @@ public void TestCompoundNames() {
     }
 
     public void TestDefectives() {
-        EmojiData beta = EmojiData.of(Emoji.VERSION_BETA);
-        EmojiData released = EmojiData.of(Emoji.VERSION_LAST_RELEASED);
         UnicodeSet excluded = new UnicodeSet("[#*0-9🇦-🇿]");
 
-        for (EmojiData ed : Arrays.asList(released, beta)) {
+        for (EmojiDataSource ed : Arrays.asList(released, beta)) {
             if (ed.getAllEmojiWithDefectives().containsSome(Emoji.DEFECTIVE_COMPONENTS)) {
                 errln("getChars contains defectives " 
-                        + new UnicodeSet().addAll(ed.getChars()).retainAll(Emoji.DEFECTIVE_COMPONENTS));
+                        + new UnicodeSet().addAll(ed.getAllEmojiWithoutDefectives()).retainAll(Emoji.DEFECTIVE_COMPONENTS));
             }
         }
         if (beta.getExtendedPictographic().containsSome(excluded)) {
@@ -93,15 +175,18 @@ public void TestFlags() {
             }
         }
         logln("Should be flags: " + shouldBeFlagEmoji.toPattern(false));
-        assertEquals("Contains all good regions", UnicodeSet.EMPTY, new UnicodeSet(shouldBeFlagEmoji).removeAll(EmojiData.EMOJI_DATA.getChars()));
+        assertEquals("Contains all good regions", UnicodeSet.EMPTY, new UnicodeSet(shouldBeFlagEmoji).removeAll(beta.getAllEmojiWithoutDefectives()));
         logln("Should not be flags: " + shouldNOTBeFlagEmoji.toPattern(false));
-        assertEquals("Contains no bad regions", UnicodeSet.EMPTY, new UnicodeSet(shouldNOTBeFlagEmoji).retainAll(EmojiData.EMOJI_DATA.getChars()));
+        assertEquals("Contains no bad regions", UnicodeSet.EMPTY, new UnicodeSet(shouldNOTBeFlagEmoji).retainAll(beta.getAllEmojiWithoutDefectives()));
     }
 
-    public void TestZwjCategories () {
+    /**
+     * Not working yet, so blocking for now.
+     */
+    public void T_estZwjCategories () {
         UnicodeMap<String> chars = new UnicodeMap<>();
-        for (String s : EmojiData.EMOJI_DATA.getZwjSequencesNormal()) {
-            CountEmoji.ZwjType zwjType = CountEmoji.ZwjType.getType(s);
+        for (String s : beta.getZwjSequencesNormal()) {
+            CountEmoji.Category zwjType = CountEmoji.Category.getType(s);
             String grouping = EmojiOrder.STD_ORDER.charactersToOrdering.get(s);
             chars.put(s, zwjType + "\t" + grouping);
         }
@@ -110,16 +195,16 @@ public void TestZwjCategories () {
             System.out.println(value + "\t" + set.size() + "\t" + set.toPattern(false));
         }
         Set<String> testSet = new TreeSet<>(EmojiOrder.STD_ORDER.codepointCompare);
-        EmojiData.EMOJI_DATA.getAllEmojiWithoutDefectives().addAllTo(testSet);
+        beta.getAllEmojiWithoutDefectives().addAllTo(testSet);
 
-        CountEmoji.ZwjType oldZwjType = CountEmoji.ZwjType.na; 
+        CountEmoji.Category oldZwjType = null; 
         String last = "";
         for (String s : testSet) {
-            CountEmoji.ZwjType zwjType = CountEmoji.ZwjType.getType(s);
-            if (zwjType == CountEmoji.ZwjType.na) {
+            CountEmoji.Category zwjType = CountEmoji.Category.getType(s);
+            if (zwjType == null) {
                 continue;
             }
-            if (zwjType.compareTo(oldZwjType) < 0 && oldZwjType != CountEmoji.ZwjType.na) {
+            if (oldZwjType != null && zwjType.compareTo(oldZwjType) < 0) {
                 errln(zwjType + " < " + oldZwjType 
                         + ", but they should be ascending"
                         + "\n\t" + oldZwjType + "\t" + last 
@@ -130,26 +215,30 @@ public void TestZwjCategories () {
         }
     }
 
-    public void TestOrderRules() throws Exception {
+    public void TestOrderRules() {
         int SKIPTO = 400;
         RuleBasedCollator ruleBasedCollator;
-        ruleBasedCollator = new RuleBasedCollator("&a <*🍱🍘🍙🍚🍛🍜🍝🍠🍢🍣🍤🍥🍡");
+        try {
+            ruleBasedCollator = new RuleBasedCollator("&a <*🍱🍘🍙🍚🍛🍜🍝🍠🍢🍣🍤🍥🍡");
+        } catch (Exception e1) {
+            throw new ICUException(e1);
+        }
         //        UnicodeSet ruleSet = new UnicodeSet();
-        //        for (String s : EmojiData.EMOJI_DATA.getEmojiForSortRules()) {
+        //        for (String s : beta.getEmojiForSortRules()) {
         //            // skip modifiers not in zwj, as hack
         //            if (true || s.contains(Emoji.JOINER_STR) || EmojiData.MODIFIERS.containsNone(s)) {
         //                ruleSet.add(s);
         //            }
         //        }
         StringBuilder outText = new StringBuilder();
-        EmojiOrder.STD_ORDER.appendCollationRules(outText, EmojiData.EMOJI_DATA.getEmojiForSortRules(), EmojiOrder.GENDER_NEUTRALS);
+        EmojiOrder.STD_ORDER.appendCollationRules(outText, beta.getEmojiForSortRules(), EmojiOrder.GENDER_NEUTRALS);
         String rules = outText.toString();
-        UnicodeSet modifierBases = EmojiData.EMOJI_DATA.getModifierBases();
-        UnicodeSet modifiers = new UnicodeSet(EmojiData.EMOJI_DATA.getModifiers()).addAll(Emoji.HAIR_BASE).freeze();
+        UnicodeSet modifierBases = beta.getModifierBases();
+        UnicodeSet modifiers = new UnicodeSet(EmojiData.getModifiers()).addAll(Emoji.HAIR_BASE).freeze();
         try {
             ruleBasedCollator = new RuleBasedCollator(rules);
             Set<String> testSet = new TreeSet<>(EmojiOrder.STD_ORDER.codepointCompare);
-            EmojiData.EMOJI_DATA.getAllEmojiWithDefectives().addAllTo(testSet);
+            beta.getAllEmojiWithDefectives().addAllTo(testSet);
             String secondToLastItem = "";
             String lastItem = "";
             String highestWithModifierBase = null;
@@ -195,18 +284,23 @@ public void TestOrderRules() throws Exception {
                     errln("Fails when adding line " + line);
                     errln(showSorting(oldRules));
                     errln(oldRules);
-                    throw (e2);
+                    throw new ICUException(e2);
                 }
                 oldRules = rules;
             }
-            throw (e);
+            throw new ICUException(e);
         }
         logln(showSorting(rules));
         logln(rules);
     }
 
-    private String showSorting(String oldRules) throws Exception {
-        RuleBasedCollator ruleBasedCollator = new RuleBasedCollator(oldRules);
+    private String showSorting(String oldRules) {
+        RuleBasedCollator ruleBasedCollator;
+        try {
+            ruleBasedCollator = new RuleBasedCollator(oldRules);
+        } catch (Exception e1) {
+            throw new ICUException(e1);
+        }
         UnicodeSet chars = ruleBasedCollator.getTailoredSet();
         StringBuilder buffer = new StringBuilder();
         StringBuilder pbuffer = new StringBuilder();
@@ -248,7 +342,7 @@ private EmojiAnnotations checkAnnotations(final String localeStr, EmojiAnnotatio
         EmojiAnnotations em = new EmojiAnnotations(localeStr, EmojiOrder.STD_ORDER.codepointCompare);
         Set<String> missing = new LinkedHashSet<>();
 
-        TreeSet<String> sorted = EmojiData.EMOJI_DATA.getAllEmojiWithoutDefectives()
+        TreeSet<String> sorted = beta.getAllEmojiWithoutDefectives()
                 .addAllTo(new TreeSet<>(EmojiOrder.STD_ORDER.codepointCompare));
         int maxLen = 32;
 
@@ -276,7 +370,7 @@ private EmojiAnnotations checkAnnotations(final String localeStr, EmojiAnnotatio
                 if (false && em2 == null && status != EmojiAnnotations.Status.missing) {
                     String rem = EmojiData.MODIFIERS.stripFrom(s, false);
                     String s1 = EmojiData.MODIFIERS.stripFrom(s, true);
-                    s1 = EmojiData.EMOJI_DATA.addEmojiVariants(s1); // modifiers replace EV characters.
+                    s1 = beta.addEmojiVariants(s1); // modifiers replace EV characters.
                     Set<String> strippedKeywords = em.getKeys(s1);
                     String strippedTts = em.getShortName(s1);
                     EmojiAnnotations.Status strippedStatus = em.getStatus(s1);
@@ -295,7 +389,7 @@ private EmojiAnnotations checkAnnotations(final String localeStr, EmojiAnnotatio
             }
             if (status != EmojiAnnotations.Status.found) {
                 if (em2 == null) {
-                    String oldTts = EmojiData.EMOJI_DATA.getName(s);
+                    String oldTts = beta.getName(s);
                     Set<String> oldAnnotations = keywords == null ? new TreeSet<>() : new TreeSet<>(keywords);
                     oldAnnotations.addAll(Arrays.asList(oldTts.split("\\s+")));
                     oldAnnotations = oldAnnotations.isEmpty() ? Collections.singleton("???") : oldAnnotations;
@@ -339,4 +433,26 @@ private EmojiAnnotations checkAnnotations(final String localeStr, EmojiAnnotatio
         }
         return em;
     }
+    
+    public void TestGroupEmoji() {
+        assertContains("", "modifierBases", beta.getModifierBases(), "multipersonGroupings", beta.getMultiPersonGroupings());
+        assertContains("", "👯🤼", beta.getGenderBases(), "multipersonGroupings", new UnicodeSet("[👯🤼]"));
+        for (String s : beta.getExplicitGender()) {
+            System.out.print(s);
+        }
+    }
+    
+    public void TestExplicitGender() {
+        assertEqualsUS("", 
+                "list from UTS 51", new UnicodeSet("[👦-👨 🧔 👩 👴 👵 🤴 👸 👲 🧕 🤵 👰 🤰 🤱 🎅 🤶 💃 🕺 🕴 👫-👭]"), 
+                "emojiData", beta.getExplicitGender());
+    }
+    
+    public void TestCombinations() {
+        assertContains("", "zwj-sequences", beta.getZwjSequencesNormal(), 
+                "woman with probing cane", new UnicodeSet("[{\\x{1F469}\u200D\\x{1F9AF}\uFE0F}]"));
+        assertContains("", "zwj-sequences", beta.getZwjSequencesNormal(), 
+                "woman with probing cane; light skin", new UnicodeSet("[{\\x{1F469}\\x{1F3FB}\u200D\\x{1F9AF}\uFE0F}]"));
+        // 1F469 200D 1F9AF FE0F
+    }
 }