Skip to content
Snippets Groups Projects
Commit a681a284 authored by Markus Koschany's avatar Markus Koschany
Browse files

New upstream version 1.1.7

parent 3d141f3c
No related branches found
No related tags found
No related merge requests found
......@@ -5,7 +5,7 @@
<artifactId>sejda-commons</artifactId>
<packaging>jar</packaging>
<name>sejda-commons</name>
<version>1.1.6</version>
<version>1.1.7</version>
<description>A collection of utilities and common classes.</description>
<url>http://www.sejda.org</url>
......@@ -37,7 +37,7 @@
<connection>scm:git:git@github.com:torakiki/sejda-commons.git</connection>
<developerConnection>scm:git:git@github.com:torakiki/sejda-commons.git</developerConnection>
<url>scm:git:git@github.com:torakiki/sejda-commons.git</url>
<tag>v1.1.6</tag>
<tag>v1.1.7</tag>
</scm>
<developers>
......
......@@ -38,7 +38,7 @@ import java.util.regex.Pattern;
*/
public class NumericalSortFilenameComparator implements Comparator<File> {
private static Pattern PATTERN = Pattern.compile("^(\\d*)(\\D*)(\\d*)$");
private static Pattern PATTERN = Pattern.compile("^(\\d*)(.*)(\\d*)$");
private static Function<String, BigInteger> DIGITS_EXTRACTOR = (g) -> {
return ofNullable(g).filter(StringUtils::isNotEmpty).map(BigInteger::new).orElse(null);
......
......@@ -34,6 +34,15 @@ public class NumericalSortFilenameComparatorTest {
assertTrue(victim.compare(new File("bla"), null) < 0);
}
@Test
public void onlyDigits() {
NumericalSortFilenameComparator victim = new NumericalSortFilenameComparator();
assertTrue(victim.compare(new File("123.pdf"), new File("1.pdf")) > 0);
assertTrue(victim.compare(new File("0023.pdf"), new File("230.pdf")) < 0);
assertTrue(victim.compare(new File("1"), new File("001.pdf")) > 0);
assertTrue(victim.compare(new File("005.pdf"), new File("500.pdf")) < 0);
}
@Test
public void nonDigit() {
NumericalSortFilenameComparator victim = new NumericalSortFilenameComparator();
......@@ -74,5 +83,8 @@ public class NumericalSortFilenameComparatorTest {
assertTrue(victim.compare(new File("banana.pdf"), new File("avocado.pdf")) > 0);
assertTrue(victim.compare(new File("chuck.pdf"), new File("chuck.abc")) > 0);
assertTrue(victim.compare(new File("1234file.pdf"), new File("chuck.abc")) < 0);
assertTrue(victim.compare(new File("bla003abc.pdf"), new File("chuck.pdf")) < 0);
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment