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
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
|
/*******************************************************************************
* Copyright (C) 2013, 2014 Obeo 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
*******************************************************************************/
package org.eclipse.emf.compare.ide.ui.tests.egit;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import java.io.File;
import java.util.List;
import org.eclipse.compare.ITypedElement;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.InstanceScope;
import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.GitCorePreferences;
import org.eclipse.emf.common.util.BasicMonitor;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.EMFCompare;
import org.eclipse.emf.compare.ide.ui.internal.logical.ComparisonScopeBuilder;
import org.eclipse.emf.compare.ide.ui.internal.logical.IdenticalResourceMinimizer;
import org.eclipse.emf.compare.ide.ui.internal.logical.StorageTypedElement;
import org.eclipse.emf.compare.ide.ui.internal.logical.SubscriberStorageAccessor;
import org.eclipse.emf.compare.ide.ui.internal.logical.resolver.ThreadedModelResolver;
import org.eclipse.emf.compare.ide.ui.logical.IStorageProvider;
import org.eclipse.emf.compare.ide.ui.logical.IStorageProviderAccessor;
import org.eclipse.emf.compare.ide.ui.tests.CompareTestCase;
import org.eclipse.emf.compare.ide.ui.tests.egit.fixture.GitTestRepository;
import org.eclipse.emf.compare.ide.ui.tests.egit.fixture.MockSystemReader;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.jgit.lib.Constants;
import org.eclipse.jgit.util.FileUtils;
import org.eclipse.jgit.util.SystemReader;
import org.eclipse.team.core.subscribers.Subscriber;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
/**
* The set up and tear down of this class were mostly copied from org.eclipse.egit.core.test.GitTestCase.
*/
@SuppressWarnings({"restriction", "nls", })
public class CompareGitTestCase extends CompareTestCase {
protected GitTestRepository repository;
// The ".git" folder of the test repository
private File gitDir;
@BeforeClass
public static void setUpClass() {
// suppress auto-ignoring and auto-sharing to avoid interference
IEclipsePreferences eGitPreferences = InstanceScope.INSTANCE.getNode(Activator.getPluginId());
eGitPreferences.putBoolean(GitCorePreferences.core_autoShareProjects, false);
// This is actually the value of "GitCorePreferences.core_autoIgnoreDerivedResources"... but it was
// not in Egit 2.1
eGitPreferences.putBoolean("core_autoIgnoreDerivedResources", false);
}
@Override
@Before
public void setUp() throws Exception {
super.setUp();
// ensure there are no shared Repository instances left
// when starting a new test
Activator.getDefault().getRepositoryCache().clear();
final MockSystemReader mockSystemReader = new MockSystemReader();
SystemReader.setInstance(mockSystemReader);
mockSystemReader.setProperty(Constants.GIT_CEILING_DIRECTORIES_KEY, ResourcesPlugin.getWorkspace()
.getRoot().getLocation().toFile().getParentFile().getAbsoluteFile().toString());
final IWorkspaceRoot workspaceRoot = project.getProject().getWorkspace().getRoot();
gitDir = new File(workspaceRoot.getRawLocation().toFile(),
Constants.DOT_GIT);
repository = new GitTestRepository(gitDir);
repository.connect(project.getProject());
repository.ignore(workspaceRoot.getRawLocation().append(".metadata").toFile());
}
@Override
@After
public void tearDown() throws Exception {
repository.dispose();
Activator.getDefault().getRepositoryCache().clear();
if (gitDir.exists()) {
FileUtils.delete(gitDir, FileUtils.RECURSIVE | FileUtils.RETRY);
}
super.tearDown();
}
protected void compareBothDirectionsAndCheck(IFile file, String source, String destination,
int expectedConflicts, int diffsInSource, int diffsInDestination) throws Exception {
Comparison compareResult = compare(source, destination, file);
assertEquals(expectedConflicts, compareResult.getConflicts().size());
assertDiffCount(compareResult.getDifferences(), diffsInSource, diffsInDestination);
compareResult = compare(destination, source, file);
assertEquals(expectedConflicts, compareResult.getConflicts().size());
assertDiffCount(compareResult.getDifferences(), diffsInDestination, diffsInSource);
}
protected Comparison compare(String sourceRev, String targetRev, IFile file) throws Exception {
final String fullPath = file.getFullPath().toString();
final Subscriber subscriber = repository.createSubscriberForComparison(sourceRev, targetRev, file);
final IStorageProviderAccessor accessor = new SubscriberStorageAccessor(subscriber);
final IStorageProvider sourceProvider = accessor.getStorageProvider(file,
IStorageProviderAccessor.DiffSide.SOURCE);
final IStorageProvider remoteProvider = accessor.getStorageProvider(file,
IStorageProviderAccessor.DiffSide.REMOTE);
final IStorageProvider ancestorProvider = accessor.getStorageProvider(file,
IStorageProviderAccessor.DiffSide.ORIGIN);
assertNotNull(sourceProvider);
assertNotNull(remoteProvider);
assertNotNull(ancestorProvider);
final IProgressMonitor monitor = new NullProgressMonitor();
final IStorageProviderAccessor storageAccessor = new SubscriberStorageAccessor(subscriber);
final ITypedElement left = new StorageTypedElement(sourceProvider.getStorage(monitor), fullPath);
final ITypedElement right = new StorageTypedElement(remoteProvider.getStorage(monitor), fullPath);
final ITypedElement origin = new StorageTypedElement(ancestorProvider.getStorage(monitor), fullPath);
final ComparisonScopeBuilder scopeBuilder = new ComparisonScopeBuilder(new ThreadedModelResolver(),
new IdenticalResourceMinimizer(), storageAccessor);
final IComparisonScope scope = scopeBuilder.build(left, right, origin, monitor);
final ResourceSet leftResourceSet = (ResourceSet)scope.getLeft();
final ResourceSet rightResourceSet = (ResourceSet)scope.getRight();
final ResourceSet originResourceSet = (ResourceSet)scope.getOrigin();
assertFalse(leftResourceSet.getResources().isEmpty());
assertFalse(rightResourceSet.getResources().isEmpty());
assertFalse(originResourceSet.getResources().isEmpty());
return EMFCompare.builder().build().compare(scope, new BasicMonitor());
}
protected static void assertDiffCount(List<Diff> differences, int expectedOutgoing, int expectedIncoming) {
assertEquals(expectedOutgoing + expectedIncoming, differences.size());
int outgoingCount = 0;
int incomingCount = 0;
for (Diff diff : differences) {
switch (diff.getSource()) {
case LEFT:
outgoingCount++;
break;
case RIGHT:
incomingCount++;
break;
default:
break;
}
}
assertEquals(expectedOutgoing, outgoingCount);
assertEquals(expectedIncoming, incomingCount);
}
}
|
