Skip to content

Commit d3cf8b0

Browse files
committed
Make CompositeFileComparator.toString() simpler
Add test
1 parent d83805d commit d3cf8b0

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

src/main/java/org/apache/commons/io/comparator/CompositeFileComparator.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.io.File;
2020
import java.io.Serializable;
21+
import java.util.Arrays;
2122
import java.util.Comparator;
2223
import java.util.function.IntFunction;
2324
import java.util.stream.Stream;
@@ -97,16 +98,8 @@ private Comparator<File>[] emptyArray() {
9798
*/
9899
@Override
99100
public String toString() {
100-
final StringBuilder builder = new StringBuilder();
101-
builder.append(super.toString());
102-
builder.append('{');
103-
for (int i = 0; i < delegates.length; i++) {
104-
if (i > 0) {
105-
builder.append(',');
106-
}
107-
builder.append(delegates[i]);
108-
}
109-
builder.append('}');
101+
final StringBuilder builder = new StringBuilder(super.toString());
102+
builder.append(Arrays.toString(delegates));
110103
return builder.toString();
111104
}
112105
}

src/test/java/org/apache/commons/io/comparator/CompositeFileComparatorTest.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,4 +115,15 @@ void testConstructorIterable_order() {
115115
assertTrue(c.compare(lessFile, moreFile) < 0, "less");
116116
assertTrue(c.compare(moreFile, lessFile) > 0, "more");
117117
}
118+
119+
@Test
120+
void testToString() {
121+
final List<Comparator<File>> list = new ArrayList<>();
122+
list.add(SizeFileComparator.SIZE_COMPARATOR);
123+
list.add(ExtensionFileComparator.EXTENSION_COMPARATOR);
124+
final Comparator<File> c = new CompositeFileComparator(list);
125+
final String string = c.toString();
126+
assertTrue(string.contains("SizeFileComparator"));
127+
assertTrue(string.contains("ExtensionFileComparator"));
128+
}
118129
}

0 commit comments

Comments
 (0)