Skip to content

Commit e82de45

Browse files
committed
Deleting a method used in a single test only.
1 parent 4ca1f7d commit e82de45

3 files changed

Lines changed: 2 additions & 35 deletions

File tree

java/client/src/org/openqa/selenium/io/FileHandler.java

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,11 @@
2222

2323
import org.openqa.selenium.Platform;
2424

25-
import java.io.BufferedReader;
2625
import java.io.File;
2726
import java.io.FileOutputStream;
2827
import java.io.OutputStream;
29-
import java.io.FileReader;
3028
import java.io.IOException;
3129
import java.io.InputStream;
32-
import java.io.Reader;
3330
import java.nio.file.Files;
3431
import java.util.List;
3532
import java.util.function.Predicate;
@@ -184,20 +181,4 @@ private static void copyFile(File from, File to, Predicate<File> onlyCopy) throw
184181
}
185182
}
186183
}
187-
188-
public static String readAsString(File toRead) throws IOException {
189-
try (Reader reader = new BufferedReader(new FileReader(toRead))) {
190-
StringBuilder builder = new StringBuilder();
191-
192-
char[] buffer = new char[4096];
193-
int read;
194-
while ((read = reader.read(buffer)) != -1) {
195-
char[] target = new char[read];
196-
System.arraycopy(buffer, 0, target, 0, read);
197-
builder.append(target);
198-
}
199-
200-
return builder.toString();
201-
}
202-
}
203184
}

java/client/test/org/openqa/selenium/firefox/FirefoxProfileTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import java.io.FileReader;
3939
import java.io.IOException;
4040
import java.io.StringReader;
41+
import java.nio.file.Files;
4142
import java.util.ArrayList;
4243
import java.util.List;
4344

@@ -191,7 +192,7 @@ public void shouldConvertItselfIntoAMeaningfulRepresentation() throws IOExceptio
191192
File prefs = new File(dir, "user.js");
192193
assertTrue(prefs.exists());
193194

194-
assertTrue(FileHandler.readAsString(prefs).contains("i.like.cheese"));
195+
assertTrue(Files.lines(prefs.toPath()).anyMatch(s -> s.contains("i.like.cheese")));
195196
}
196197

197198
private List<String> readGeneratedProperties(FirefoxProfile profile) throws Exception {

java/client/test/org/openqa/selenium/io/FileHandlerTest.java

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@
2828
import java.io.File;
2929
import java.io.FileInputStream;
3030
import java.io.FileOutputStream;
31-
import java.io.FileWriter;
3231
import java.io.IOException;
3332
import java.io.OutputStream;
34-
import java.io.Writer;
3533
import java.util.Random;
3634
import java.util.zip.ZipEntry;
3735
import java.util.zip.ZipOutputStream;
@@ -77,19 +75,6 @@ public void testFileCopyCanFilterBySuffix() throws IOException {
7775
assertFalse(new File(dest, xmlFile.getName()).exists());
7876
}
7977

80-
@Test
81-
public void testCanReadFileAsString() throws IOException {
82-
String expected = "I like cheese. And peas";
83-
84-
File file = File.createTempFile("read-file", "test");
85-
Writer writer = new FileWriter(file);
86-
writer.write(expected);
87-
writer.close();
88-
89-
String seen = FileHandler.readAsString(file);
90-
assertEquals(expected, seen);
91-
}
92-
9378
private File writeTestZip(File file, int files) throws IOException {
9479
ZipOutputStream out = new ZipOutputStream(new FileOutputStream(file));
9580
for (int i = 0; i < files; i++) {

0 commit comments

Comments
 (0)