diff options
author | Andrey Loskutov | 2016-10-29 09:53:42 +0000 |
---|---|---|
committer | Andrey Loskutov | 2016-11-04 20:18:34 +0000 |
commit | f60954ba88fb4b106af2fd6056f69c93a54110b6 (patch) | |
tree | 166163a7bf4d0b9f39d27daecb8a0badb1820344 /tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java | |
parent | a114e221df58ed0106dc903ce3ff1aeb28da617f (diff) | |
download | eclipse.platform.team-f60954ba88fb4b106af2fd6056f69c93a54110b6.tar.gz eclipse.platform.team-f60954ba88fb4b106af2fd6056f69c93a54110b6.tar.xz eclipse.platform.team-f60954ba88fb4b106af2fd6056f69c93a54110b6.zip |
Bug 506732 - cleanup trailing spaces in test plugins
Change-Id: I55e43b2389d1a9baffdfecea701b37105e4548ae
Signed-off-by: Andrey Loskutov <loskutov@gmx.de>
Diffstat (limited to 'tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java')
-rw-r--r-- | tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java index 4aec38e7d..5e8217b66 100644 --- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java +++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/WorkspaceTest.java @@ -67,12 +67,12 @@ public class WorkspaceTest extends ResourceTest { assertExistsInFileSystem(target); return target; } - + protected IProject getUniqueTestProject(String prefix) throws CoreException { // manage and share with the default stream create by this class return getNamedTestProject(prefix + "-" + Long.toString(System.currentTimeMillis())); } - + /* * This method creates a project with the given resources */ @@ -81,14 +81,14 @@ public class WorkspaceTest extends ResourceTest { buildResources(project, resources, true); return project; } - + /* * Create a test project using the currently running test case as the project name prefix */ protected IProject createProject(String[] resources) throws CoreException { return createProject(getName(), resources); } - + protected IStatus getTeamTestStatus(int severity) { return new Status(severity, "org.eclipse.team.tests.core", 0, "team status", null); } @@ -166,7 +166,7 @@ public class WorkspaceTest extends ResourceTest { } } - + public void sleep(int ms) { try { Thread.sleep(ms); @@ -208,16 +208,16 @@ public class WorkspaceTest extends ResourceTest { } return resources; } - + // Assert that the two containers have equal contents protected void assertEquals(IContainer container1, IContainer container2) throws CoreException { assertEquals(container1.getName(), container2.getName()); List members1 = new ArrayList(); members1.addAll(Arrays.asList(container1.members())); - + List members2 = new ArrayList(); members2.addAll(Arrays.asList(container2.members())); - + assertTrue(members1.size() == members2.size()); for (int i=0;i<members1.size();i++) { IResource member1 = (IResource)members1.get(i); @@ -226,24 +226,24 @@ public class WorkspaceTest extends ResourceTest { assertEquals(member1, member2); } } - + // Assert that the two files have equal contents protected void assertEquals(IFile file1, IFile file2) throws CoreException { assertEquals(file1.getName(), file2.getName()); assertTrue(compareContent(file1.getContents(), file2.getContents())); } - + // Assert that the two projects have equal contents ignoreing the project name // and the .vcm_meta file protected void assertEquals(IProject container1, IProject container2) throws CoreException { List members1 = new ArrayList(); members1.addAll(Arrays.asList(container1.members())); members1.remove(container1.findMember(".project")); - + List members2 = new ArrayList(); members2.addAll(Arrays.asList(container2.members())); members2.remove(container2.findMember(".project")); - + assertTrue("Number of children differs for " + container1.getFullPath(), members1.size() == members2.size()); for (int i=0;i<members1.size();i++) { IResource member1 = (IResource)members1.get(i); @@ -256,7 +256,7 @@ public class WorkspaceTest extends ResourceTest { assertEquals(resource1.getType(), resource2.getType()); if (resource1.getType() == IResource.FILE) assertEquals((IFile)resource1, (IFile)resource2); - else + else assertEquals((IContainer)resource1, (IContainer)resource2); } } |