Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorLars Vogel2019-09-04 05:19:58 -0400
committerLars Vogel2019-09-13 08:09:39 -0400
commit48cbf0b4cfbe6c28fb8c61691cde326c3452c6ce (patch)
tree37a005aa6a56a85a98d83874f4674cc4be284ab7 /tests
parentfff998f53c567476ca114754ee752dab8e864eb2 (diff)
downloadeclipse.platform.team-master.tar.gz
eclipse.platform.team-master.tar.xz
eclipse.platform.team-master.zip
Use StringBuilder in org.eclipse.compare.testsHEADI20190914-1800I20190913-1800master
Change-Id: I74636dbde847e5b473b2b6720e11f49afdaccb3d Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.compare.tests/pom.xml2
-rw-r--r--tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StreamMergerTest.java18
3 files changed, 11 insertions, 11 deletions
diff --git a/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
index 8f9317bf8..52438a248 100644
--- a/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.compare.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.compare.tests;singleton:=true
-Bundle-Version: 3.6.600.qualifier
+Bundle-Version: 3.6.700.qualifier
Require-Bundle: org.junit,
org.eclipse.compare,
org.eclipse.jface.text,
diff --git a/tests/org.eclipse.compare.tests/pom.xml b/tests/org.eclipse.compare.tests/pom.xml
index e7e7a89cc..8f9275875 100644
--- a/tests/org.eclipse.compare.tests/pom.xml
+++ b/tests/org.eclipse.compare.tests/pom.xml
@@ -19,7 +19,7 @@
</parent>
<groupId>org.eclipse.compare</groupId>
<artifactId>org.eclipse.compare.tests</artifactId>
- <version>3.6.600-SNAPSHOT</version>
+ <version>3.6.700-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StreamMergerTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StreamMergerTest.java
index 406003315..2f7baea22 100644
--- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StreamMergerTest.java
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/StreamMergerTest.java
@@ -46,7 +46,7 @@ public class StreamMergerTest extends TestCase {
String t= ABC + SEPARATOR + DEF + SEPARATOR + XYZ;
String o= ABC + SEPARATOR + DEF + SEPARATOR + _123 + SEPARATOR + XYZ;
- StringBuffer output= new StringBuffer();
+ StringBuilder output= new StringBuilder();
IStatus status= merge(output, a, t, o);
@@ -61,7 +61,7 @@ public class StreamMergerTest extends TestCase {
String t= ABC + SEPARATOR + DEF + SEPARATOR + XYZ;
String o= ABC + SEPARATOR + XYZ;
- StringBuffer output= new StringBuffer();
+ StringBuilder output= new StringBuilder();
IStatus status= merge(output, a, t, o);
@@ -76,7 +76,7 @@ public class StreamMergerTest extends TestCase {
String t= ABC + SEPARATOR + DEF + SEPARATOR + XYZ;
String o= ABC + SEPARATOR + _123 + SEPARATOR + XYZ;
- StringBuffer output= new StringBuffer();
+ StringBuilder output= new StringBuilder();
IStatus status= merge(output, a, t, o);
@@ -91,7 +91,7 @@ public class StreamMergerTest extends TestCase {
String t= ABC + SEPARATOR + DEF + SEPARATOR + XYZ + SEPARATOR + FOO;
String o= ABC + SEPARATOR + _123 + SEPARATOR + _456 + SEPARATOR + XYZ;
- StringBuffer output= new StringBuffer();
+ StringBuilder output= new StringBuilder();
IStatus status= merge(output, a, t, o);
@@ -106,7 +106,7 @@ public class StreamMergerTest extends TestCase {
String t= ABC + SEPARATOR + FOO + SEPARATOR + XYZ;
String o= ABC + SEPARATOR + BAR + SEPARATOR + XYZ;
- StringBuffer output= new StringBuffer();
+ StringBuilder output= new StringBuilder();
IStatus status= merge(output, a, t, o);
@@ -120,7 +120,7 @@ public class StreamMergerTest extends TestCase {
String t= ABC + SEPARATOR + DEF + SEPARATOR + _123 + SEPARATOR + XYZ;
String o= ABC + SEPARATOR + DEF + SEPARATOR + _123 + SEPARATOR + XYZ;
- StringBuffer output= new StringBuffer();
+ StringBuilder output= new StringBuilder();
IStatus status= merge(output, a, t, o);
@@ -135,7 +135,7 @@ public class StreamMergerTest extends TestCase {
String t= ABC + SEPARATOR + XYZ;
String o= ABC + SEPARATOR + XYZ;
- StringBuffer output= new StringBuffer();
+ StringBuilder output= new StringBuilder();
IStatus status= merge(output, a, t, o);
@@ -144,7 +144,7 @@ public class StreamMergerTest extends TestCase {
assertEquals(output.toString(), ABC + SEPARATOR + XYZ + SEPARATOR);
}
- private IStatus merge(StringBuffer output, String a, String m, String y) {
+ private IStatus merge(StringBuilder output, String a, String m, String y) {
InputStream ancestor= new ByteArrayInputStream(a.getBytes(StandardCharsets.UTF_8));
InputStream target= new ByteArrayInputStream(m.getBytes(StandardCharsets.UTF_8));
InputStream other= new ByteArrayInputStream(y.getBytes(StandardCharsets.UTF_8));
@@ -152,7 +152,7 @@ public class StreamMergerTest extends TestCase {
return merge(output, ancestor, target, other);
}
- private IStatus merge(StringBuffer output, InputStream ancestor,
+ private IStatus merge(StringBuilder output, InputStream ancestor,
InputStream target, InputStream other) {
ByteArrayOutputStream os= new ByteArrayOutputStream();

Back to the top