Branches from other libs are displayed when checking out from Orbit

Bug: 366016
Change-Id: Idf58845137f4492dba4eb7d05d7e93cd09c300ae

1 files changed, 13 insertions, 2 deletions

diff --git a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java
index 64e6e172b..3e9528d42 100644
--- a/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java
+++ b/tests/org.eclipse.team.tests.cvs.core/src/org/eclipse/team/tests/ccvs/ui/RepositoriesViewTests.java
@@ -82,7 +82,6 @@ public class RepositoriesViewTests extends EclipseTest {
 

 		// create project

 		IProject project = getUniqueTestProject("TestBranchSubmoduleChildrenProject");

-		buildResources(project, new String[] { "file1.txt" }, true);

 		// share project under module

 		shareProject(getRepository(), project,

 				moduleName + "/" + project.getName(), DEFAULT_MONITOR);

@@ -128,17 +127,29 @@ public class RepositoriesViewTests extends EclipseTest {
 

 		// create project

 		IProject project = getUniqueTestProject("TestTagSubmoduleChildrenProject");

-		buildResources(project, new String[] { "file1.txt" }, true);

 		// share project under module

 		shareProject(getRepository(), project,

 				moduleName + "/" + project.getName(), DEFAULT_MONITOR);

 		assertValidCheckout(project);

 

+		// make some changes

+		addResources(project, new String[] { "file1.txt" }, true);

+

 		// tag project

 		CVSTag tag = new CVSTag(versionName, CVSTag.VERSION);

 

 		tagProject(project, tag, true);

 

+		// refresh branches for module

+		// TODO Remove when Bug 372862 is committed, adding tag for submodule

+		// should automatically add it to module

+		CVSUIPlugin

+				.getPlugin()

+				.getRepositoryManager()

+				.refreshDefinedTags(

+						getRepository().getRemoteFolder(moduleName, null),

+						true, true, DEFAULT_MONITOR);

+

 		RemoteContentProvider rcp = new RemoteContentProvider();

 		Object[] categories = rcp.getChildren(getRepositoryRoot());

 		assertEquals(4, categories.length);