1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
/*******************************************************************************
* Copyright (c) 2000, 2004 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.tests.ccvs.core.subscriber;
import java.io.IOException;
import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.team.core.TeamException;
import org.eclipse.team.core.synchronize.SyncInfo;
import org.eclipse.team.internal.ccvs.core.CVSCompareSubscriber;
import org.eclipse.team.internal.ccvs.core.CVSTag;
import org.eclipse.team.tests.ccvs.core.CVSTestSetup;
/**
* Tests the CVSMergeSubscriber
*/
public class CVSCompareSubscriberTest extends CVSSyncSubscriberTest {
public static Test suite() {
String testName = System.getProperty("eclipse.cvs.testName");
if (testName == null) {
TestSuite suite = new TestSuite(CVSCompareSubscriberTest.class);
return new CVSTestSetup(suite);
} else {
return new CVSTestSetup(new CVSCompareSubscriberTest(testName));
}
}
public CVSCompareSubscriberTest() {
super();
}
public CVSCompareSubscriberTest(String name) {
super(name);
}
/**
* Test the basic changes that can occur when comparing the local workspace to a remote
* line-up.
*/
public void testStandardChanges() throws CoreException, IOException {
// Create a test project
IProject project = createProject("testCompareChanges", new String[]{"file1.txt", "file2.txt", "folder1/", "folder1/a.txt", "folder1/b.txt", "folder2/", "folder2/deleted.txt"});
// Checkout and branch a copy
CVSTag tag = new CVSTag("v1", CVSTag.VERSION);
tagProject(project, tag, true);
// Modify the workspace
addResources(project, new String[]{"addition.txt", "folderAddition/", "folderAddition/new.txt"}, true);
deleteResources(project, new String[]{"folder1/a.txt"}, true);
deleteResources(project, new String[] {"folder2/"}, true);
// modify file1 - make two revisions
appendText(project.getFile("file1.txt"), "Appended text 1", false);
commitProject(project);
appendText(project.getFile("file1.txt"), "Appended text 2", false);
commitProject(project);
// modify file2 in both branch and head and ensure it's merged properly
appendText(project.getFile("file2.txt"), "appended text", false);
commitProject(project);
// create a merge subscriber
CVSCompareSubscriber subscriber = getSyncInfoSource().createCompareSubscriber(project, tag);
// check the sync states
assertSyncEquals("testIncomingChanges", subscriber, project,
new String[]{
"file1.txt",
"file2.txt",
"folder1/",
"folder1/b.txt",
"folder1/a.txt",
"addition.txt",
"folderAddition/",
"folderAddition/new.txt",
"folder2/",
"folder2/deleted.txt"}, true,
new int[]{
SyncInfo.CHANGE,
SyncInfo.CHANGE,
SyncInfo.IN_SYNC,
SyncInfo.IN_SYNC,
SyncInfo.ADDITION,
SyncInfo.DELETION,
SyncInfo.IN_SYNC,
SyncInfo.DELETION,
SyncInfo.IN_SYNC,
SyncInfo.ADDITION});
}
/* (non-Javadoc)
* @see junit.framework.TestCase#tearDown()
*/
protected void tearDown() throws Exception {
getSyncInfoSource().tearDown();
super.tearDown();
}
public void testInvalidTag() throws TeamException, CoreException {
IProject project = createProject(new String[]{"file1.txt", "file2.txt", "folder1/", "folder1/a.txt", "folder1/b.txt", "folder2/", "folder2/deleted.txt"});
// Create and compare with a non-existant tag
CVSTag tag = new CVSTag("non-existant", CVSTag.VERSION);
CVSCompareSubscriber subscriber = getSyncInfoSource().createCompareSubscriber(project.getFolder("folder1"), tag);
// All files should be additions
assertSyncEquals("testInvalidTag", subscriber, project.getFolder("folder1"),
new String[]{
"a.txt",
"b.txt"}, true,
new int[]{
SyncInfo.DELETION,
SyncInfo.DELETION});
}
}
|
