From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../src/test/java/org/onap/vid/utils/TreeTest.java | 63 ++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 vid-app-common/src/test/java/org/onap/vid/utils/TreeTest.java

(limited to 'vid-app-common/src/test/java/org/onap/vid/utils/TreeTest.java')

diff --git a/vid-app-common/src/test/java/org/onap/vid/utils/TreeTest.java b/vid-app-common/src/test/java/org/onap/vid/utils/TreeTest.java
new file mode 100644
index 000000000..8691032b2
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/utils/TreeTest.java
@@ -0,0 +1,63 @@
+package org.onap.vid.utils;
+
+import com.google.common.collect.ImmutableList;
+import org.jetbrains.annotations.NotNull;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+import static org.junit.Assert.assertFalse;
+import static org.testng.Assert.*;
+
+public class TreeTest {
+
+    @NotNull
+    protected Tree<String> buildTreeForTest() {
+        Tree<String> tree = new Tree<>("a");
+        tree.addPath("b","c","d");
+        tree.addPath("b","cc","dd");
+        tree.addPath("1","2","dd");
+        return tree;
+    }
+
+    @DataProvider
+    public static Object[][] pathsToFind() {
+        return new Object[][]{
+                {ImmutableList.of("b","c","d"), true},
+                {ImmutableList.of("b","c"), true},
+                {ImmutableList.of("b","cc","dd"), true},
+                {ImmutableList.of("b","cc","d"), false},
+                {ImmutableList.of("1","2","dd"), true},
+                {ImmutableList.of("b"), true},
+                {ImmutableList.of("c"), false},
+                {ImmutableList.of("z", "z", "z", "z", "z"), false},
+        };
+    }
+
+    @Test(dataProvider="pathsToFind")
+    public void whenBuildTree_nodesFoundsInRoute(List<String> path, boolean isFound) {
+        Tree<String> tree = buildTreeForTest();
+        assertEquals(isFound, tree.isPathExist(path));
+    }
+
+    @Test(dataProvider="pathsToFind")
+    public void whenBuildTree_subTreeGetRight(List<String> path, boolean isFound) {
+        Tree<String> tree = buildTreeForTest();
+        if (isFound) {
+            assertNotNull(tree.getSubTree(path));
+        }
+        else {
+            assertNull(tree.getSubTree(path));
+        }
+    }
+
+    @Test
+    public void whenBuildTree_getSubTreeAsExpected() {
+        Tree<String> tree = buildTreeForTest();
+        Tree<String> subTree = tree.getSubTree("b","c");
+        assertEquals(subTree.getRootValue(), "c");
+        assertTrue(subTree.isPathExist("d"));
+        assertFalse(subTree.isPathExist("b","c","d"));
+    }
+}
-- 
cgit 1.2.3-korg