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

Fix GitCrlfProblemsDetectorTest

Browse Source
This commit is contained in:
Ivan Semenov
2017-11-20 17:38:43 +03:00
parent 9941c8e40a
commit fc66b9b4f0
1 changed files with 2 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/crlf/GitCrlfProblemsDetectorTest.java
+2 -35
View File
@@ -17,10 +17,6 @@ import java.util.List;
import static java.util.Arrays.asList;
public class GitCrlfProblemsDetectorTest extends GitSingleRepoTest {
private String myOldGlobalAutoCrlfValue;
private String myOldSystemAutoCrlfValue;
public void setUp() throws Exception {
try {
super.setUp();
@@ -30,31 +26,7 @@ public class GitCrlfProblemsDetectorTest extends GitSingleRepoTest {
throw e;
}
Executor.cd(projectRoot);
try {
myOldGlobalAutoCrlfValue = git("config --global core.autocrlf", true);
git("config --global --unset core.autocrlf", true);
}
catch (Exception e) {
System.out.println("Couldn't operate with global config: " + e.getMessage());
}
myOldSystemAutoCrlfValue = git("config --system core.autocrlf", true);
git("config --system --unset core.autocrlf", true);
}
public void tearDown() throws Exception {
try {
if (!StringUtil.isEmptyOrSpaces(myOldGlobalAutoCrlfValue)) {
git("config --global core.autocrlf " + myOldGlobalAutoCrlfValue);
}
if (!StringUtil.isEmptyOrSpaces(myOldSystemAutoCrlfValue)) {
git("config --system core.autocrlf " + myOldSystemAutoCrlfValue);
}
}
finally {
super.tearDown();
}
git("config core.autocrlf false");
}
public void test_no_warning_if_autocrlf_is_true() throws IOException {
@@ -72,11 +44,6 @@ public class GitCrlfProblemsDetectorTest extends GitSingleRepoTest {
assertFalse("No warning should be done if all files are LFs", detect("temp").shouldWarn());
}
public void test_no_warning_if_file_with_CRLF_no_attrs_autocrlf_is_false() throws IOException {
createCrlfFile("win");
assertFalse("Warning should be done for a CRLF file with core.autocrlf = false", detect("temp").shouldWarn());
}
public void test_no_warning_if_file_with_CRLF_but_text_is_set() throws IOException {
gitattributes("* text=auto");
createCrlfFile("win");
@@ -101,7 +68,7 @@ public class GitCrlfProblemsDetectorTest extends GitSingleRepoTest {
assertFalse("No warning should be done if the file has a crlf attribute", detect("win").shouldWarn());
}
public void test_warning_if_file_with_CRLF_nothing_is_set() throws IOException {
public void test_warning_if_file_with_CRLF_no_attrs_autocrlf_is_false() throws IOException {
createCrlfFile("win");
assertTrue("Warning should be done if the file has CRLFs inside, and no explicit attributes", detect("win").shouldWarn());
}