Author: mwalker_23 Date: 2009-12-03 16:24:13 -0500 (Thu, 03 Dec 2009) New Revision: 1621 Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestStringToXmlTransform.java trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materialization/TestMaterializedViewScriptGenerator.java trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java trunk/runtime/src/test/java/com/metamatrix/platform/security/api/TestAuthorizationPolicyFactory.java trunk/test-integration/common/src/test/java/com/metamatrix/systemmodel/TestSystemVirtualModel.java Log: Fixes to remove line feed chars and use File.separator for file paths, to make the build work in Windows properly. Modified: trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestStringToXmlTransform.java =================================================================== --- trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestStringToXmlTransform.java 2009-12-03 21:20:54 UTC (rev 1620) +++ trunk/common-core/src/test/java/com/metamatrix/common/types/basic/TestStringToXmlTransform.java 2009-12-03 21:24:13 UTC (rev 1621) @@ -46,7 +46,7 @@ StringToSQLXMLTransform transform = new StringToSQLXMLTransform(); SQLXML xmlValue = (SQLXML)transform.transformDirect(xml); - assertEquals(xml, xmlValue.getString()); + assertEquals(xml.replaceAll("[\r]", ""), xmlValue.getString().replaceAll("[\r]", "")); } public void testBadXML() { Modified: trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materialization/TestMaterializedViewScriptGenerator.java =================================================================== --- trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materialization/TestMaterializedViewScriptGenerator.java 2009-12-03 21:20:54 UTC (rev 1620) +++ trunk/common-internal/src/test/java/com/metamatrix/vdb/edit/materialization/TestMaterializedViewScriptGenerator.java 2009-12-03 21:24:13 UTC (rev 1621) @@ -226,7 +226,7 @@ String actual = FileUtil.read(new FileReader(actualFile)).trim(); String expected = FileUtil.read(new FileReader(UnitTestUtil.getTestDataFile("/materializedView/expected/" + expectedFileName))).trim(); //$NON-NLS-1$ - assertEquals(StringUtilities.removeChars(expected, new char[] {'\r'}), actual); + assertEquals(expected.replaceAll("[\r]", ""), actual.replaceAll("[\r]", "")); actualFile.delete(); } Modified: trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java =================================================================== --- trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java 2009-12-03 21:20:54 UTC (rev 1620) +++ trunk/runtime/src/main/java/com/metamatrix/dqp/embedded/services/EmbeddedVDBService.java 2009-12-03 21:24:13 UTC (rev 1621) @@ -22,6 +22,7 @@ package com.metamatrix.dqp.embedded.services; +import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -162,8 +163,8 @@ public int getFileVisibility(String vdbName, String vdbVersion, String pathInVDB) throws MetaMatrixComponentException { - String modelName = StringUtil.getFirstToken(StringUtil.getLastToken(pathInVDB, "/"), "."); //$NON-NLS-1$ //$NON-NLS-2$ - + String modelName = StringUtil.getFirstToken(StringUtil.getLastToken(pathInVDB, File.separator), "."); //$NON-NLS-1$ //$NON-NLS-2$ + // If this is any of the Public System Models, like JDBC,ODBC system models if(VDBArchive.isSystemModelWithSystemTableType(modelName)){ return ModelInfo.PUBLIC; Modified: trunk/runtime/src/test/java/com/metamatrix/platform/security/api/TestAuthorizationPolicyFactory.java =================================================================== --- trunk/runtime/src/test/java/com/metamatrix/platform/security/api/TestAuthorizationPolicyFactory.java 2009-12-03 21:20:54 UTC (rev 1620) +++ trunk/runtime/src/test/java/com/metamatrix/platform/security/api/TestAuthorizationPolicyFactory.java 2009-12-03 21:24:13 UTC (rev 1621) @@ -92,9 +92,8 @@ //add doc to test against char[] result = AuthorizationPolicyFactory.exportPolicies(policies); String expected = FileUtil.read(new FileReader(UnitTestUtil.getTestDataPath()+File.separator+"permissions.xml")); //$NON-NLS-1$ - String actual = new String(result).replaceAll("\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ - - assertEquals(expected, actual); + //String actual = new String(result).replaceAll("\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(expected.replaceAll("[\r]", ""), new String(result).replaceAll("[\r]", "")); } public void testImport() throws Exception { @@ -122,8 +121,8 @@ char[] result = AuthorizationPolicyFactory.exportPolicies(roles); String expected = FileUtil.read(new FileReader(UnitTestUtil.getTestDataPath() + "/permissions2.xml")); //$NON-NLS-1$ - String actual = new String(result).replaceAll("\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ - assertEquals(expected, actual); + //String actual = new String(result).replaceAll("\r\n", "\n"); //$NON-NLS-1$ //$NON-NLS-2$ + assertEquals(expected.replaceAll("[\r]", ""), new String(result).replaceAll("[\r]", "")); } public void testParsingFails() throws Exception { Modified: trunk/test-integration/common/src/test/java/com/metamatrix/systemmodel/TestSystemVirtualModel.java =================================================================== --- trunk/test-integration/common/src/test/java/com/metamatrix/systemmodel/TestSystemVirtualModel.java 2009-12-03 21:20:54 UTC (rev 1620) +++ trunk/test-integration/common/src/test/java/com/metamatrix/systemmodel/TestSystemVirtualModel.java 2009-12-03 21:24:13 UTC (rev 1621) @@ -22,6 +22,8 @@ package com.metamatrix.systemmodel; +import java.io.File; + import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -109,9 +111,8 @@ } @Test public void testVDBResourcePathsProcedure() { - String[] expected = { "ResourcePath[string] isBinary[boolean] ", //$NON-NLS-1$ - "/parts/partsmd/PartsSupplier.xmi false", //$NON-NLS-1$ + File.separator + "parts" + File.separator + "partsmd" + File.separator + "PartsSupplier.xmi false" }; execute("exec getVDBResourcePaths()",new Object[] {}); //$NON-NLS-1$ assertResults(expected);