MathLib: Added test for isDec() and removed not required state.

orbitcowboy · orbitcowboy · commit b9a9f51fe08b · 2014-11-14T04:29:35.000+01:00
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
@@ -464,7 +464,7 @@ bool MathLib::isBin(const std::string& s)
 bool MathLib::isDec(const std::string & s)
 {
     enum Status {
-        START, PLUSMINUS, DIGIT, SUFFIX
+        START, PLUSMINUS, DIGIT
     } state = START;
     for (std::string::const_iterator it = s.begin(); it != s.end(); ++it) {
         switch (state) {
@@ -488,8 +488,6 @@ bool MathLib::isDec(const std::string & s)
             else
                 return isValidSuffix(it,s.end());
             break;
-        case SUFFIX:
-            break;
         }
     }
     return state == DIGIT;
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -31,6 +31,7 @@ class TestMathLib : public TestFixture {
     void run() {
         TEST_CASE(isint);
         TEST_CASE(isbin);
+	TEST_CASE(isdec);
         TEST_CASE(isoct);
         TEST_CASE(ishex);
         TEST_CASE(isnegative);
@@ -613,6 +614,24 @@ class TestMathLib : public TestFixture {
         ASSERT_EQUALS("-inf.0", MathLib::divide("-3.0", "0.0f")); // -inf (#5142)
         ASSERT_EQUALS("inf.0", MathLib::divide("-3.0", "-0.0f")); // inf (#5142)
     }
+    
+    void isdec(void)
+    {
+        // positive testing
+        ASSERT_EQUALS(true, MathLib::isDec("1"));
+        ASSERT_EQUALS(true, MathLib::isDec("+1"));
+        ASSERT_EQUALS(true, MathLib::isDec("-1"));
+        ASSERT_EQUALS(true, MathLib::isDec("-100"));
+        ASSERT_EQUALS(true, MathLib::isDec("-1L"));
+        ASSERT_EQUALS(true, MathLib::isDec("1UL"));
+
+        // negative testing
+        ASSERT_EQUALS(false, MathLib::isDec("-1."));
+        ASSERT_EQUALS(false, MathLib::isDec("+1."));
+        ASSERT_EQUALS(false, MathLib::isDec("-x"));
+        ASSERT_EQUALS(false, MathLib::isDec("+x"));
+        ASSERT_EQUALS(false, MathLib::isDec("x"));
+    }    
 
     void isNullValue() const {
         // inter zero value

Original file line number	Diff line number	Diff line change
`@@ -464,7 +464,7 @@ bool MathLib::isBin(const std::string& s)`
`464`	`464`	`bool MathLib::isDec(const std::string & s)`
`465`	`465`	`{`
`466`	`466`	`enum Status {`
`467`		`- START, PLUSMINUS, DIGIT, SUFFIX`
	`467`	`+ START, PLUSMINUS, DIGIT`
`468`	`468`	`} state = START;`
`469`	`469`	`for (std::string::const_iterator it = s.begin(); it != s.end(); ++it) {`
`470`	`470`	`switch (state) {`
`@@ -488,8 +488,6 @@ bool MathLib::isDec(const std::string & s)`
`488`	`488`	`else`
`489`	`489`	`return isValidSuffix(it,s.end());`
`490`	`490`	`break;`
`491`		`- case SUFFIX:`
`492`		`- break;`
`493`	`491`	`}`
`494`	`492`	`}`
`495`	`493`	`return state == DIGIT;`