MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

SVN 1.7: fix some tests

Browse Source
This commit is contained in:
irengrig
2012-02-09 15:21:14 +04:00
parent c6b50da52a
commit a29b744b33
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnCommittedViewTest.java
+19 -1
View File
@@ -1,6 +1,7 @@
package org.jetbrains.idea.svn17;
import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.vcs.CommittedChangesProvider;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.openapi.vcs.VcsConfiguration;
@@ -13,6 +14,7 @@ import org.jetbrains.annotations.Nullable;
import org.jetbrains.idea.svn17.history.SvnChangeList;
import org.jetbrains.idea.svn17.history.SvnRepositoryLocation;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import java.io.File;
@@ -21,6 +23,12 @@ import java.util.Collection;
import java.util.List;
public class SvnCommittedViewTest extends SvnTestCase {
@Override
@Before
public void setUp() throws Exception {
super.setUp();
SvnConfiguration17.getInstance(myProject).DETECT_NESTED_COPIES = false;
}
@Test
public void testAdd() throws Exception {
@@ -36,6 +44,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
checkin();
final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
vcs.invokeRefreshSvnRoots(false);
final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -67,6 +76,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
checkin();
final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
vcs.invokeRefreshSvnRoots(false);
final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -88,13 +98,17 @@ public class SvnCommittedViewTest extends SvnTestCase {
// r1, addition without history
checkin();
final String d1Path = new File(d1.getPath()).getAbsolutePath();
File dir = new File(d1.getPath());
final String d1Path = dir.getAbsolutePath();
verify(runSvn("delete", d1Path));
boolean created = dir.mkdir();
Assert.assertTrue(created);
verify(runSvn("add", d1Path));
checkin();
final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
vcs.invokeRefreshSvnRoots(false);
final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -123,6 +137,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
checkin();
final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
vcs.invokeRefreshSvnRoots(false);
final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -155,6 +170,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
checkin();
final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
vcs.invokeRefreshSvnRoots(false);
final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -180,6 +196,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
verify(runSvn("copy", "-m", "test", myRepoUrl + "/trunk", myRepoUrl + "/branch"));
final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
vcs.invokeRefreshSvnRoots(false);
final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
@@ -209,6 +226,7 @@ public class SvnCommittedViewTest extends SvnTestCase {
checkin();
final SvnVcs17 vcs = SvnVcs17.getInstance(myProject);
vcs.invokeRefreshSvnRoots(false);
final CommittedChangesProvider<SvnChangeList,ChangeBrowserSettings> committedChangesProvider = vcs.getCommittedChangesProvider();
final List<SvnChangeList> changeListList =
committedChangesProvider.getCommittedChanges(committedChangesProvider.createDefaultSettings(),
plugins/svn4idea/testSource/org/jetbrains/idea/svn17/SvnRenameTest.java
+4
View File
@@ -96,6 +96,10 @@ public class SvnRenameTest extends SvnTestCase {
verifyChange(changes.get(3), "child" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt", "childnew" + File.separatorChar + "grandChild" + File.separatorChar + "b.txt");
VirtualFile oldChild = myWorkingCopyDir.findChild("child");
if (oldChild == null) {
myWorkingCopyDir.refresh(false, true);
oldChild = myWorkingCopyDir.findChild("child");
}
Assert.assertEquals(FileStatus.DELETED, changeListManager.getStatus(oldChild));
}