X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fauth-core%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Faaf%2Fauth%2Frequest%2Ftest%2FRosettaCompare.java;h=c09ded282defd4cbfbdfff9d046094342520bba7;hb=1296352d8eafee57f982a4342ad79ada4aa56d28;hp=5130f8cb9739abc23479330e548239948fe899dd;hpb=71037c39a37d3549dcfe31926832a657744fbe05;p=aaf%2Fauthz.git diff --git a/auth/auth-core/src/test/java/org/onap/aaf/auth/request/test/RosettaCompare.java b/auth/auth-core/src/test/java/org/onap/aaf/auth/request/test/RosettaCompare.java index 5130f8cb..c09ded28 100644 --- a/auth/auth-core/src/test/java/org/onap/aaf/auth/request/test/RosettaCompare.java +++ b/auth/auth-core/src/test/java/org/onap/aaf/auth/request/test/RosettaCompare.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. @@ -29,38 +29,38 @@ import org.onap.aaf.misc.rosetta.env.RosettaData; import org.onap.aaf.misc.rosetta.env.RosettaEnv; public abstract class RosettaCompare { - protected Class cls; - private static int count = 0; - - public RosettaCompare(Class cls) { - this.cls = cls; - } - - public void run(RosettaEnv env) throws APIException { - RosettaDF nsrDF = env.newDataFactory(cls); - compare(nsrDF.newData().option(Data.PRETTY),newOne(),this); - } - - private void compare(RosettaData rdt, T t, RosettaCompare comp) throws APIException { - System.out.println("########### Testing " + cls.getName() + " ##############"); - String s = rdt.load(t).out(TYPE.JSON).asString(); - System.out.println(s); - T t2 = rdt.in(TYPE.JSON).load(s).asObject(); - comp.compare(t, t2); - - System.out.println(); - - s = rdt.load(t).out(TYPE.XML).asString(); - System.out.println(s); - t2 = rdt.in(TYPE.XML).load(s).asObject(); - comp.compare(t, t2); - } - - public synchronized static String instance() { - return "_"+ ++count; - } - - public abstract void compare(T t1, T t2); - public abstract T newOne(); - + protected Class cls; + private static int count = 0; + + public RosettaCompare(Class cls) { + this.cls = cls; + } + + public void run(RosettaEnv env) throws APIException { + RosettaDF nsrDF = env.newDataFactory(cls); + compare(nsrDF.newData().option(Data.PRETTY),newOne(),this); + } + + private void compare(RosettaData rdt, T t, RosettaCompare comp) throws APIException { + //System.out.println("########### Testing " + cls.getName() + " ##############"); + String s = rdt.load(t).out(TYPE.JSON).asString(); + //System.out.println(s); + T t2 = rdt.in(TYPE.JSON).load(s).asObject(); + comp.compare(t, t2); + + //System.out.println(); + + s = rdt.load(t).out(TYPE.XML).asString(); + //System.out.println(s); + t2 = rdt.in(TYPE.XML).load(s).asObject(); + comp.compare(t, t2); + } + + public synchronized static String instance() { + return "_"+ ++count; + } + + public abstract void compare(T t1, T t2); + public abstract T newOne(); + } \ No newline at end of file