You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/11/17 22:26:32 UTC
[3/4] hbase git commit: HBASE-14584 TestNamespacesInstanceModel fails
on jdk8
HBASE-14584 TestNamespacesInstanceModel fails on jdk8
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/be873bbd
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/be873bbd
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/be873bbd
Branch: refs/heads/branch-1.2
Commit: be873bbda647280c4cc406ac77e640515f753c9a
Parents: c178595
Author: Matt Warhaftig <mw...@gmail.com>
Authored: Sun Oct 11 16:55:49 2015 -0400
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Nov 17 13:16:04 2015 -0800
----------------------------------------------------------------------
.../hadoop/hbase/rest/model/NamespacesInstanceModel.java | 3 ---
.../org/apache/hadoop/hbase/rest/model/TestModelBase.java | 7 +++----
.../hadoop/hbase/rest/model/TestNamespacesInstanceModel.java | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/be873bbd/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java
----------------------------------------------------------------------
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 {
http://git-wip-us.apache.org/repos/asf/hbase/blob/be873bbd/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java
----------------------------------------------------------------------
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 f8add0a..293110a 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
@@ -111,11 +111,10 @@ public abstract class TestModelBase<T> 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 {
http://git-wip-us.apache.org/repos/asf/hbase/blob/be873bbd/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java
----------------------------------------------------------------------
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 a13895e..c1bf0c8 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
@@ -85,7 +85,7 @@ public class TestNamespacesInstanceModel extends TestModelBase<NamespacesInstanc
checkModel(buildTestModel());
}
- @Ignore("Marshalling and unmarshalling differ in jdk7 and jdk8") @Test
+ @Test
public void testFromXML() throws Exception {
checkModel(fromXML(AS_XML));
}