check010_MetadataFormats: improved diagnostics for schema file location

4Science · Jan 19, 2019 · 70f6895 · 70f6895
1 parent 1ab5ba3
commit 70f6895
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/org/eurocris/openaire/cris/validator/CRISValidator.java b/src/main/java/org/eurocris/openaire/cris/validator/CRISValidator.java
@@ -130,6 +130,11 @@ public class CRISValidator {
 	 */
 	public static final String CURRENT_XML_SCHEMA_URL_PREFIX = OPENAIRE_CERIF_SCHEMAS_ROOT + "current/";
 
+	/**
+	 * The name of the XML Schema file. 
+	 */
+	public static final String OPENAIRE_CERIF_SCHEMA_FILENAME = "openaire-cerif-profile.xsd";
+
 	/**
 	 * The connection stream factory to use for getting the response stream from a connection.
 	 */
@@ -329,8 +334,8 @@ public boolean test( final MetadataFormatType mf ) {
 					try {
 						final DocumentBuilder db = dbf.newDocumentBuilder();
 						final String schemaUrl = mf.getSchema();
-						assertTrue( schemaUrl.startsWith( OPENAIRE_CERIF_SCHEMAS_ROOT ) );
-						assertTrue( schemaUrl.endsWith( "/openaire-cerif-profile.xsd" ) );
+						assertTrue( "Please reference the official XML Schema at " + OPENAIRE_CERIF_SCHEMAS_ROOT + " (2)", schemaUrl.startsWith( OPENAIRE_CERIF_SCHEMAS_ROOT ) );
+						assertTrue( "The schema file should be " + OPENAIRE_CERIF_SCHEMA_FILENAME + " (2)", schemaUrl.endsWith( "/" + OPENAIRE_CERIF_SCHEMA_FILENAME ) );
 						final String realSchemaUrl = ( schemaUrl.equals( CURRENT_XML_SCHEMA_URL_PREFIX + "openaire-cerif-profile.xsd" ) ) 
 									? this.getClass().getResource( "/schemas/openaire-cerif-profile.xsd" ).toExternalForm()
 									: schemaUrl;