diff options
Diffstat (limited to 'org.eclipse.jgit.pgm.test')
6 files changed, 40 insertions, 29 deletions
diff --git a/org.eclipse.jgit.pgm.test/.classpath b/org.eclipse.jgit.pgm.test/.classpath index b26f4c45d1..1334739b76 100644 --- a/org.eclipse.jgit.pgm.test/.classpath +++ b/org.eclipse.jgit.pgm.test/.classpath @@ -1,7 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="tst"/> - <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="tst"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" path="src"> + <attributes> + <attribute name="test" value="true"/> + </attributes> + </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="output" path="bin"/> diff --git a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs index 794592dee1..2ca78ff2d0 100644 --- a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs +++ b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.jdt.core.prefs @@ -91,7 +91,7 @@ org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning +org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore diff --git a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.mylyn.team.ui.prefs b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.mylyn.team.ui.prefs index 0cba949fb7..2fca432276 100644 --- a/org.eclipse.jgit.pgm.test/.settings/org.eclipse.mylyn.team.ui.prefs +++ b/org.eclipse.jgit.pgm.test/.settings/org.eclipse.mylyn.team.ui.prefs @@ -1,3 +1,3 @@ #Tue Jul 19 20:11:28 CEST 2011 -commit.comment.template=${task.description} \n\nBug\: ${task.key} +commit.comment.template=${task.description}\n\nBug\: ${task.key} eclipse.preferences.version=1 diff --git a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF index 97a7ba22d8..90398a956c 100644 --- a/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF +++ b/org.eclipse.jgit.pgm.test/META-INF/MANIFEST.MF @@ -3,28 +3,28 @@ Bundle-ManifestVersion: 2 Bundle-Name: %plugin_name Automatic-Module-Name: org.eclipse.jgit.pgm.test Bundle-SymbolicName: org.eclipse.jgit.pgm.test -Bundle-Version: 5.1.9.qualifier +Bundle-Version: 5.2.3.qualifier Bundle-Vendor: %provider_name Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Import-Package: org.eclipse.jgit.api;version="[5.1.9,5.2.0)", - org.eclipse.jgit.api.errors;version="[5.1.9,5.2.0)", - org.eclipse.jgit.diff;version="[5.1.9,5.2.0)", - org.eclipse.jgit.dircache;version="[5.1.9,5.2.0)", - org.eclipse.jgit.internal.storage.file;version="5.1.9", - org.eclipse.jgit.junit;version="[5.1.9,5.2.0)", - org.eclipse.jgit.lib;version="[5.1.9,5.2.0)", - org.eclipse.jgit.merge;version="[5.1.9,5.2.0)", - org.eclipse.jgit.pgm;version="[5.1.9,5.2.0)", - org.eclipse.jgit.pgm.internal;version="[5.1.9,5.2.0)", - org.eclipse.jgit.pgm.opt;version="[5.1.9,5.2.0)", - org.eclipse.jgit.revwalk;version="[5.1.9,5.2.0)", - org.eclipse.jgit.storage.file;version="[5.1.9,5.2.0)", - org.eclipse.jgit.transport;version="[5.1.9,5.2.0)", - org.eclipse.jgit.treewalk;version="[5.1.9,5.2.0)", - org.eclipse.jgit.util;version="[5.1.9,5.2.0)", - org.eclipse.jgit.util.io;version="[5.1.9,5.2.0)", +Import-Package: org.eclipse.jgit.api;version="[5.2.3,5.3.0)", + org.eclipse.jgit.api.errors;version="[5.2.3,5.3.0)", + org.eclipse.jgit.diff;version="[5.2.3,5.3.0)", + org.eclipse.jgit.dircache;version="[5.2.3,5.3.0)", + org.eclipse.jgit.internal.storage.file;version="5.2.3", + org.eclipse.jgit.junit;version="[5.2.3,5.3.0)", + org.eclipse.jgit.lib;version="[5.2.3,5.3.0)", + org.eclipse.jgit.merge;version="[5.2.3,5.3.0)", + org.eclipse.jgit.pgm;version="[5.2.3,5.3.0)", + org.eclipse.jgit.pgm.internal;version="[5.2.3,5.3.0)", + org.eclipse.jgit.pgm.opt;version="[5.2.3,5.3.0)", + org.eclipse.jgit.revwalk;version="[5.2.3,5.3.0)", + org.eclipse.jgit.storage.file;version="[5.2.3,5.3.0)", + org.eclipse.jgit.transport;version="[5.2.3,5.3.0)", + org.eclipse.jgit.treewalk;version="[5.2.3,5.3.0)", + org.eclipse.jgit.util;version="[5.2.3,5.3.0)", + org.eclipse.jgit.util.io;version="[5.2.3,5.3.0)", org.hamcrest.core;bundle-version="[1.1.0,2.0.0)", org.junit;version="[4.12,5.0.0)", org.junit.rules;version="[4.12,5.0.0)", diff --git a/org.eclipse.jgit.pgm.test/pom.xml b/org.eclipse.jgit.pgm.test/pom.xml index d5641bec1c..ced7168068 100644 --- a/org.eclipse.jgit.pgm.test/pom.xml +++ b/org.eclipse.jgit.pgm.test/pom.xml @@ -50,7 +50,7 @@ <parent> <groupId>org.eclipse.jgit</groupId> <artifactId>org.eclipse.jgit-parent</artifactId> - <version>5.1.9-SNAPSHOT</version> + <version>5.2.3-SNAPSHOT</version> </parent> <artifactId>org.eclipse.jgit.pgm.test</artifactId> @@ -109,7 +109,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>@{argLine} -Xmx512m -Djava.io.tmpdir=${project.build.directory}</argLine> + <argLine>-Djava.io.tmpdir=${project.build.directory}</argLine> </configuration> </plugin> </plugins> diff --git a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java index 81875f11bc..9ad22ddf2e 100644 --- a/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java +++ b/org.eclipse.jgit.pgm.test/src/org/eclipse/jgit/pgm/CLIGitCommand.java @@ -42,11 +42,13 @@ */ package org.eclipse.jgit.pgm; +import static java.nio.charset.StandardCharsets.UTF_8; import static org.junit.Assert.assertNull; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; @@ -153,7 +155,8 @@ public class CLIGitCommand extends Main { @Override PrintWriter createErrorWriter() { - return new PrintWriter(result.err); + return new PrintWriter(new OutputStreamWriter( + result.err, UTF_8)); } @Override @@ -249,19 +252,19 @@ public class CLIGitCommand extends Main { } public String outString() { - return out.toString(); + return new String(out.toByteArray(), UTF_8); } public List<String> outLines() { - return IO.readLines(out.toString()); + return IO.readLines(outString()); } public String errString() { - return err.toString(); + return new String(err.toByteArray(), UTF_8); } public List<String> errLines() { - return IO.readLines(err.toString()); + return IO.readLines(errString()); } } |