From f75f6ecaf29dd1f2c6fbf820b2b7e4b39fa6be98 Mon Sep 17 00:00:00 2001
From: "Ilya.Kazakevich" <Ilya.Kazakevich@jetbrains.com>
Date: Tue, 7 Oct 2014 23:38:46 +0400
Subject: [PATCH 1/2] ManageTaskLibraryTest fixed

---
 .../jetbrains/python/fixtures/PyTestCase.java | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java b/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java
index 18dec8438a21..9fd93f9ddfec 100644
--- a/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java
+++ b/python/testSrc/com/jetbrains/python/fixtures/PyTestCase.java
@@ -15,6 +15,7 @@
  */
 package com.jetbrains.python.fixtures;
 
+import com.google.common.base.Joiner;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInspection.LocalQuickFix;
@@ -68,11 +69,10 @@ import com.jetbrains.python.psi.impl.PyFileImpl;
 import com.jetbrains.python.psi.impl.PythonLanguageLevelPusher;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.junit.Assert;
 
 import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author yole
@@ -100,12 +100,12 @@ public abstract class PyTestCase extends UsefulTestCase {
     IdeaTestFixtureFactory factory = IdeaTestFixtureFactory.getFixtureFactory();
     TestFixtureBuilder<IdeaProjectTestFixture> fixtureBuilder = factory.createLightFixtureBuilder(getProjectDescriptor());
     final IdeaProjectTestFixture fixture = fixtureBuilder.getFixture();
-      myFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(fixture,
-                                                                                      new LightTempDirTestFixtureImpl(true));
-      myFixture.setUp();
+    myFixture = IdeaTestFixtureFactory.getFixtureFactory().createCodeInsightFixture(fixture,
+                                                                                    new LightTempDirTestFixtureImpl(true));
+    myFixture.setUp();
 
-      myFixture.setTestDataPath(getTestDataPath());
-    }
+    myFixture.setTestDataPath(getTestDataPath());
+  }
 
   protected String getTestDataPath() {
     return PythonTestUtil.getTestDataPath();
@@ -319,5 +319,18 @@ public abstract class PyTestCase extends UsefulTestCase {
     }
     return null;
   }
+
+  /**
+   * Comares sets with string sorting them and displaying one-per-line to make comparision easier
+   * @param message message to display in case of error
+   * @param actual actual set
+   * @param expected expected set
+   */
+  protected static void compareStringSets(@NotNull final String message,
+                                          @NotNull final Set<String> actual,
+                                          @NotNull final Set<String> expected) {
+    final Joiner joiner = Joiner.on("\n");
+    Assert.assertEquals(message, joiner.join(new TreeSet<String>(actual)), joiner.join(new TreeSet<String>(expected)));
+  }
 }
 

From f479e27f96702c1f2bc59604871f79cacdff5eae Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Tue, 7 Oct 2014 23:39:47 +0400
Subject: [PATCH 2/2] [git] Fix a misprint: the parameter is nullable

---
 plugins/git4idea/src/git4idea/push/GitPushTagPanel.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java b/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
index 7201067d5c6f..21a86a63ac41 100644
--- a/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushTagPanel.java
@@ -33,7 +33,7 @@ class GitPushTagPanel extends VcsPushOptionsPanel {
   private final ComboBox myCombobox;
   private final JBCheckBox myCheckBox;
 
-  GitPushTagPanel(@NotNull GitPushTagMode defaultMode, boolean followTagsSupported) {
+  GitPushTagPanel(@Nullable GitPushTagMode defaultMode, boolean followTagsSupported) {
     String checkboxText = "Push Tags";
     if (followTagsSupported) {
       checkboxText += ": ";