Merge "added openpojo test for policy entities beans"

2 files changed, 65 insertions, 6 deletions

diff --git a/common/src/main/java/org/openecomp/mso/client/policy/entities/DecisionAttributes.java b/common/src/main/java/org/openecomp/mso/client/policy/entities/DecisionAttributes.java
index 9f40639e68..655f71f823 100644
--- a/common/src/main/java/org/openecomp/mso/client/policy/entities/DecisionAttributes.java
+++ b/common/src/main/java/org/openecomp/mso/client/policy/entities/DecisionAttributes.java
@@ -34,9 +34,9 @@ public class DecisionAttributes {
 	@JsonProperty("ServiceType")
 	private String serviceType;
 	@JsonProperty("VNFType")
-	private String vNFType;
+	private String VNFType;
 	@JsonProperty("BB_ID")
-	private String bbID;
+	private String BBID;
 	@JsonProperty("WorkStep")
 	private String workStep;
 	@JsonProperty("ErrorCode")
@@ -54,22 +54,22 @@ public class DecisionAttributes {
 
 	@JsonProperty("VNFType")
 	public String getVNFType() {
-		return vNFType;
+		return VNFType;
 	}
 
 	@JsonProperty("VNFType")
 	public void setVNFType(String vNFType) {
-		this.vNFType = vNFType;
+		this.VNFType = vNFType;
 	}
 
 	@JsonProperty("BB_ID")
 	public String getBBID() {
-		return bbID;
+		return BBID;
 	}
 
 	@JsonProperty("BB_ID")
 	public void setBBID(String bBID) {
-		this.bbID = bBID;
+		this.BBID = bBID;
 	}
 
 	@JsonProperty("WorkStep")
diff --git a/common/src/test/java/org/openecomp/mso/client/policy/entities/PolicyEntitiesTest.java b/common/src/test/java/org/openecomp/mso/client/policy/entities/PolicyEntitiesTest.java
new file mode 100644
index 0000000000..f526e10249
--- /dev/null
+++ b/common/src/test/java/org/openecomp/mso/client/policy/entities/PolicyEntitiesTest.java
@@ -0,0 +1,59 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * 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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.mso.client.policy.entities;
+
+import org.junit.Test;
+
+import com.openpojo.reflection.PojoClass;
+import com.openpojo.reflection.PojoClassFilter;
+import com.openpojo.reflection.filters.FilterEnum;
+import com.openpojo.reflection.filters.FilterPackageInfo;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+public class PolicyEntitiesTest {
+
+	private PojoClassFilter filterTestClasses = new FilterTestClasses();
+
+	@Test
+	public void pojoStructure() {
+		test("org.openecomp.mso.client.policy.entities");
+	}
+
+	private void test(String pojoPackage) {
+		Validator validator = ValidatorBuilder.create()
+				.with(new GetterMustExistRule())
+				.with(new SetterMustExistRule())
+				.with(new SetterTester())
+				.with(new GetterTester())
+				.build();
+		validator.validate(pojoPackage, new FilterPackageInfo(), new FilterEnum(), filterTestClasses);
+	}
+	private static class FilterTestClasses implements PojoClassFilter {
+		public boolean include(PojoClass pojoClass) {
+			return !pojoClass.getSourcePath().contains("/test-classes/");
+		}
+	}
+}