From 687aff68dd3f12d853630626999efeba30343475 Mon Sep 17 00:00:00 2001 From: Matt Warhaftig Date: Sun, 11 Oct 2015 16:55:49 -0400 Subject: [PATCH] HBASE-14584 Reenable toXml REST tests with use of model to verify. --- .../apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java | 3 --- .../java/org/apache/hadoop/hbase/rest/model/TestModelBase.java | 7 +++---- .../hadoop/hbase/rest/model/TestNamespacesInstanceModel.java | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java index 8b61b2c..b31ecf9 100644 --- a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java +++ b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java @@ -25,10 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.xml.bind.annotation.XmlAccessOrder; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAccessorOrder; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlTransient; @@ -51,7 +49,6 @@ import org.apache.hadoop.hbase.rest.protobuf */ @XmlRootElement(name="NamespaceProperties") @XmlAccessorType(XmlAccessType.FIELD) -@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL) @InterfaceAudience.Private public class NamespacesInstanceModel implements Serializable, ProtobufMessageHandler { diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java index 427bb9f..9cba485 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java @@ -112,11 +112,10 @@ public abstract class TestModelBase extends TestCase { checkModel(fromXML(AS_XML)); } - /** - * COMMENTED OUT FOR NOW. GIVES DIFFERENT RESULTS ON JDK7 vs JDK8 public void testToXML() throws Exception { - assertEquals(AS_XML, toXML(buildTestModel())); - }**/ + // Uses fromXML to check model because XML element ordering can be random. + checkModel(fromXML(toXML(buildTestModel()))); + } public void testToJSON() throws Exception { try { diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java index af75aa2..fe371d5 100644 --- a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java +++ b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java @@ -86,7 +86,7 @@ public class TestNamespacesInstanceModel extends TestModelBase