UI-Lion:
- BundleStitcherTest now working!
- Expand aliases in from lines.
- Added unit tests for parsing of from lines.

Change-Id: I65d343f1283fd60f46879431c37299c6ecd5a36e
diff --git a/core/api/src/test/java/org/onosproject/ui/lion/stitch/BundleStitcherTest.java b/core/api/src/test/java/org/onosproject/ui/lion/stitch/BundleStitcherTest.java
new file mode 100644
index 0000000..a362deb
--- /dev/null
+++ b/core/api/src/test/java/org/onosproject/ui/lion/stitch/BundleStitcherTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2017-present Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.onosproject.ui.lion.stitch;
+
+import org.junit.Test;
+import org.onosproject.ui.AbstractUiTest;
+import org.onosproject.ui.lion.LionBundle;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Unit tests for {@link BundleStitcher}.
+ */
+public class BundleStitcherTest extends AbstractUiTest {
+
+    private static final String TEST_RESOURCE_BASE =
+            "/org/onosproject/ui/lion/stitchtests";
+
+    private static final String[] CARD_GAME_1_KEYS = {
+            "of",
+            "flush",
+            "full_house",
+            "pair",
+            "three_oak",
+
+            "ace",
+            "king",
+            "queen",
+            "jack",
+            "ten",
+
+            "spades",
+            "clubs",
+    };
+
+    private static final String[] CARD_GAME_1_ENGLISH = {
+            "of",
+            "Flush",
+            "Full House",
+            "Pair",
+            "Three of a Kind",
+
+            "Ace",
+            "King",
+            "Queen",
+            "Jack",
+            "Ten",
+
+            "Spades",
+            "Clubs",
+    };
+
+
+    private LionBundle lion;
+
+    private BundleStitcher testStitcher() {
+        return new BundleStitcher(TEST_RESOURCE_BASE);
+    }
+
+    private void verifyItems(LionBundle lion, String[] values) {
+        final int max = values.length;
+        for (int i = 0; i < max; i++) {
+            String key = CARD_GAME_1_KEYS[i];
+            String expValue = values[i];
+            String actValue = lion.getValue(key);
+            assertEquals("wrong mapping", expValue, actValue);
+        }
+    }
+
+    @Test
+    public void cardGame1English() {
+        title("cardGame1English");
+        lion = testStitcher().stitch("CardGame1");
+        print(lion);
+        assertEquals("wrong key", "CardGame1", lion.id());
+        assertEquals("bad key count", 12, lion.size());
+        verifyItems(lion, CARD_GAME_1_ENGLISH);
+    }
+}