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

git tests: better adjust notification content for assertions

Browse Source 
Trim each line individually.
Treat <hr/> as line break to avoid fighting with presense or absense of line breaks around <hr/>.

Also use Streams to improve readability a bit.
This commit is contained in:
Kirill Likhodedov
2017-02-07 11:51:07 +00:00
parent e22b24ee12
commit bac02b92c7
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/git4idea/tests/git4idea/test/GitTestUtil.java
+10 -8
View File
@@ -22,7 +22,6 @@ import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.ProjectLevelVcsManager;
import com.intellij.openapi.vcs.impl.ProjectLevelVcsManagerImpl;
import com.intellij.openapi.vfs.LocalFileSystem;
@@ -41,16 +40,15 @@ import org.picocontainer.MutablePicoContainer;
import java.io.File;
import java.io.IOException;
import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import static com.intellij.openapi.vcs.Executor.append;
import static com.intellij.openapi.util.text.StringUtil.splitByLines;
import static com.intellij.openapi.vcs.Executor.*;
import static com.intellij.openapi.vcs.Executor.cd;
import static com.intellij.openapi.vcs.Executor.mkdir;
import static com.intellij.openapi.vcs.Executor.touch;
import static git4idea.test.GitExecutor.*;
import static git4idea.test.GitExecutor.git;
import static git4idea.test.GitExecutor.last;
import static junit.framework.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -172,7 +170,7 @@ public class GitTestUtil {
@NotNull
public static Set<VcsRef> readAllRefs(@NotNull VirtualFile root, @NotNull VcsLogObjectsFactory objectsFactory) {
String[] refs = StringUtil.splitByLines(git("log --branches --tags --no-walk --format=%H%d --decorate=full"));
String[] refs = splitByLines(git("log --branches --tags --no-walk --format=%H%d --decorate=full"));
Set<VcsRef> result = ContainerUtil.newHashSet();
for (String ref : refs) {
result.addAll(new RefParser(objectsFactory).parseCommitRefs(ref, root));
@@ -199,7 +197,11 @@ public class GitTestUtil {
@NotNull
public static String cleanupForAssertion(@NotNull String content) {
return content.replace("<br/>", "\n").replace("\n", " ").replaceAll("[ ]{2,}", " ").replaceAll(" href='[^']*'", "").trim();
String nobr = content.replace("<br/>", "\n").replace("<hr/>", "\n");
return Arrays.stream(splitByLines(nobr))
.map(line -> line.replaceAll(" href='[^']*'", "").trim())
.filter(line -> !line.isEmpty())
.collect(Collectors.joining(" "));
}
@NotNull