[AAI-168 Amsterdam] add simple format test 75/7475/1
authorur326r <ur326r@att.com>
Mon, 14 Aug 2017 18:24:42 +0000 (14:24 -0400)
committerur326r <ur326r@att.com>
Mon, 14 Aug 2017 18:34:24 +0000 (14:34 -0400)
Change-Id: Ie9a569ddd6cd414f7fa29c787f1e5c379e08c407
Signed-off-by: ur326r <ur326r@att.com>
aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java [new file with mode: 0644]
aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v10.xml
aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v11.xml
aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v8.xml
aai-resources/src/test/resources/bundleconfig-local/etc/oxm/aai_oxm_v9.xml
aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v10.xml
aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v11.xml
aai-resources/src/test/resources/org/openecomp/aai/introspection/aai_oxm_v9.xml

diff --git a/aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java b/aai-resources/src/test/java/org/openecomp/aai/transforms/JoltTestUtil.java
new file mode 100644 (file)
index 0000000..7df2790
--- /dev/null
@@ -0,0 +1,61 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * org.openecomp.aai
+ * ================================================================================
+ * Copyright (C) 2017 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.aai.transforms;
+
+
+import java.io.IOException;
+
+import org.junit.Assert;
+
+import com.bazaarvoice.jolt.ArrayOrderObliviousDiffy;
+import com.bazaarvoice.jolt.Diffy;
+import com.bazaarvoice.jolt.JsonUtils;
+
+public class JoltTestUtil {
+
+    private static final Diffy diffy = new Diffy();
+    private static final Diffy arrayOrderObliviousDiffy = new ArrayOrderObliviousDiffy();
+
+    public static void runDiffy( String failureMessage, Object expected, Object actual ) throws IOException {
+        runDiffy( diffy, failureMessage, expected, actual );
+    }
+
+    public static void runDiffy( Object expected, Object actual ) throws IOException {
+        runDiffy( diffy, "Failed", expected, actual );
+    }
+
+    public static void runArrayOrderObliviousDiffy( String failureMessage, Object expected, Object actual ) throws IOException {
+        runDiffy( arrayOrderObliviousDiffy, failureMessage, expected, actual );
+    }
+
+    public static void runArrayOrderObliviousDiffy( Object expected, Object actual ) throws IOException {
+        runDiffy( arrayOrderObliviousDiffy, "Failed", expected, actual );
+    }
+
+
+    private static void runDiffy( Diffy diffy, String failureMessage, Object expected, Object actual ) {
+        String actualObject = JsonUtils.toPrettyJsonString( actual );
+        Diffy.Result result = diffy.diff( expected, actual );
+        if (!result.isEmpty()) {
+            Assert.fail( "\nActual object\n" + actualObject + "\n" + failureMessage + "\nDiffy output\n" + result.toString());
+        }
+    }
+}
index 647b6f1..a97c53c 100644 (file)
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
index fb44778..9a2ebc3 100644 (file)
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
index 1cd8119..7e4e538 100644 (file)
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
index 436fb2f..297a3f9 100644 (file)
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
index 3124e92..d807bc3 100644 (file)
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
index 903f21f..f8fa53d 100644 (file)
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
index 36bea63..158eef8 100644 (file)
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
-                                               <xml-property name="description" value="Encryption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
+                                               <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">