Merge remote-tracking branch 'origin/master'

platform/dvcs/testFramework/com/intellij/dvcs/test/MockVirtualFile.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.
@@ -114,6 +114,9 @@ public class MockVirtualFile extends VirtualFile {
   @Override
   public VirtualFile[] getChildren() {
     String[] list = new File(myPath).list();
+    if (list == null) {
+      return EMPTY_ARRAY;
+    }
     VirtualFile[] files = new VirtualFile[list.length];
     for (int i = 0; i < list.length; i++) {
       files[i] = new MockVirtualFile(myPath + "/" + list[i]);

plugins/git4idea/tests/git4idea/repo/GitRepositoryReaderNewTest.groovy

@@ -14,19 +14,17 @@
  * limitations under the License.
  */
 package git4idea.repo
-
 import com.intellij.openapi.application.PluginPathManager
 import git4idea.GitLocalBranch
-import git4idea.test.GitExecutor
 import git4idea.test.GitLightTest
-import git4idea.test.GitScenarios
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 
+import static git4idea.test.GitScenarios.commit
+import static git4idea.test.GitScenarios.conflict
 import static junit.framework.Assert.assertEquals
 import static junit.framework.Assert.assertNull
-
 /**
  * {@link GitRepositoryReaderTest} reads information from the pre-created .git directory from a real project.
  * This one, on the other hand, operates on a live Git repository, putting it to various situations and checking the results.