Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

94076: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94047: MNT-12705 : Cannot upgrade Xalan to 2.7.2 because DbObjectXMLTransformerTest fails
         - Test has been changed according to new SAXTransformer behavior


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95040 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:31:42 +00:00
parent aadc84dfc6
commit 4c2947f897

View File

@@ -27,6 +27,7 @@ import static org.alfresco.util.schemacomp.SchemaCompTestingUtils.pk;
import static org.alfresco.util.schemacomp.SchemaCompTestingUtils.table;
import static org.alfresco.util.schemacomp.SchemaCompTestingUtils.sequence;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import java.io.BufferedReader;
import java.io.IOException;
@@ -79,12 +80,13 @@ public class SchemaToXMLTest
// Check the first couple of lines, details tests of the actual content
// are performed by DbObjectXMLTransformerTest
BufferedReader reader = new BufferedReader(new StringReader(writer.toString()));
assertEquals("<?xml version=\"1.0\" encoding=\"UTF-8\"?>", reader.readLine());
String firstLine = reader.readLine();
assertTrue(firstLine.startsWith("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"));
String xsd =
"xmlns=\"http://www.alfresco.org/repo/db-schema\" " +
"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
"xsi:schemaLocation=\"http://www.alfresco.org/repo/db-schema db-schema.xsd\"";
assertEquals("<schema " + xsd + " name=\"alfresco\" dbprefix=\"my-prefix\" version=\"501\" tablecolumnorder=\"true\">", reader.readLine());
assertTrue(firstLine.endsWith("<schema " + xsd + " name=\"alfresco\" dbprefix=\"my-prefix\" version=\"501\" tablecolumnorder=\"true\">"));
assertEquals(" <validators>", reader.readLine());
}
}