diff options
Diffstat (limited to 'plugins/svn4idea/testSource/org/jetbrains/idea')
5 files changed, 27 insertions, 26 deletions
diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java index d5a55520adae..00d96b882013 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/SvnTestCase.java @@ -18,6 +18,7 @@ package org.jetbrains.idea; import com.intellij.execution.process.ProcessOutput; import com.intellij.ide.startup.impl.StartupManagerImpl; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; @@ -503,7 +504,7 @@ public abstract class SvnTestCase extends AbstractJunitVcsTestCase { @Nullable @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return project; } return null; diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java index c6795b034068..cc05bf67be0b 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnAnnotationIsClosedTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 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. @@ -16,8 +16,8 @@ package org.jetbrains.idea.svn; import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsConfiguration; @@ -78,7 +78,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { checkin(); final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -117,7 +117,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { runInAndVerifyIgnoreOutput("up", "-r", "2"); final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -138,7 +138,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { @Nullable @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } return null; @@ -162,7 +162,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { runInAndVerifyIgnoreOutput("up", "-r", "2"); // take #2 final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -185,7 +185,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { @Nullable @Override public Object getData(@NonNls String dataId) { - if (PlatformDataKeys.PROJECT.is(dataId)) { + if (CommonDataKeys.PROJECT.is(dataId)) { return myProject; } return null; @@ -209,7 +209,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { runInAndVerifyIgnoreOutput("up", "-r", "2"); // take #2 final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -244,7 +244,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { checkin(); final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -276,7 +276,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { editFileInCommand(myProject, tree.myS1File, "1\n2\n3**\n4++\n"); final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -304,7 +304,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { checkin(); //#3 final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -375,7 +375,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { // then annotate both final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(vf1); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), vf1); annotation.setCloser(new Runnable() { @Override public void run() { @@ -385,7 +385,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { }); listener.registerAnnotation(vf1, annotation); - final FileAnnotation annotation1 = myVcs.getAnnotationProvider().annotate(vf2); + final FileAnnotation annotation1 = createTestAnnotation(myVcs.getAnnotationProvider(), vf2); annotation1.setCloser(new Runnable() { @Override public void run() { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java index 4d41c33d544d..8a672fddb061 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn/SvnConcurrentChangeListManagerTest.java @@ -36,7 +36,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn17TestCase { @Override public void setUp() throws Exception { super.setUp(); - myDefaulListName = VcsBundle.message("changes.default.changlist.name"); + myDefaulListName = VcsBundle.message("changes.default.changelist.name"); myScheme = new DuringChangeListManagerUpdateTestScheme(myProject, myTempDirFixture.getTempDirPath()); } diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnAnnotationIsClosedTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnAnnotationIsClosedTest.java index ee6de3928a44..ed5eb0b33c1a 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnAnnotationIsClosedTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnAnnotationIsClosedTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2013 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. @@ -74,7 +74,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { checkin(); final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -113,7 +113,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { runInAndVerifyIgnoreOutput("up", "-r", "2"); final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -141,7 +141,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { runInAndVerifyIgnoreOutput("up", "-r", "2"); // take #2 final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -171,7 +171,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { runInAndVerifyIgnoreOutput("up", "-r", "2"); // take #2 final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -206,7 +206,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { checkin(); final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -238,7 +238,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { editFileInCommand(myProject, tree.myS1File, "1\n2\n3**\n4++\n"); final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -266,7 +266,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { checkin(); //#3 final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(tree.myS1File); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), tree.myS1File); annotation.setCloser(new Runnable() { @Override public void run() { @@ -337,7 +337,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { // then annotate both final VcsAnnotationLocalChangesListener listener = ProjectLevelVcsManager.getInstance(myProject).getAnnotationLocalChangesListener(); - final FileAnnotation annotation = myVcs.getAnnotationProvider().annotate(vf1); + final FileAnnotation annotation = createTestAnnotation(myVcs.getAnnotationProvider(), vf1); annotation.setCloser(new Runnable() { @Override public void run() { @@ -347,7 +347,7 @@ public class SvnAnnotationIsClosedTest extends Svn17TestCase { }); listener.registerAnnotation(vf1, annotation); - final FileAnnotation annotation1 = myVcs.getAnnotationProvider().annotate(vf2); + final FileAnnotation annotation1 = createTestAnnotation(myVcs.getAnnotationProvider(), vf2); annotation1.setCloser(new Runnable() { @Override public void run() { diff --git a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java index d4f0a90510e7..2cc1c26c4b9e 100644 --- a/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java +++ b/plugins/svn4idea/testSource/org/jetbrains/idea/svn16/SvnConcurrentChangeListManagerTest.java @@ -36,7 +36,7 @@ public class SvnConcurrentChangeListManagerTest extends Svn16TestCase { @Override public void setUp() throws Exception { super.setUp(); - myDefaulListName = VcsBundle.message("changes.default.changlist.name"); + myDefaulListName = VcsBundle.message("changes.default.changelist.name"); myScheme = new DuringChangeListManagerUpdateTestScheme(myProject, myTempDirFixture.getTempDirPath()); } |