-
Notifications
You must be signed in to change notification settings - Fork 5.3k
/
SvnExternalCommitNoticedTest.java
148 lines (122 loc) · 4.92 KB
/
SvnExternalCommitNoticedTest.java
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
/*
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.jetbrains.idea.svn16;
import com.intellij.openapi.vcs.VcsConfiguration;
import com.intellij.openapi.vcs.changes.ChangeListManager;
import com.intellij.openapi.vcs.changes.ChangeListManagerImpl;
import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.impl.local.FileWatcher;
import org.jetbrains.idea.svn.Svn17TestCase;
import org.jetbrains.idea.svn.SvnVcs;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
/**
* Created with IntelliJ IDEA.
* User: Irina.Chernushina
* Date: 11/21/12
* Time: 10:02 AM
*/
public class SvnExternalCommitNoticedTest extends Svn17TestCase {
private ChangeListManagerImpl clManager;
private SvnVcs myVcs;
private VcsDirtyScopeManager myVcsDirtyScopeManager;
@Override
@Before
public void setUp() throws Exception {
System.setProperty(FileWatcher.PROPERTY_WATCHER_DISABLED, "false");
super.setUp();
clManager = (ChangeListManagerImpl) ChangeListManager.getInstance(myProject);
myVcsDirtyScopeManager = VcsDirtyScopeManager.getInstance(myProject);
enableSilentOperation(VcsConfiguration.StandardConfirmation.ADD);
enableSilentOperation(VcsConfiguration.StandardConfirmation.REMOVE);
myVcs = SvnVcs.getInstance(myProject);
}
@Test
public void testSimpleCommit() throws Exception {
final SubTree tree = new SubTree(myWorkingCopyDir);
checkin();
editFileInCommand(myProject, tree.myS1File, "test1");
editFileInCommand(myProject, tree.myS2File, "test2");
editFileInCommand(myProject, tree.myTargetFiles.get(1), "target1");
myVcsDirtyScopeManager.markEverythingDirty();
clManager.ensureUpToDate(false);
Assert.assertEquals(3, clManager.getChangesIn(myWorkingCopyDir).size());
try {
Thread.sleep(100);
} catch (InterruptedException e) {
//
}
checkin();
myWorkingCopyDir.refresh(false, true);
imitateEvent(myWorkingCopyDir);
// no dirty scope externally provided! just VFS refresh
clManager.ensureUpToDate(false);
Assert.assertEquals(0, clManager.getChangesIn(myWorkingCopyDir).size());
}
@Test
public void testRenameDirCommit() throws Exception {
final SubTree tree = new SubTree(myWorkingCopyDir);
checkin();
renameFileInCommand(myProject, tree.myTargetDir, "aabbcc");
myVcsDirtyScopeManager.markEverythingDirty();
clManager.ensureUpToDate(false);
Assert.assertEquals(11, clManager.getChangesIn(myWorkingCopyDir).size());
try {
Thread.sleep(100);
} catch (InterruptedException e) {
//
}
checkin();
myWorkingCopyDir.refresh(false, true);
imitateEvent(myWorkingCopyDir);
// no dirty scope externally provided! just VFS refresh
clManager.ensureUpToDate(false);
Assert.assertEquals(0, clManager.getChangesIn(myWorkingCopyDir).size());
}
@Test
public void testExternalCommitInExternals() throws Exception {
prepareExternal();
final File sourceDir = new File(myWorkingCopyDir.getPath(), "source");
final File externalDir = new File(myWorkingCopyDir.getPath(), "source/external");
final File file = new File(externalDir, "t11.txt");
final VirtualFile vf = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(file);
final File mainFile = new File(myWorkingCopyDir.getPath(), "source/s1.txt");
final VirtualFile vfMain = LocalFileSystem.getInstance().refreshAndFindFileByIoFile(mainFile);
renameFileInCommand(vf, "tt11.txt");
renameFileInCommand(vfMain, "ss11.txt");
myVcsDirtyScopeManager.markEverythingDirty();
clManager.ensureUpToDate(false);
Assert.assertEquals(2, clManager.getChangesIn(myWorkingCopyDir).size());
try {
Thread.sleep(100);
} catch (InterruptedException e) {
//
}
verify(runSvn("ci", "-m", "test", sourceDir.getPath()));
verify(runSvn("ci", "-m", "test", externalDir.getPath()));
myWorkingCopyDir.refresh(false, true);
final LocalFileSystem lfs = LocalFileSystem.getInstance();
imitateEvent(lfs.refreshAndFindFileByIoFile(sourceDir));
imitateEvent(lfs.refreshAndFindFileByIoFile(externalDir));
// no dirty scope externally provided! just VFS refresh
clManager.ensureUpToDate(false);
Assert.assertEquals(0, clManager.getChangesIn(myWorkingCopyDir).size());
}
}