1 files changed, 20 insertions, 27 deletions
diff --git a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnumTest.java b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnumTest.java
index 2b517d1c57..066b8ec37e 100644
--- a/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnumTest.java
+++ b/catalog-dao/src/test/java/org/openecomp/sdc/be/dao/jsongraph/types/EdgePropertyEnumTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,33 +20,26 @@
 
 package org.openecomp.sdc.be.dao.jsongraph.types;
 
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
 
+import org.junit.Test;
 
 public class EdgePropertyEnumTest {
 
-	private EdgePropertyEnum createTestSubject() {
-		return EdgePropertyEnum.STATE;
-	}
-
-	
-	@Test
-	public void testGetProperty() throws Exception {
-		EdgePropertyEnum testSubject;
-		String result;
-
-		// default test
-		testSubject = createTestSubject();
-		result = testSubject.getProperty();
-	}
-
-	
-	@Test
-	public void testGetByProperty() throws Exception {
-		String property = "";
-		EdgePropertyEnum result;
-
-		// default test
-		result = EdgePropertyEnum.getByProperty(property);
-	}
+    @Test
+    public void testEnumValues() {
+        for (final Object value : EdgePropertyEnum.values()) {
+            assertThat(value).isNotNull().isInstanceOf(EdgePropertyEnum.class);
+        }
+    }
+
+    @Test
+    public void testGetByProperty() throws Exception {
+        String property = "";
+        EdgePropertyEnum result;
+
+        // default test
+        result = EdgePropertyEnum.getByProperty(property);
+		assertThat(result).isNull();
+    }
 }