Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikhail Sennikovsky2007-06-15 12:12:22 -0400
committerMikhail Sennikovsky2007-06-15 12:12:22 -0400
commitb7eb6a93b0161fd3789e0a547aac1c03242c9614 (patch)
tree22734026459dd48c13524665ad9689fc6bc73c0a /build/org.eclipse.cdt.managedbuilder.core.tests
parent68aa1d54086fc4ffa85d4296d19e844b163e0fdd (diff)
downloadorg.eclipse.cdt-b7eb6a93b0161fd3789e0a547aac1c03242c9614.tar.gz
org.eclipse.cdt-b7eb6a93b0161fd3789e0a547aac1c03242c9614.tar.xz
org.eclipse.cdt-b7eb6a93b0161fd3789e0a547aac1c03242c9614.zip
test fix
Diffstat (limited to 'build/org.eclipse.cdt.managedbuilder.core.tests')
-rw-r--r--build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java
index dc71e3656c..b5acdb4e3a 100644
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildCoreTests20.java
@@ -46,6 +46,7 @@ import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.core.ManagedBuilderCorePlugin;
import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
import org.eclipse.cdt.managedbuilder.internal.core.Option;
+import org.eclipse.cdt.managedbuilder.testplugin.BuildSystemTestHelper;
import org.eclipse.cdt.managedbuilder.testplugin.ManagedBuildTestHelper;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
@@ -234,15 +235,15 @@ public class ManagedBuildCoreTests20 extends TestCase {
final String[] expectedPaths = new String[5];
// This first path is a built-in, so it will not be manipulated by build manager
- expectedPaths[0] = (new Path("\\usr\\include")).toOSString();
- expectedPaths[1] = (new Path("\\opt\\gnome\\include")).toOSString();
- IPath path = new Path("C:\\home\\tester\\include");
+ expectedPaths[0] = (new Path("/usr/include")).toOSString();
+ expectedPaths[1] = (new Path("/opt/gnome/include")).toOSString();
+ IPath path = new Path("C:/home/tester/include");
if(path.isAbsolute()) // for win32 path is treated as absolute
expectedPaths[2] = path.toOSString();
else // for Linux path is relative
expectedPaths[2] = project.getLocation().append("Sub Config").append(path).toOSString();
expectedPaths[3] = project.getLocation().append( "includes" ).toOSString();
- expectedPaths[4] = (new Path("\\usr\\gnu\\include")).toOSString();
+ expectedPaths[4] = (new Path("/usr/gnu/include")).toOSString();
// Create a new managed project based on the sub project type
IProjectType projType = ManagedBuildManager.getExtensionProjectType("test.sub");
@@ -310,7 +311,7 @@ public class ManagedBuildCoreTests20 extends TestCase {
assertEquals((String)definedSymbols.get("GNOME"), "ME");
// Test the includes path
String[] actualPaths = info.getIncludePaths();
- assertTrue(Arrays.equals(expectedPaths, actualPaths));
+ BuildSystemTestHelper.checkDiff(expectedPaths, actualPaths);
}
});
@@ -323,7 +324,7 @@ public class ManagedBuildCoreTests20 extends TestCase {
assertEquals((String)currentSymbols.get("BUILTIN"), "");
String[] currentPaths = currentSettings.getIncludePaths();
- assertTrue(Arrays.equals(expectedPaths, currentPaths));
+ BuildSystemTestHelper.checkDiff(expectedPaths, currentPaths);
// Add some defined symbols programmatically
String[] expectedSymbols = {"DEBUG", "GNOME = ME "};

Back to the top