HHH-6271 Adding some more tests

hibernate-core/src/main/java/org/hibernate/internal/util/xml/ErrorLogger.java

@@ -39,7 +39,10 @@ import org.hibernate.internal.CoreMessageLogger;
  */
 public class ErrorLogger implements ErrorHandler, Serializable {
 
-    private static final CoreMessageLogger LOG = Logger.getMessageLogger(CoreMessageLogger.class, ErrorLogger.class.getName());
+	private static final CoreMessageLogger LOG = Logger.getMessageLogger(
+			CoreMessageLogger.class,
+			ErrorLogger.class.getName()
+	);
 
 	private SAXParseException error; // capture the initial error
 
@@ -56,8 +59,11 @@ public class ErrorLogger implements ErrorHandler, Serializable {
 	 * {@inheritDoc}
 	 */
 	public void error(SAXParseException error) {
-        LOG.parsingXmlError(error.getLineNumber(), error.getMessage());
-        if (this.error == null) this.error = error;
+		//LOG.parsingXmlError(error.getLineNumber(), error.getMessage());
+		// if error has not been set yet, keep the first error
+		if ( this.error == null ) {
+			this.error = error;
+		}
 	}
 
 	/**
@@ -71,7 +77,7 @@ public class ErrorLogger implements ErrorHandler, Serializable {
 	 * {@inheritDoc}
 	 */
 	public void warning(SAXParseException warn) {
-        LOG.parsingXmlWarning(error.getLineNumber(), error.getMessage());
+		LOG.parsingXmlWarning( error.getLineNumber(), error.getMessage() );
 	}
 
 	public void reset() {

hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/NonExistentOrmVersionTest.java

@@ -0,0 +1,57 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2011 by Red Hat Inc and/or its affiliates or by
+ * third-party contributors as indicated by either @author tags or express
+ * copyright attribution statements applied by the authors.  All
+ * third-party contributions are distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA  02110-1301  USA
+ */
+package org.hibernate.test.annotations.xml.ejb3;
+
+import java.io.InputStream;
+
+import org.junit.Test;
+
+import org.hibernate.MappingException;
+import org.hibernate.cfg.Configuration;
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
+
+import static org.junit.Assert.assertTrue;
+
+@TestForIssue(jiraKey = "HHH-6271")
+public class NonExistentOrmVersionTest extends BaseCoreFunctionalTestCase {
+	@Test
+	public void testNonExistentOrmVersion() {
+		try {
+			Configuration config = buildConfiguration();
+			String xmlFileName = "org/hibernate/test/annotations/xml/ejb3/orm5.xml";
+			InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream( xmlFileName );
+			config.addInputStream( is );
+			config.buildMappings();
+		}
+		catch ( MappingException mappingException ) {
+			Throwable cause = mappingException.getCause();
+			assertTrue(
+					cause.getMessage().contains(
+							"Value '3.0' of attribute 'version' of element 'entity-mappings' is not valid"
+					)
+			);
+		}
+	}
+}

hibernate-core/src/matrix/java/org/hibernate/test/annotations/xml/ejb3/OrmVersion1SupportedTest.java

@@ -49,11 +49,6 @@ public class OrmVersion1SupportedTest extends BaseCoreFunctionalTestCase {
 		s.close();
 	}
 
-	@Override
-	protected Class[] getAnnotatedClasses() {
-		return new Class[] { Light.class };
-	}
-
 	@Override
 	protected String[] getXmlFiles() {
 		return new String[] { "org/hibernate/test/annotations/xml/ejb3/orm2.xml" };

hibernate-core/src/test/resources/org/hibernate/test/annotations/xml/ejb3/orm5.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<entity-mappings xmlns="http://java.sun.com/xml/ns/persistence/orm"
+                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                 xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm orm_1_0.xsd"
+                 version="3.0"
+        >
+    <!-- use orm_1_0 on purpose (backward compatibility test -->
+    <package>org.hibernate.test.annotations.xml.ejb3</package>
+    <named-query name="find.the.light">
+        <query>select l from Light l</query>
+    </named-query>
+    <entity class="Light" access="FIELD" metadata-complete="true">
+        <attributes>
+            <id name="name">
+                <column name="fld_id"/>
+            </id>
+            <basic name="power"></basic>
+        </attributes>
+    </entity>
+</entity-mappings>