Issue #31.

Author: highsource

tests/issues/src/main/resources/schema.xsd

@@ -273,4 +273,15 @@
 		<xs:attribute name="testBoolean" type="xs:boolean" default="true"/>
 	</xs:complexType>
 
+	<xs:simpleType name="issueGH31Type">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Male"/>
+			<xs:enumeration value="Female"/>
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:complexType name="issueGH31ComplexType">
+		<xs:attribute name="testEnum" type="issueGH31Type" default="Male"/>
+	</xs:complexType>
+
 </xs:schema>

tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/GH31Test.java

@@ -0,0 +1,36 @@
+package org.jvnet.jaxb2_commons.tests.issues;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.jvnet.jaxb2_commons.lang.EnumValue;
+import org.jvnet.jaxb2_commons.lang.JAXBToStringStrategy;
+import org.jvnet.jaxb2_commons.lang.ToStringStrategy2;
+import org.jvnet.jaxb2_commons.locator.ObjectLocator;
+
+public class GH31Test {
+
+	@Test
+	public void considersDefaultValuesInMerge() {
+		final IssueGH31ComplexType t = new IssueGH31ComplexType();
+
+		final ToStringStrategy2 s = new JAXBToStringStrategy() {
+			public boolean isUseIdentityHashCode() {
+				return false;
+			}
+
+			public StringBuilder append(ObjectLocator locator,
+					StringBuilder buffer, Object value) {
+
+				if (value instanceof EnumValue<?>) {
+					return super.append(locator, buffer,
+							((EnumValue<?>) value).enumValue());
+				} else {
+					return super.append(locator, buffer, value);
+				}
+			};
+		};
+		Assert.assertEquals(
+				"org.jvnet.jaxb2_commons.tests.issues.IssueGH31ComplexType[testEnum=Male(default)]",
+				t.append(null, new StringBuilder(), s).toString());
+	}
+}

tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunIssuesPlugin.java

@@ -19,6 +19,7 @@ protected void configureMojo(AbstractXJC2Mojo mojo) {
 	public List<String> getArgs() {
 		final List<String> args = new ArrayList<String>(super.getArgs());
 //		args.add("-XelementWrapper");
+		args.add("-XenumValue");
 		args.add("-XtoString");
 		args.add("-Xequals");
 		args.add("-XhashCode");

tests/issues/src/test/java/org/jvnet/jaxb2_commons/tests/issues/RunPlugins.java

@@ -31,7 +31,7 @@ public void compilesSchema() throws Exception {
 				"target/generated-sources/xjc", "-extension", "-XhashCode",
 				"-Xequals", "-XtoString", "-Xcopyable", "-Xmergeable",
 				"-Xinheritance", "-Xsetters", "-Xsetters-mode=direct",
-				"-Xwildcard"
+				"-Xwildcard", "-XenumValue"
 		// "-XsimpleToString"
 
 		};