Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / java / org / onap / vid / mso / RestObjectWithRequestInfo.java

diff --git a/vid-app-common/src/test/java/org/onap/fusionapp/controller/NetMapTest.java b/vid-app-common/src/main/java/org/onap/vid/mso/RestObjectWithRequestInfo.java
similarity index 50%
rename from vid-app-common/src/test/java/org/onap/fusionapp/controller/NetMapTest.java
rename to vid-app-common/src/main/java/org/onap/vid/mso/RestObjectWithRequestInfo.java
index 7a4c560..98cc808 100644 (file)
--- a/vid-app-common/src/test/java/org/onap/fusionapp/controller/NetMapTest.java
+++ b/vid-app-common/src/main/java/org/onap/vid/mso/RestObjectWithRequestInfo.java
@@ -18,32 +18,44 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.fusionapp.controller;
+package org.onap.vid.mso;
 
-import org.junit.Assert;
-import org.junit.Test;
-import org.springframework.test.web.servlet.ResultActions;
-import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.http.HttpMethod;
 
-import org.onap.fusion.core.MockApplicationContextTestSuite;
+public class RestObjectWithRequestInfo<T> {
 
-/**
- * The Class NetMapTest.
- */
+    private final RestObject<T> restObject;
+    private final String requestedUrl;
+    private final int httpCode;
+    private final String rawData;
+    private final HttpMethod httpMethod;
+
+    public RestObjectWithRequestInfo(HttpMethod httpMethod, String requestedUrl, RestObject<T> restObject, int httpCode, String rawData) {
+        this.restObject = restObject;
+        this.requestedUrl = requestedUrl;
+        this.httpCode = httpCode;
+        this.rawData = rawData;
+        this.httpMethod = httpMethod;
+    }
+
+    public RestObject<T> getRestObject() {
+        return restObject;
+    }
 
-public class NetMapTest extends MockApplicationContextTestSuite {
-       
-       /**
-        * Test get net map.
-        *
-        * @throws Exception the exception
-        */
-//     @Test
-       public void testGetNetMap() throws Exception {
-               ResultActions ra =getMockMvc().perform(MockMvcRequestBuilders.get("/net_map"));
-               //Assert.assertEquals(UrlAccessRestrictedException.class,ra.andReturn().getResolvedException().getClass());
-               Assert.assertEquals("net_map_int",ra.andReturn().getModelAndView().getModel().get("frame_int"));
-       }
-       
+    public String getRequestedUrl() {
+        return requestedUrl;
+    }
 
+    public int getHttpCode() {
+        return httpCode;
+    }
+
+    public String getRawData() {
+        return rawData;
+    }
+
+    public HttpMethod getHttpMethod() {
+        return httpMethod;
+    }
 }
+