diff options
Diffstat (limited to 'plugins/svn4idea/testSource/org/jetbrains')
11 files changed, 330 insertions, 331 deletions
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/ConflictCreator.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/ConflictCreator.java index 635484fd2112..cca76e17f234 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/ConflictCreator.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/ConflictCreator.java @@ -26,8 +26,8 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Processor; import com.intellij.util.containers.Convertor; import junit.framework.Assert; -import org.tmatesoft.svn.core.wc.SVNInfo; -import org.tmatesoft.svn.core.wc.SVNStatusType; +import org.jetbrains.idea.svn.info.Info; +import org.jetbrains.idea.svn.status.StatusType; import java.io.File; import java.io.IOException; @@ -100,7 +100,7 @@ public class ConflictCreator { String subPath = ""; for (String part : parts) { final String path = subPath + part; - SVNInfo info = vcs.getInfo(new File(myTheirsDir.getPath(), path)); + Info info = vcs.getInfo(new File(myTheirsDir.getPath(), path)); if (info == null || info.getURL() == null) { myClientRunner.add(myTheirsDir, path); } @@ -161,15 +161,15 @@ public class ConflictCreator { final File target = new File(root.getPath(), fileData.myRelativePath); // we dont apply properties changes fow now - if (SVNStatusType.STATUS_MISSING.equals(fileData.myNodeStatus)) { + if (StatusType.STATUS_MISSING.equals(fileData.myNodeStatus)) { // delete existing only from fs FileUtil.delete(target); return; - } else if (SVNStatusType.STATUS_UNVERSIONED.equals(fileData.myNodeStatus)) { + } else if (StatusType.STATUS_UNVERSIONED.equals(fileData.myNodeStatus)) { // create new unversioned createFile(root, fileData, target); return; - } else if (SVNStatusType.STATUS_ADDED.equals(fileData.myNodeStatus)) { + } else if (StatusType.STATUS_ADDED.equals(fileData.myNodeStatus)) { if (fileData.myCopyFrom != null) { myClientRunner.copy(root, fileData.myCopyFrom, fileData.myRelativePath); return; @@ -177,11 +177,11 @@ public class ConflictCreator { createFile(root, fileData, target); myClientRunner.add(root, fileData.myRelativePath); return; - } else if (SVNStatusType.STATUS_DELETED.equals(fileData.myNodeStatus)) { + } else if (StatusType.STATUS_DELETED.equals(fileData.myNodeStatus)) { myClientRunner.delete(root, fileData.myRelativePath); return; - } else if (SVNStatusType.STATUS_NORMAL.equals(fileData.myNodeStatus)) { - if (SVNStatusType.STATUS_MODIFIED.equals(fileData.myContentsStatus)) { + } else if (StatusType.STATUS_NORMAL.equals(fileData.myNodeStatus)) { + if (StatusType.STATUS_MODIFIED.equals(fileData.myContentsStatus)) { createFile(root, fileData, target); return; } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java index ee9e2cd46496..d3a9bc552224 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnCachingRevisionsTest.java @@ -8,7 +8,6 @@ import com.intellij.openapi.vcs.changes.committed.ChangesBunch; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase; import org.jetbrains.idea.svn.history.*; -import org.tmatesoft.svn.core.SVNLogEntry; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.wc.SVNRevision; @@ -36,8 +35,10 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { } private SvnChangeList createList(final long revision) { - return new SvnChangeList(null, myLocation, - new SVNLogEntry(Collections.emptyMap(), revision, AUTHOR, new Date(System.currentTimeMillis()), ""), ROOT.toDecodedString()); + LogEntry entry = + new LogEntry.Builder().setRevision(revision).setAuthor(AUTHOR).setDate(new Date(System.currentTimeMillis())).setMessage("").build(); + + return new SvnChangeList(null, myLocation, entry, ROOT.toDecodedString()); } private class MockSvnLogLoader implements SvnLogLoader { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java index 1ed14dce6704..b6d83ad9ed2d 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnMergeInfoTest.java @@ -24,20 +24,20 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.svn.api.Depth; import org.jetbrains.idea.svn.dialogs.MergeContext; import org.jetbrains.idea.svn.dialogs.WCInfo; import org.jetbrains.idea.svn.history.SvnChangeList; import org.jetbrains.idea.svn.history.SvnRepositoryLocation; +import org.jetbrains.idea.svn.info.Info; import org.jetbrains.idea.svn.mergeinfo.BranchInfo; import org.jetbrains.idea.svn.mergeinfo.OneShotMergeInfoHelper; import org.jetbrains.idea.svn.mergeinfo.SvnMergeInfoCache; import org.junit.Assert; import org.junit.Test; -import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.internal.util.SVNPathUtil; -import org.tmatesoft.svn.core.wc.SVNInfo; import org.tmatesoft.svn.core.wc.SVNPropertyData; import org.tmatesoft.svn.core.wc.SVNRevision; import org.tmatesoft.svn.core.wc.SVNWCClient; @@ -86,7 +86,7 @@ public class SvnMergeInfoTest extends Svn17TestCase { VirtualFile vcsRoot = LocalFileSystem.getInstance().findFileByIoFile(myBranchVcsRoot); Node node = new Node(vcsRoot, SVNURL.parseURIEncoded(myBranchUrl), SVNURL.parseURIEncoded(myRepoUrl)); RootUrlInfo root = new RootUrlInfo(node, WorkingCopyFormat.ONE_DOT_SIX, vcsRoot, null); - myWCInfo = new WCInfo(root, true, SVNDepth.INFINITY); + myWCInfo = new WCInfo(root, true, Depth.INFINITY); myMergeContext = new MergeContext(SvnVcs.getInstance(myProject), myTrunkUrl, myWCInfo, SVNPathUtil.tail(myTrunkUrl), vcsRoot); myOneShotMergeInfoHelper = new OneShotMergeInfoHelper(myMergeContext); @@ -255,7 +255,7 @@ public class SvnMergeInfoTest extends Svn17TestCase { assertMergeInfo(myBranchVcsRoot, "/trunk:3"); - final SVNInfo f1info = myVcs.getInfo(new File(myBranchVcsRoot, "folder/f1.txt")); + final Info f1info = myVcs.getInfo(new File(myBranchVcsRoot, "folder/f1.txt")); assert f1info.getRevision().getNumber() == 2; final List<SvnChangeList> changeListList = getTrunkChangeLists(); diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeClientAuthTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeClientAuthTest.java index 99f7b0cda790..a0dfa979ea74 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeClientAuthTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnNativeClientAuthTest.java @@ -30,6 +30,7 @@ import com.intellij.util.Processor; import com.intellij.util.containers.Convertor; import junit.framework.Assert; import org.jetbrains.annotations.NotNull; +import org.jetbrains.idea.svn.api.Depth; import org.jetbrains.idea.svn.auth.SvnAuthenticationManager; import org.jetbrains.idea.svn.auth.SvnAuthenticationNotifier; import org.jetbrains.idea.svn.checkout.SvnCheckoutProvider; @@ -544,7 +545,7 @@ public class SvnNativeClientAuthTest extends Svn17TestCase { root.deleteOnExit(); Assert.assertTrue(root.exists()); SvnCheckoutProvider - .checkout(myProject, root, url, SVNRevision.HEAD, SVNDepth.INFINITY, false, new CheckoutProvider.Listener() { + .checkout(myProject, root, url, SVNRevision.HEAD, Depth.INFINITY, false, new CheckoutProvider.Listener() { @Override public void directoryCheckedOut(File directory, VcsKey vcs) { } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java index ec78b9fd5f55..6e0ee960b64a 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnParseCommandLineParseTest.java @@ -24,19 +24,15 @@ import com.intellij.util.containers.Convertor; import com.intellij.util.containers.MultiMap; import junit.framework.Assert; import junit.framework.TestCase; -import org.jetbrains.idea.svn.status.CmdStatusClient; +import org.jetbrains.idea.svn.api.Depth; +import org.jetbrains.idea.svn.api.NodeKind; +import org.jetbrains.idea.svn.status.Status; +import org.jetbrains.idea.svn.info.Info; +import org.jetbrains.idea.svn.status.*; import org.jetbrains.idea.svn.info.SvnInfoHandler; -import org.jetbrains.idea.svn.status.SvnStatusHandler; -import org.jetbrains.idea.svn.info.IdeaSVNInfo; -import org.jetbrains.idea.svn.status.PortableStatus; -import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNException; -import org.tmatesoft.svn.core.SVNNodeKind; import org.tmatesoft.svn.core.SVNURL; -import org.tmatesoft.svn.core.wc.ISVNStatusHandler; -import org.tmatesoft.svn.core.wc.SVNInfo; import org.tmatesoft.svn.core.wc.SVNRevision; -import org.tmatesoft.svn.core.wc.SVNStatus; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; @@ -84,10 +80,10 @@ public class SvnParseCommandLineParseTest extends TestCase { "</entry>\n" + "</info>"; - final SVNInfo[] info = new SVNInfo[1]; - final SvnInfoHandler handler = new SvnInfoHandler(new File("C:/base/"), new Consumer<SVNInfo>() { + final Info[] info = new Info[1]; + final SvnInfoHandler handler = new SvnInfoHandler(new File("C:/base/"), new Consumer<Info>() { @Override - public void consume(SVNInfo info1) { + public void consume(Info info1) { info[0] = info1; } }); @@ -574,9 +570,9 @@ public class SvnParseCommandLineParseTest extends TestCase { @Override public void switchChangeList(String newList) { } - }, new File(basePath), new Convertor<File, SVNInfo>() { + }, new File(basePath), new Convertor<File, Info>() { @Override - public SVNInfo convert(File o) { + public Info convert(File o) { try { o.getCanonicalFile(); } @@ -616,9 +612,9 @@ public class SvnParseCommandLineParseTest extends TestCase { return StringUtil.replace(s, "C:/", LINUX_ROOT); } - private IdeaSVNInfo createStubInfo(final String basePath, final String baseUrl) throws SVNException { - return new IdeaSVNInfo(basePath, SVNURL.parseURIEncoded(baseUrl), SVNRevision.HEAD, SVNNodeKind.FILE, "", - SVNURL.parseURIEncoded("http://a.b.c"), 1, new Date(), "me", null, SVNDepth.EMPTY, 1); + private Info createStubInfo(final String basePath, final String baseUrl) throws SVNException { + return new Info(basePath, SVNURL.parseURIEncoded(baseUrl), SVNRevision.HEAD, NodeKind.FILE, "", + SVNURL.parseURIEncoded("http://a.b.c"), 1, new Date(), "me", null, Depth.EMPTY); } public void testStatusInExternalMove() throws Exception { @@ -671,9 +667,9 @@ public class SvnParseCommandLineParseTest extends TestCase { final String basePath = "C:\\TestProjects\\sortedProjects\\Subversion\\local2\\sep12main\\main"; final SvnStatusHandler[] handler = new SvnStatusHandler[1]; final File baseFile = new File(basePath); - final SvnStatusHandler.ExternalDataCallback callback = CmdStatusClient.createStatusCallback(new ISVNStatusHandler() { + final SvnStatusHandler.ExternalDataCallback callback = CmdStatusClient.createStatusCallback(new StatusConsumer() { @Override - public void handleStatus(SVNStatus status) throws SVNException { + public void consume(Status status) throws SVNException { System.out.println(status.getURL()); if (new File( "C:\\TestProjects\\sortedProjects\\Subversion\\local2\\sep12main\\main\\slave\\src\\com\\slave\\MacMessagesParser.java") @@ -686,9 +682,9 @@ public class SvnParseCommandLineParseTest extends TestCase { } } }, baseFile, createStubInfo(basePath, "http://mainurl/"), handler); - handler[0] = new SvnStatusHandler(callback, baseFile, new Convertor<File, SVNInfo>() { + handler[0] = new SvnStatusHandler(callback, baseFile, new Convertor<File, Info>() { @Override - public SVNInfo convert(File o) { + public Info convert(File o) { try { if (new File("C:\\TestProjects\\sortedProjects\\Subversion\\local2\\sep12main\\main\\slave").equals(o)) { return createStubInfo(o.getPath(), "http://external"); @@ -756,9 +752,9 @@ public class SvnParseCommandLineParseTest extends TestCase { @Override public void switchChangeList(String newList) { } - }, new File(basePath), new Convertor<File, SVNInfo>() { + }, new File(basePath), new Convertor<File, Info>() { @Override - public SVNInfo convert(File o) { + public Info convert(File o) { try { o.getCanonicalFile(); } @@ -846,9 +842,9 @@ public class SvnParseCommandLineParseTest extends TestCase { public void switchChangeList(String newList) { clName[0] = newList; } - }, new File(basePath), new Convertor<File, SVNInfo>() { + }, new File(basePath), new Convertor<File, Info>() { @Override - public SVNInfo convert(File o) { + public Info convert(File o) { try { o.getCanonicalFile(); } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnProtocolsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnProtocolsTest.java index 358f3722d7b5..af17c9aa2190 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnProtocolsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnProtocolsTest.java @@ -35,6 +35,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Processor; import com.intellij.util.containers.Convertor; import junit.framework.Assert; +import org.jetbrains.idea.svn.api.Depth; import org.jetbrains.idea.svn.auth.SvnAuthenticationManager; import org.jetbrains.idea.svn.checkout.SvnCheckoutProvider; import org.junit.Before; @@ -222,7 +223,7 @@ public class SvnProtocolsTest extends Svn17TestCase { root.deleteOnExit(); Assert.assertTrue(root.exists()); SvnCheckoutProvider - .checkout(myProject, root, url, SVNRevision.HEAD, SVNDepth.INFINITY, false, new CheckoutProvider.Listener() { + .checkout(myProject, root, url, SVNRevision.HEAD, Depth.INFINITY, false, new CheckoutProvider.Listener() { @Override public void directoryCheckedOut(File directory, VcsKey vcs) { } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java index 071da76aee78..03d3875b37b2 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnResolveTreeAcceptVariantsTest.java @@ -26,12 +26,12 @@ import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Processor; import junit.framework.Assert; +import org.jetbrains.idea.svn.info.Info; +import org.jetbrains.idea.svn.status.Status; +import org.jetbrains.idea.svn.status.StatusType; import org.jetbrains.idea.svn.treeConflict.SvnTreeConflictResolver; import org.junit.Before; import org.junit.Test; -import org.tmatesoft.svn.core.wc.SVNInfo; -import org.tmatesoft.svn.core.wc.SVNStatus; -import org.tmatesoft.svn.core.wc.SVNStatusType; import java.io.File; import java.io.IOException; @@ -162,43 +162,43 @@ public class SvnResolveTreeAcceptVariantsTest extends Svn17TestCase { } private void checkStatusesAfterMineFullResolve(TreeConflictData.Data data, File conflictIoFile) { - SVNStatus conflStatus = SvnUtil.getStatus(myVcs, conflictIoFile); + Status conflStatus = SvnUtil.getStatus(myVcs, conflictIoFile); Assert.assertTrue(createTestFailedComment(data, conflictIoFile.getPath()) + " tree conflict resolved", conflStatus.getTreeConflict() == null); Collection<TreeConflictData.FileData> leftFiles = data.getLeftFiles(); for (TreeConflictData.FileData file : leftFiles) { File exFile = new File(myWorkingCopyDir.getPath(), file.myRelativePath); - final SVNStatus status = SvnUtil.getStatus(myVcs, exFile); + final Status status = SvnUtil.getStatus(myVcs, exFile); boolean theirsExists = new File(myTheirs.getPath(), file.myRelativePath).exists(); - if (SVNStatusType.STATUS_UNVERSIONED.equals(file.myNodeStatus)) { + if (StatusType.STATUS_UNVERSIONED.equals(file.myNodeStatus)) { Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (file exists)", exFile.exists()); if (theirsExists) { // should be deleted - Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (unversioned)", status == null || SVNStatusType.STATUS_DELETED.equals(status.getNodeStatus())); + Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (unversioned)", status == null || StatusType.STATUS_DELETED.equals(status.getNodeStatus())); } else { // unversioned - Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (unversioned)", status == null || SVNStatusType.STATUS_UNVERSIONED.equals(status.getNodeStatus())); + Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (unversioned)", status == null || StatusType.STATUS_UNVERSIONED.equals(status.getNodeStatus())); } - } else if (SVNStatusType.STATUS_DELETED.equals(file.myNodeStatus)) { + } else if (StatusType.STATUS_DELETED.equals(file.myNodeStatus)) { Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (deleted status)", status != null && file.myNodeStatus.equals(status.getNodeStatus())); - } else if (SVNStatusType.STATUS_ADDED.equals(file.myNodeStatus)) { + } else if (StatusType.STATUS_ADDED.equals(file.myNodeStatus)) { Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (file exists)", exFile.exists()); if (theirsExists) { - Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (added status)", status != null && SVNStatusType.STATUS_REPLACED.equals(status.getNodeStatus())); + Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (added status)", status != null && StatusType.STATUS_REPLACED.equals(status.getNodeStatus())); } else { - Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (added status)", status != null && SVNStatusType.STATUS_ADDED.equals(status.getNodeStatus())); + Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (added status)", status != null && StatusType.STATUS_ADDED.equals(status.getNodeStatus())); } } else { - if (SVNStatusType.STATUS_ADDED.equals(status.getNodeStatus())) { + if (StatusType.STATUS_ADDED.equals(status.getNodeStatus())) { // in theirs -> deleted Assert.assertFalse(createTestFailedComment(data, file.myRelativePath) + " check deleted in theirs", theirsExists); } else { if (theirsExists) { - Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (normal node status)", status != null && SVNStatusType.STATUS_REPLACED.equals(status.getNodeStatus())); + Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (normal node status)", status != null && StatusType.STATUS_REPLACED.equals(status.getNodeStatus())); } else { Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (normal node status)", status != null && - (SVNStatusType.STATUS_NORMAL.equals(status.getNodeStatus()) || SVNStatusType.STATUS_MODIFIED.equals(status.getNodeStatus()))); + (StatusType.STATUS_NORMAL.equals(status.getNodeStatus()) || StatusType.STATUS_MODIFIED.equals(status.getNodeStatus()))); } } Assert.assertTrue(createTestFailedComment(data, exFile.getPath()) + " (modified text status)", status != null && file.myContentsStatus.equals(status.getContentsStatus())); @@ -271,8 +271,8 @@ public class SvnResolveTreeAcceptVariantsTest extends Svn17TestCase { exists); } final File theirsFile = new File(file.getPath()); - SVNInfo theirsInfo = myVcs.getInfo(theirsFile); - SVNInfo thisInfo = myVcs.getInfo(workingFile); + Info theirsInfo = myVcs.getInfo(theirsFile); + Info thisInfo = myVcs.getInfo(workingFile); if (theirsInfo != null) { Assert.assertEquals("Check failed for test: " + getTestName(data) + " and file: " + relative + " in: " + myWorkingCopyDir.getPath() + ", theirs: " + theirsInfo.getRevision().getNumber() + ", mine: " + thisInfo.getRevision().getNumber(), diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java index a38d851fbe8e..00172495348c 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnTreeConflictDataTest.java @@ -23,18 +23,15 @@ import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import junit.framework.Assert; +import org.jetbrains.idea.svn.conflict.ConflictAction; +import org.jetbrains.idea.svn.conflict.ConflictOperation; +import org.jetbrains.idea.svn.conflict.ConflictVersion; +import org.jetbrains.idea.svn.conflict.TreeConflictDescription; import org.junit.Before; import org.junit.Test; -import org.tmatesoft.svn.core.SVNNodeKind; -import org.tmatesoft.svn.core.internal.wc.SVNConflictVersion; -import org.tmatesoft.svn.core.wc.SVNConflictAction; -import org.tmatesoft.svn.core.wc.SVNOperation; -import org.tmatesoft.svn.core.wc.SVNTreeConflictDescription; import java.io.File; -import static com.intellij.util.TimeoutUtil.sleep; - /** * @author Irina.Chernushina * @since 2.05.2012 @@ -71,20 +68,20 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); Assert.assertNull(beforeDescription.getSourceLeftVersion()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); } @Test @@ -99,22 +96,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.DELETE, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.DELETE, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNotNull(leftVersion); - Assert.assertEquals(SVNNodeKind.FILE, leftVersion.getKind()); + Assert.assertTrue(leftVersion.isFile()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.NONE, version.getKind()); + Assert.assertTrue(version.isNone()); } private String createConflict(final TreeConflictData.Data data) throws Exception { @@ -138,22 +135,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.EDIT, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.EDIT, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNotNull(leftVersion); - Assert.assertEquals(SVNNodeKind.FILE, leftVersion.getKind()); + Assert.assertTrue(leftVersion.isFile()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); } @Test @@ -168,22 +165,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.DELETE, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.DELETE, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNotNull(leftVersion); - Assert.assertEquals(SVNNodeKind.FILE, leftVersion.getKind()); + Assert.assertTrue(leftVersion.isFile()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.NONE, version.getKind()); + Assert.assertTrue(version.isNone()); } @Test @@ -198,21 +195,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); + } @Test @@ -229,22 +227,23 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.EDIT, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.EDIT, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNotNull(leftVersion); - Assert.assertEquals(SVNNodeKind.FILE, leftVersion.getKind()); + Assert.assertTrue(leftVersion.isFile()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); + } @Test @@ -261,22 +260,23 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - //Assert.assertEquals(SVNNodeKind.FILE, leftVersion.getKind()); + //Assert.assertEquals(NodeKind.FILE, leftVersion.getKind()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); + } //---------------------------------- dirs -------------------------------------------------------- @@ -292,21 +292,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } // not a conflict in Subversion 1.7.7. "mine" file becomes added @@ -322,22 +322,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.DELETE, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.DELETE, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNotNull(leftVersion); - Assert.assertEquals(SVNNodeKind.DIR, leftVersion.getKind()); + Assert.assertEquals(NodeKind.DIR, leftVersion.getKind()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.NONE, version.getKind()); + Assert.assertEquals(NodeKind.NONE, version.getKind()); }*/ @Test @@ -350,22 +350,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { final Change change = changeListManager.getChange(new FilePathImpl(new File(myWorkingCopyDir.getPath(), conflictFile), true)); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.EDIT, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.EDIT, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNotNull(leftVersion); - Assert.assertEquals(SVNNodeKind.DIR, leftVersion.getKind()); + Assert.assertTrue(leftVersion.isDirectory()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } @Test @@ -380,22 +380,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.DELETE, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.DELETE, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNotNull(leftVersion); - Assert.assertEquals(SVNNodeKind.DIR, leftVersion.getKind()); + Assert.assertTrue(leftVersion.isDirectory()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.NONE, version.getKind()); + Assert.assertTrue(version.isNone()); } @Test @@ -410,21 +410,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } @Test @@ -437,22 +437,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { final Change change = changeListManager.getChange(new FilePathImpl(new File(myWorkingCopyDir.getPath(), conflictFile), true)); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.EDIT, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.EDIT, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNotNull(leftVersion); - Assert.assertEquals(SVNNodeKind.DIR, leftVersion.getKind()); + Assert.assertTrue(leftVersion.isDirectory()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } @Test @@ -465,22 +465,22 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { final Change change = changeListManager.getChange(new FilePathImpl(new File(myWorkingCopyDir.getPath(), conflictFile), true)); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - //Assert.assertEquals(SVNNodeKind.DIR, leftVersion.getKind()); + //Assert.assertEquals(NodeKind.DIR, leftVersion.getKind()); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } //--------------------------------- @Test @@ -498,21 +498,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } @Test @@ -530,21 +530,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } @Test @@ -562,21 +562,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } @Test @@ -594,21 +594,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } @Test @@ -626,21 +626,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.DIR, version.getKind()); + Assert.assertTrue(version.isDirectory()); } //****************************************** // dir -> file (mine, theirs) @@ -659,21 +659,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); } @Test @@ -691,21 +691,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); } @Test @@ -723,21 +723,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); } @Test @@ -755,21 +755,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); } @Test @@ -787,21 +787,21 @@ public class SvnTreeConflictDataTest extends Svn17TestCase { Assert.assertNotNull(vf); final Change change = changeListManager.getChange(vf); Assert.assertTrue(change instanceof ConflictedSvnChange); - SVNTreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); + TreeConflictDescription beforeDescription = ((ConflictedSvnChange)change).getBeforeDescription(); Assert.assertNotNull(beforeDescription); - final SVNTreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); + final TreeConflictDescription afterDescription = ((ConflictedSvnChange)change).getAfterDescription(); Assert.assertNull(afterDescription); - Assert.assertEquals(SVNOperation.UPDATE, beforeDescription.getOperation()); - Assert.assertEquals(SVNConflictAction.ADD, beforeDescription.getConflictAction()); + Assert.assertEquals(ConflictOperation.UPDATE, beforeDescription.getOperation()); + Assert.assertEquals(ConflictAction.ADD, beforeDescription.getConflictAction()); Assert.assertTrue(beforeDescription.isTreeConflict()); - SVNConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); + ConflictVersion leftVersion = beforeDescription.getSourceLeftVersion(); Assert.assertNull(leftVersion); - final SVNConflictVersion version = beforeDescription.getSourceRightVersion(); + final ConflictVersion version = beforeDescription.getSourceRightVersion(); Assert.assertNotNull(version); - Assert.assertEquals(SVNNodeKind.FILE, version.getKind()); + Assert.assertTrue(version.isFile()); } private void createSubTree() throws Exception { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/TreeConflictData.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/TreeConflictData.java index 2114e0e0b82b..178253bf58bf 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/TreeConflictData.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/TreeConflictData.java @@ -15,7 +15,7 @@ */ package org.jetbrains.idea.svn; -import org.tmatesoft.svn.core.wc.SVNStatusType; +import org.jetbrains.idea.svn.status.StatusType; import java.util.ArrayList; import java.util.Arrays; @@ -51,8 +51,8 @@ public interface TreeConflictData { "@@ -0,0 +1,1 @@\n" + "+added text\n" + "\\ No newline at end of file\n", - "added.txt", new FileData[]{new FileData("added.txt", "unversioned text", SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + "added.txt", new FileData[]{new FileData("added.txt", "unversioned text", StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_EDIT_THEIRS_DELETE = new Data("Index: root/source/s1.txt\n" + @@ -62,8 +62,8 @@ public interface TreeConflictData { "@@ -1,1 +0,0 @@\n" + "-123\n" + "\\ No newline at end of file\n", "root/source/s1.txt", - new FileData[] {new FileData("root/source/s1.txt", "1*2*3", SVNStatusType.STATUS_NORMAL, - SVNStatusType.STATUS_MODIFIED, SVNStatusType.STATUS_NORMAL, false)}); + new FileData[] {new FileData("root/source/s1.txt", "1*2*3", StatusType.STATUS_NORMAL, + StatusType.STATUS_MODIFIED, StatusType.STATUS_NORMAL, false)}); Data MINE_DELETE_THEIRS_EDIT = new Data("Index: root/source/s1.txt\n" + "===================================================================\n" + "--- root/source/s1.txt\t(revision 358)\n" + @@ -73,24 +73,24 @@ public interface TreeConflictData { "\\ No newline at end of file\n" + "+1*2*3\n" + "\\ No newline at end of file\n", "root/source/s1.txt", - new FileData[] {new FileData("root/source/s1.txt", null, SVNStatusType.STATUS_DELETED, - SVNStatusType.STATUS_DELETED, SVNStatusType.STATUS_DELETED, false)}); + new FileData[] {new FileData("root/source/s1.txt", null, StatusType.STATUS_DELETED, + StatusType.STATUS_DELETED, StatusType.STATUS_DELETED, false)}); Data MINE_EDIT_THEIRS_MOVE = new Data("Index: root/source/s1.txt\n" + "===================================================================\n" + "--- root/source/s1.txt\t(revision 358)\n" + "+++ root/source/s1renamed.txt\t(revision )\n" + "@@ -1,0 +1,0 @@\n", "root/source/s1.txt", - new FileData[] {new FileData("root/source/s1.txt", "1*2*3", SVNStatusType.STATUS_NORMAL, - SVNStatusType.STATUS_MODIFIED, SVNStatusType.STATUS_NORMAL, false)}); + new FileData[] {new FileData("root/source/s1.txt", "1*2*3", StatusType.STATUS_NORMAL, + StatusType.STATUS_MODIFIED, StatusType.STATUS_NORMAL, false)}); Data MINE_UNV_THEIRS_MOVE = new Data("Index: root/source/s1.txt\n" + "===================================================================\n" + "--- root/source/s1.txt\t(revision 358)\n" + "+++ root/source/s1renamed.txt\t(revision )\n" + "@@ -1,0 +1,0 @@\n", "root/source/s1renamed.txt", - new FileData[] {new FileData("root/source/s1renamed.txt", "1*2*3", SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + new FileData[] {new FileData("root/source/s1renamed.txt", "1*2*3", StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_MOVE_THEIRS_EDIT = new Data("Index: root/source/s1.txt\n" + "===================================================================\n" + @@ -102,10 +102,10 @@ public interface TreeConflictData { "+1*2*3\n" + // conflict would be marked by svn on s1.txt, but here we put s1moved.txt, for change list manager to find the change "\\ No newline at end of file\n", "root/source/s1moved.txt", - new FileData[] {new FileData("root/source/s1moved.txt", null, SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_ADDED, SVNStatusType.STATUS_ADDED, false, "root/source/s1.txt"), - new FileData("root/source/s1.txt", null, SVNStatusType.STATUS_DELETED, - SVNStatusType.STATUS_DELETED, SVNStatusType.STATUS_DELETED, false)}); + new FileData[] {new FileData("root/source/s1moved.txt", null, StatusType.STATUS_ADDED, + StatusType.STATUS_ADDED, StatusType.STATUS_ADDED, false, "root/source/s1.txt"), + new FileData("root/source/s1.txt", null, StatusType.STATUS_DELETED, + StatusType.STATUS_DELETED, StatusType.STATUS_DELETED, false)}); Data MINE_MOVE_THEIRS_ADD = new Data("Index: root/source/s1moved.txt\n" + "===================================================================\n" + "--- root/source/s1moved.txt\t(revision )\n" + @@ -114,10 +114,10 @@ public interface TreeConflictData { "+added text\n" + "\\ No newline at end of file\n", "root/source/s1moved.txt", - new FileData[] {new FileData("root/source/s1moved.txt", null, SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_ADDED, SVNStatusType.STATUS_ADDED, false, "root/source/s1.txt"), - new FileData("root/source/s1.txt", null, SVNStatusType.STATUS_DELETED, - SVNStatusType.STATUS_DELETED, SVNStatusType.STATUS_DELETED, false)}) { + new FileData[] {new FileData("root/source/s1moved.txt", null, StatusType.STATUS_ADDED, + StatusType.STATUS_ADDED, StatusType.STATUS_ADDED, false, "root/source/s1.txt"), + new FileData("root/source/s1.txt", null, StatusType.STATUS_DELETED, + StatusType.STATUS_DELETED, StatusType.STATUS_DELETED, false)}) { @Override protected void afterInit() { setExcludeFromToTheirsCheck("root\\source\\s1.txt"); @@ -133,11 +133,11 @@ public interface TreeConflictData { "@@ -0,0 +1,1 @@\n" + "+added text\n" + "\\ No newline at end of file\n", - "addedDir", new FileData[]{new FileData("addedDir", null, SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + "addedDir", new FileData[]{new FileData("addedDir", null, StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, true), - new FileData("addedDir/unv.txt", "unversioned", SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + new FileData("addedDir/unv.txt", "unversioned", StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_EDIT_THEIRS_DELETE = new Data("Index: root/source/s1.txt\n" + @@ -154,8 +154,8 @@ public interface TreeConflictData { "@@ -1,1 +0,0 @@\n" + "-abc\n" + "\\ No newline at end of file\n", "root/source", - new FileData[] {new FileData("root/source/s1.txt", "1*2*3", SVNStatusType.STATUS_NORMAL, - SVNStatusType.STATUS_MODIFIED, SVNStatusType.STATUS_NORMAL, false)}); + new FileData[] {new FileData("root/source/s1.txt", "1*2*3", StatusType.STATUS_NORMAL, + StatusType.STATUS_MODIFIED, StatusType.STATUS_NORMAL, false)}); Data MINE_DELETE_THEIRS_EDIT = new Data("Index: root/source/s1.txt\n" + "===================================================================\n" + "--- root/source/s1.txt\t(revision 358)\n" + @@ -165,8 +165,8 @@ public interface TreeConflictData { "\\ No newline at end of file\n" + "+1*2*3\n" + "\\ No newline at end of file\n", "root/source", - new FileData[] {new FileData("root/source", null, SVNStatusType.STATUS_DELETED, - SVNStatusType.STATUS_DELETED, SVNStatusType.STATUS_DELETED, true)}); + new FileData[] {new FileData("root/source", null, StatusType.STATUS_DELETED, + StatusType.STATUS_DELETED, StatusType.STATUS_DELETED, true)}); Data MINE_EDIT_THEIRS_MOVE = new Data( "Index: root/source/s1.txt\n" + @@ -180,8 +180,8 @@ public interface TreeConflictData { "+++ root/source1/s2.txt\t(revision )\n" + "@@ -1,0 +1,0 @@\n", "root/source", - new FileData[] {new FileData("root/source/s1.txt", "1*2*3", SVNStatusType.STATUS_NORMAL, - SVNStatusType.STATUS_MODIFIED, SVNStatusType.STATUS_NORMAL, false)}); + new FileData[] {new FileData("root/source/s1.txt", "1*2*3", StatusType.STATUS_NORMAL, + StatusType.STATUS_MODIFIED, StatusType.STATUS_NORMAL, false)}); Data MINE_UNV_THEIRS_MOVE = new Data( "Index: root/source/s1.txt\n" + @@ -194,11 +194,11 @@ public interface TreeConflictData { "--- root/source/s2.txt\t(revision 358)\n" + "+++ root/source1/s2.txt\t(revision )\n" + "@@ -1,0 +1,0 @@\n", "root/source1", - new FileData[] {new FileData("root/source1", null, SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + new FileData[] {new FileData("root/source1", null, StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, true), - new FileData("root/source1/unv.txt", "unversioned", SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + new FileData("root/source1/unv.txt", "unversioned", StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_MOVE_THEIRS_EDIT = new Data("Index: root/source/s1.txt\n" + @@ -211,10 +211,10 @@ public interface TreeConflictData { "+1*2*3\n" + "\\ No newline at end of file\n", "root/source", new FileData[] { - new FileData("root/sourceNew", null, SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_ADDED, SVNStatusType.STATUS_ADDED, true, "root/source"), - new FileData("root/source", null, SVNStatusType.STATUS_DELETED, - SVNStatusType.STATUS_DELETED, SVNStatusType.STATUS_DELETED, true)}); + new FileData("root/sourceNew", null, StatusType.STATUS_ADDED, + StatusType.STATUS_ADDED, StatusType.STATUS_ADDED, true, "root/source"), + new FileData("root/source", null, StatusType.STATUS_DELETED, + StatusType.STATUS_DELETED, StatusType.STATUS_DELETED, true)}); Data MINE_MOVE_THEIRS_ADD = new Data("Index: root/sourceNew/added.txt\n" + "===================================================================\n" + "--- root/sourceNew/added.txt\t(revision )\n" + @@ -223,10 +223,10 @@ public interface TreeConflictData { "+added text\n" + "\\ No newline at end of file\n", "root/sourceNew", new FileData[] { - new FileData("root/sourceNew", null, SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_ADDED, SVNStatusType.STATUS_ADDED, true, "root/source"), - new FileData("root/source", null, SVNStatusType.STATUS_DELETED, - SVNStatusType.STATUS_DELETED, SVNStatusType.STATUS_DELETED, true)}) { + new FileData("root/sourceNew", null, StatusType.STATUS_ADDED, + StatusType.STATUS_ADDED, StatusType.STATUS_ADDED, true, "root/source"), + new FileData("root/source", null, StatusType.STATUS_DELETED, + StatusType.STATUS_DELETED, StatusType.STATUS_DELETED, true)}) { @Override protected void afterInit() { setExcludeFromToTheirsCheck("root\\source", "root\\source\\s1.txt", "root\\source\\s2.txt"); @@ -243,8 +243,8 @@ public interface TreeConflictData { "@@ -0,0 +1,1 @@\n" + "+added text\n" + "\\ No newline at end of file\n", - "addedDir", new FileData[]{new FileData("addedDir", "unversioned", SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + "addedDir", new FileData[]{new FileData("addedDir", "unversioned", StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_ADD_THEIRS_ADD = new Data("Index: addedDir/added.txt\n" + @@ -254,8 +254,8 @@ public interface TreeConflictData { "@@ -0,0 +1,1 @@\n" + "+added text\n" + "\\ No newline at end of file\n", - "addedDir", new FileData[]{new FileData("addedDir", "unversioned", SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + "addedDir", new FileData[]{new FileData("addedDir", "unversioned", StatusType.STATUS_ADDED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_UNV_THEIRS_MOVE = new Data( "Index: root/source/s1.txt\n" + @@ -268,8 +268,8 @@ public interface TreeConflictData { "--- root/source/s2.txt\t(revision 358)\n" + "+++ root/source1/s2.txt\t(revision )\n" + "@@ -1,0 +1,0 @@\n", - "root/source1", new FileData[]{new FileData("root/source1", "unversioned", SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + "root/source1", new FileData[]{new FileData("root/source1", "unversioned", StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_ADD_THEIRS_MOVE = new Data( "Index: root/source/s1.txt\n" + @@ -282,8 +282,8 @@ public interface TreeConflictData { "--- root/source/s2.txt\t(revision 358)\n" + "+++ root/source1/s2.txt\t(revision )\n" + "@@ -1,0 +1,0 @@\n", - "root/source1", new FileData[]{new FileData("root/source1", "unversioned", SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + "root/source1", new FileData[]{new FileData("root/source1", "unversioned", StatusType.STATUS_ADDED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_MOVE_THEIRS_ADD = new Data("Index: addedDir/added.txt\n" + "===================================================================\n" + @@ -292,11 +292,11 @@ public interface TreeConflictData { "@@ -0,0 +1,1 @@\n" + "+added text\n" + "\\ No newline at end of file\n", - "addedDir", new FileData[]{new FileData("addedDir", null, SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_ADDED, SVNStatusType.STATUS_ADDED, + "addedDir", new FileData[]{new FileData("addedDir", null, StatusType.STATUS_ADDED, + StatusType.STATUS_ADDED, StatusType.STATUS_ADDED, false, "root/source/s1.txt"), - new FileData("root/source/s1.txt", null, SVNStatusType.STATUS_DELETED, - SVNStatusType.STATUS_DELETED, SVNStatusType.STATUS_DELETED, + new FileData("root/source/s1.txt", null, StatusType.STATUS_DELETED, + StatusType.STATUS_DELETED, StatusType.STATUS_DELETED, false, null)}) { @Override protected void afterInit() { @@ -314,11 +314,11 @@ public interface TreeConflictData { "@@ -0,0 +1,1 @@\n" + "+added text\n" + "\\ No newline at end of file\n", - "addedDir.txt", new FileData[]{new FileData("addedDir.txt", null, SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + "addedDir.txt", new FileData[]{new FileData("addedDir.txt", null, StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, true), - new FileData("addedDir.txt/unv.txt", "unversioned", SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + new FileData("addedDir.txt/unv.txt", "unversioned", StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_ADD_THEIRS_ADD = new Data("Index: addedDir.txt\n" + @@ -328,11 +328,11 @@ public interface TreeConflictData { "@@ -0,0 +1,1 @@\n" + "+added text\n" + "\\ No newline at end of file\n", - "addedDir.txt", new FileData[]{new FileData("addedDir.txt", null, SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + "addedDir.txt", new FileData[]{new FileData("addedDir.txt", null, StatusType.STATUS_ADDED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, true), - new FileData("addedDir.txt/unv.txt", "unversioned", SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + new FileData("addedDir.txt/unv.txt", "unversioned", StatusType.STATUS_ADDED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_UNV_THEIRS_MOVE = new Data( "Index: root/source/s1.txt\n" + @@ -342,12 +342,12 @@ public interface TreeConflictData { "@@ -1,0 +1,0 @@\n" + "\\ No newline at end of file\n", "root/source/s1renamed.txt", new FileData[]{new FileData("root/source/s1renamed.txt", null, - SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, true), new FileData("root/source/s1renamed.txt/file.txt", "unversioned", - SVNStatusType.STATUS_UNVERSIONED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_ADD_THEIRS_MOVE = new Data( "Index: root/source/s1.txt\n" + @@ -357,12 +357,12 @@ public interface TreeConflictData { "@@ -1,0 +1,0 @@\n" + "\\ No newline at end of file\n", "root/source/s1renamed.txt", new FileData[]{new FileData("root/source/s1renamed.txt", null, - SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + StatusType.STATUS_ADDED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, true), new FileData("root/source/s1renamed.txt/file.txt", "unversioned", - SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_UNVERSIONED, SVNStatusType.STATUS_UNVERSIONED, + StatusType.STATUS_ADDED, + StatusType.STATUS_UNVERSIONED, StatusType.STATUS_UNVERSIONED, false)}); Data MINE_MOVE_THEIRS_ADD = new Data("Index: addedDir.txt\n" + @@ -372,10 +372,10 @@ public interface TreeConflictData { "@@ -0,0 +1,1 @@\n" + "+added text\n" + "\\ No newline at end of file\n", - "addedDir.txt", new FileData[]{new FileData("addedDir.txt", null, SVNStatusType.STATUS_ADDED, - SVNStatusType.STATUS_ADDED, SVNStatusType.STATUS_ADDED, true, "root/source"), - new FileData("root/source", null, SVNStatusType.STATUS_DELETED, - SVNStatusType.STATUS_DELETED, SVNStatusType.STATUS_DELETED, true)}) { + "addedDir.txt", new FileData[]{new FileData("addedDir.txt", null, StatusType.STATUS_ADDED, + StatusType.STATUS_ADDED, StatusType.STATUS_ADDED, true, "root/source"), + new FileData("root/source", null, StatusType.STATUS_DELETED, + StatusType.STATUS_DELETED, StatusType.STATUS_DELETED, true)}) { @Override protected void afterInit() { setExcludeFromToTheirsCheck("root\\source", "root\\source\\s1.txt", "root\\source\\s2.txt"); @@ -424,26 +424,26 @@ public interface TreeConflictData { public final String myRelativePath; public final String myContents; public final String myCopyFrom; - public final SVNStatusType myNodeStatus; - public final SVNStatusType myContentsStatus; + public final StatusType myNodeStatus; + public final StatusType myContentsStatus; // not used for now - public final SVNStatusType myPropertiesStatus; + public final StatusType myPropertiesStatus; public boolean myIsDir; public FileData(String relativePath, String contents, - SVNStatusType nodeStatus, - SVNStatusType contentsStatus, - SVNStatusType propertiesStatus, + StatusType nodeStatus, + StatusType contentsStatus, + StatusType propertiesStatus, boolean isDir) { this(relativePath, contents, nodeStatus, contentsStatus, propertiesStatus, isDir, null); } public FileData(String relativePath, String contents, - SVNStatusType nodeStatus, - SVNStatusType contentsStatus, - SVNStatusType propertiesStatus, + StatusType nodeStatus, + StatusType contentsStatus, + StatusType propertiesStatus, boolean isDir, final String copyFrom) { myRelativePath = relativePath; myContents = contents; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java index 749ee38c9336..c5f7b9d4757e 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnCachingRevisionsTest.java @@ -10,7 +10,6 @@ import com.intellij.testFramework.fixtures.CodeInsightFixtureTestCase; import org.jetbrains.idea.svn.SvnApplicationSettings; import org.jetbrains.idea.svn.SvnUtil; import org.jetbrains.idea.svn.history.*; -import org.tmatesoft.svn.core.SVNLogEntry; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.wc.SVNRevision; @@ -38,8 +37,9 @@ public class SvnCachingRevisionsTest extends CodeInsightFixtureTestCase { } private SvnChangeList createList(final long revision) { - return new SvnChangeList(null, myLocation, - new SVNLogEntry(Collections.emptyMap(), revision, AUTHOR, new Date(System.currentTimeMillis()), ""), ROOT.toDecodedString()); + LogEntry entry = + new LogEntry.Builder().setRevision(revision).setAuthor(AUTHOR).setDate(new Date(System.currentTimeMillis())).setMessage("").build(); + return new SvnChangeList(null, myLocation, entry, ROOT.toDecodedString()); } private class MockSvnLogLoader implements SvnLogLoader { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java index cab82d7fc929..028b8c5c631a 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnMergeInfoTest.java @@ -25,6 +25,7 @@ import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.idea.svn.*; +import org.jetbrains.idea.svn.api.Depth; import org.jetbrains.idea.svn.dialogs.MergeContext; import org.jetbrains.idea.svn.dialogs.WCInfo; import org.jetbrains.idea.svn.history.SvnChangeList; @@ -34,7 +35,6 @@ import org.jetbrains.idea.svn.mergeinfo.OneShotMergeInfoHelper; import org.jetbrains.idea.svn.mergeinfo.SvnMergeInfoCache; import org.junit.Assert; import org.junit.Test; -import org.tmatesoft.svn.core.SVNDepth; import org.tmatesoft.svn.core.SVNURL; import org.tmatesoft.svn.core.wc.SVNInfo; import org.tmatesoft.svn.core.wc.SVNPropertyData; @@ -65,7 +65,7 @@ public class SvnMergeInfoTest extends Svn16TestCase { VirtualFile vcsRoot = LocalFileSystem.getInstance().findFileByIoFile(myBranchVcsRoot); Node node = new Node(vcsRoot, SVNURL.parseURIEncoded(myRepoUrl + "/branch"), SVNURL.parseURIEncoded(myRepoUrl)); RootUrlInfo root = new RootUrlInfo(node, WorkingCopyFormat.ONE_DOT_SIX, vcsRoot, null); - myWCInfo = new WCInfo(root, true, SVNDepth.INFINITY); + myWCInfo = new WCInfo(root, true, Depth.INFINITY); myMergeContext = new MergeContext(SvnVcs.getInstance(myProject), myRepoUrl + "/trunk", myWCInfo, "trunk", vcsRoot); myOneShotMergeInfoHelper = new OneShotMergeInfoHelper(myMergeContext); |