Merge "Merge from ECOMP's repository"

1 files changed, 39 insertions, 0 deletions

diff --git a/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java b/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java
new file mode 100644
index 000000000..e9d2cfd44
--- /dev/null
+++ b/vid-app-common/src/test/java/org/onap/vid/controller/PropertyControllerTest.java
@@ -0,0 +1,39 @@
+package org.onap.vid.controller;
+
+import org.junit.Test;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class PropertyControllerTest {
+
+	private PropertyController createTestSubject() {
+		return new PropertyController();
+	}
+
+	@Test
+	public void testWelcome() throws Exception {
+		PropertyController testSubject;
+		HttpServletRequest request = null;
+		ModelAndView result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.welcome(request);
+	}
+
+
+	@Test
+	public void testGetProperty() throws Exception {
+		PropertyController testSubject;
+		String name = "";
+		String defaultvalue = "";
+		HttpServletRequest request = null;
+		ResponseEntity<String> result;
+
+		// default test
+		testSubject = createTestSubject();
+		result = testSubject.getProperty(name, defaultvalue, request);
+	}
+}
\ No newline at end of file