FrameSet::isValid() should also return false for 0-length ranges

justinfx · Oct 11, 2016 · 1ea6b6c · 1ea6b6c
1 parent f8c167e
commit 1ea6b6c
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 1 deletion.
diff --git a/cpp-port/frameset.cpp b/cpp-port/frameset.cpp
@@ -167,7 +167,15 @@ void FrameSet::handleMatch(const internal::RangePatternMatch* match, Status* ok)
 }
 
 bool FrameSet::isValid() const {
-    return m_frameData != NULL;
+    if ( m_frameData == NULL ) {
+        return false;
+    }
+
+    if ( m_frameData->ranges.length() == 0 ) {
+        return false;
+    }
+
+    return true;
 }
 
 std::string FrameSet::string() const {

diff --git a/cpp-port/test/TestFrameSet.cc b/cpp-port/test/TestFrameSet.cc
@@ -86,6 +86,9 @@ TEST_F( TestFrameSetRanges, NewFrameSet ) {
         ASSERT_TRUE(stat)
             << "#" << i << ": Failed to parse " << t.range << " : " << stat;
 
+        ASSERT_TRUE(s.isValid())
+            << "#" << i << ": Expected valid FrameSet for '" << t.range << "'";
+
         EXPECT_NE("", s.frameRange())
             << "#" << i << ": Got an empty frange field on FrameSet";
 
@@ -97,6 +100,35 @@ TEST_F( TestFrameSetRanges, NewFrameSet ) {
     }
 };
 
+TEST( TestFrameSet, Invalid ) {
+    std::vector<TestFrameSetRanges::Case> cases;
+    fileseq::Frames empty;
+
+    {
+        TestFrameSetRanges::Case t = {"", empty};
+        cases.push_back(t);
+    }
+    {
+        TestFrameSetRanges::Case t = {"abc", empty};
+        cases.push_back(t);
+    }
+    {
+        TestFrameSetRanges::Case t = {"1-abc", empty};
+        cases.push_back(t);
+    }
+    {
+        TestFrameSetRanges::Case t = {"    ", empty};
+        cases.push_back(t);
+    }
+
+    for (size_t i=0; i < cases.size(); ++i) {
+        TestFrameSetRanges::Case t = cases[i];
+
+        fileseq::FrameSet s(t.range);
+        EXPECT_FALSE(s.isValid())
+            << "#" << i << ": Expected invalid FrameSet for '" << t.range << "'";
+    }
+}
 
 TEST_F( TestFrameSetRanges, Lookup ) {
     fileseq::Status stat;