Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-14584 TestNamespacesInstanceModel fails on jdk8 

Signed-off-by: Andrew Purtell <apurtell@apache.org>
This commit is contained in:
Matt Warhaftig 2015-10-11 16:55:49 -04:00 committed by Andrew Purtell
parent 4d5ac316b6
commit 5b3a49d835
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/model/NamespacesInstanceModel.java
View File

@ -25,10 +25,8 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import javax.xml.bind.annotation.XmlAccessOrder;
import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAccessorOrder;
import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient; import javax.xml.bind.annotation.XmlTransient;
@ -51,7 +49,6 @@ import org.apache.hadoop.hbase.rest.protobuf
*/ */
@XmlRootElement(name="NamespaceProperties") @XmlRootElement(name="NamespaceProperties")
@XmlAccessorType(XmlAccessType.FIELD) @XmlAccessorType(XmlAccessType.FIELD)
@XmlAccessorOrder(XmlAccessOrder.ALPHABETICAL)
@InterfaceAudience.Private @InterfaceAudience.Private
public class NamespacesInstanceModel implements Serializable, ProtobufMessageHandler { public class NamespacesInstanceModel implements Serializable, ProtobufMessageHandler {

7
hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestModelBase.java
View File

@ -111,11 +111,10 @@ public abstract class TestModelBase<T> extends TestCase {
checkModel(fromXML(AS_XML)); checkModel(fromXML(AS_XML));
} }
/**
* COMMENTED OUT FOR NOW. GIVES DIFFERENT RESULTS ON JDK7 vs JDK8
public void testToXML() throws Exception { 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 { public void testToJSON() throws Exception {
try { try {

2
hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/model/TestNamespacesInstanceModel.java
View File

@ -85,7 +85,7 @@ public class TestNamespacesInstanceModel extends TestModelBase<NamespacesInstanc
checkModel(buildTestModel()); checkModel(buildTestModel());
} }
@Ignore("Marshalling and unmarshalling differ in jdk7 and jdk8") @Test @Test
public void testFromXML() throws Exception { public void testFromXML() throws Exception {
checkModel(fromXML(AS_XML)); checkModel(fromXML(AS_XML));
} }