test/java/nio/file/Files/StreamTest.java

Print this page
rev 7485 : 8009736: Comparator API cleanup
Reviewed-by:
Contributed-by: henry.jen@oracle.com

*** 41,51 **** import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.BasicFileAttributes; import java.util.Arrays; ! import java.util.Comparators; import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Set; import java.util.TreeSet; --- 41,51 ---- import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.attribute.BasicFileAttributes; import java.util.Arrays; ! import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.Objects; import java.util.Set; import java.util.TreeSet;
*** 137,147 **** TestUtil.removeAll(testFolder); } public void testBasic() { try (CloseableStream<Path> s = Files.list(testFolder)) { ! Object[] actual = s.sorted(Comparators.naturalOrder()).toArray(); assertEquals(actual, level1); } catch (IOException ioe) { fail("Unexpected IOException"); } --- 137,147 ---- TestUtil.removeAll(testFolder); } public void testBasic() { try (CloseableStream<Path> s = Files.list(testFolder)) { ! Object[] actual = s.sorted(Comparator.naturalOrder()).toArray(); assertEquals(actual, level1); } catch (IOException ioe) { fail("Unexpected IOException"); }
*** 153,173 **** } } public void testWalk() { try (CloseableStream<Path> s = Files.walk(testFolder)) { ! Object[] actual = s.sorted(Comparators.naturalOrder()).toArray(); assertEquals(actual, all); } catch (IOException ioe) { fail("Unexpected IOException"); } } public void testWalkOneLevel() { try (CloseableStream<Path> s = Files.walk(testFolder, 1)) { Object[] actual = s.filter(path -> ! path.equals(testFolder)) ! .sorted(Comparators.naturalOrder()) .toArray(); assertEquals(actual, level1); } catch (IOException ioe) { fail("Unexpected IOException"); } --- 153,173 ---- } } public void testWalk() { try (CloseableStream<Path> s = Files.walk(testFolder)) { ! Object[] actual = s.sorted(Comparator.naturalOrder()).toArray(); assertEquals(actual, all); } catch (IOException ioe) { fail("Unexpected IOException"); } } public void testWalkOneLevel() { try (CloseableStream<Path> s = Files.walk(testFolder, 1)) { Object[] actual = s.filter(path -> ! path.equals(testFolder)) ! .sorted(Comparator.naturalOrder()) .toArray(); assertEquals(actual, level1); } catch (IOException ioe) { fail("Unexpected IOException"); }
*** 175,185 **** public void testWalkFollowLink() { // If link is not supported, the directory structure won't have link. // We still want to test the behavior with FOLLOW_LINKS option. try (CloseableStream<Path> s = Files.walk(testFolder, FileVisitOption.FOLLOW_LINKS)) { ! Object[] actual = s.sorted(Comparators.naturalOrder()).toArray(); assertEquals(actual, all_folowLinks); } catch (IOException ioe) { fail("Unexpected IOException"); } } --- 175,185 ---- public void testWalkFollowLink() { // If link is not supported, the directory structure won't have link. // We still want to test the behavior with FOLLOW_LINKS option. try (CloseableStream<Path> s = Files.walk(testFolder, FileVisitOption.FOLLOW_LINKS)) { ! Object[] actual = s.sorted(Comparator.naturalOrder()).toArray(); assertEquals(actual, all_folowLinks); } catch (IOException ioe) { fail("Unexpected IOException"); } }
*** 635,660 **** } public void testClosedStream() throws IOException { try (CloseableStream<Path> s = Files.list(testFolder)) { s.close(); ! Object[] actual = s.sorted(Comparators.naturalOrder()).toArray(); assertTrue(actual.length <= level1.length); } try (CloseableStream<Path> s = Files.walk(testFolder)) { s.close(); ! Object[] actual = s.sorted(Comparators.naturalOrder()).toArray(); fail("Operate on closed stream should throw IllegalStateException"); } catch (IllegalStateException ex) { // expected } try (CloseableStream<Path> s = Files.find(testFolder, Integer.MAX_VALUE, (p, attr) -> true)) { s.close(); ! Object[] actual = s.sorted(Comparators.naturalOrder()).toArray(); fail("Operate on closed stream should throw IllegalStateException"); } catch (IllegalStateException ex) { // expected } } --- 635,660 ---- } public void testClosedStream() throws IOException { try (CloseableStream<Path> s = Files.list(testFolder)) { s.close(); ! Object[] actual = s.sorted(Comparator.naturalOrder()).toArray(); assertTrue(actual.length <= level1.length); } try (CloseableStream<Path> s = Files.walk(testFolder)) { s.close(); ! Object[] actual = s.sorted(Comparator.naturalOrder()).toArray(); fail("Operate on closed stream should throw IllegalStateException"); } catch (IllegalStateException ex) { // expected } try (CloseableStream<Path> s = Files.find(testFolder, Integer.MAX_VALUE, (p, attr) -> true)) { s.close(); ! Object[] actual = s.sorted(Comparator.naturalOrder()).toArray(); fail("Operate on closed stream should throw IllegalStateException"); } catch (IllegalStateException ex) { // expected } }