Skip to content

Commit b77a47a

Browse files
committed
Make regex for ValidNumber a bit more compact
1 parent a5d56c3 commit b77a47a

File tree

2 files changed

+3
-8
lines changed

2 files changed

+3
-8
lines changed

src/main/java/by/andd3dfx/numeric/ValidNumber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
public class ValidNumber {
3333

3434
public static boolean isNumber(String s) {
35-
return s.matches("(\\+|-)?(\\d+\\.?(\\d+)?|\\.\\d+)((e|E)(\\+|-)?\\d+)?");
35+
return s.matches("[+-]?(\\d+\\.?|\\d*\\.\\d+)([eE][+-]?\\d+)?");
3636
}
3737
}

src/test/java/by/andd3dfx/numeric/ValidNumberTest.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,11 @@
33
import org.junit.Test;
44

55
import static by.andd3dfx.numeric.ValidNumber.isNumber;
6-
import static org.junit.Assert.*;
6+
import static org.junit.Assert.assertFalse;
7+
import static org.junit.Assert.assertTrue;
78

89
public class ValidNumberTest {
910

10-
/**
11-
* For example, all the following are valid numbers:
12-
* ["2", "0089", "-0.1", "+3.14", "4.", "-.9", "2e10", "-90E3", "3e+7", "+6e-1", "53.5e93", "-123.456e789"],
13-
* while the following are not valid numbers:
14-
* ["abc", "1a", "1e", "e3", "99e2.5", "--6", "-+3", "95a54e53"].
15-
*/
1611
@Test
1712
public void testIsNumber() {
1813
assertTrue(isNumber("2"));

0 commit comments

Comments
 (0)