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>
---
 .../ResourceInProgressStatusCommandTest.java       | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 vid-app-common/src/test/java/org/onap/vid/job/command/ResourceInProgressStatusCommandTest.java

(limited to 'vid-app-common/src/test/java/org/onap/vid/job/command/ResourceInProgressStatusCommandTest.java')

diff --git a/vid-app-common/src/test/java/org/onap/vid/job/command/ResourceInProgressStatusCommandTest.java b/vid-app-common/src/test/java/org/onap/vid/job/command/ResourceInProgressStatusCommandTest.java
new file mode 100644
index 000000000..9ec49a2e5
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/job/command/ResourceInProgressStatusCommandTest.java
@@ -0,0 +1,40 @@
+package org.onap.vid.job.command;
+
+import org.mockito.InjectMocks;
+import org.mockito.MockitoAnnotations;
+import org.onap.vid.job.Job;
+import org.onap.vid.job.NextCommand;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.DataProvider;
+import org.testng.annotations.Test;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
+
+
+public class ResourceInProgressStatusCommandTest {
+
+    @InjectMocks
+    private ResourceInProgressStatusCommand commandUnderTest = new ResourceInProgressStatusCommand();
+
+    @BeforeMethod
+    public void initMocks() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @DataProvider
+    public static Object[][] givenStatusToExpectedStatus() {
+        return new Object[][]{
+                {Job.JobStatus.IN_PROGRESS, Job.JobStatus.IN_PROGRESS},
+                {Job.JobStatus.FAILED, Job.JobStatus.FAILED},
+                {Job.JobStatus.COMPLETED, Job.JobStatus.COMPLETED}
+        };
+    }
+
+    @Test(dataProvider = "givenStatusToExpectedStatus")
+    public void whenGetStatusFromMso_returnExpectedNextCommand(Job.JobStatus jobStatus, Job.JobStatus expectedNextStatus) {
+        NextCommand nextCommand = commandUnderTest.processJobStatus(jobStatus);
+        assertThat(nextCommand.getStatus(), is(expectedNextStatus));
+        assertThat(nextCommand.getCommand(), is(commandUnderTest));
+    }
+}
-- 
cgit 1.2.3-korg