summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-10-06 12:03:54 +0100
committerCarl Hetherington <cth@carlh.net>2014-10-06 12:03:54 +0100
commitd639984a015b69751619f97d12f6267da18e24f7 (patch)
treed019d989b8fce259e04b0b5c917f24f7bd3692bc
parent082eb865bbae0ea4350b7dffbf43f1c21b6b4c82 (diff)
Move another test over.
-rw-r--r--src/subrip_reader.h6
-rw-r--r--test/subrip_reader_test.cc8
2 files changed, 13 insertions, 1 deletions
diff --git a/src/subrip_reader.h b/src/subrip_reader.h
index 8824347..0a43357 100644
--- a/src/subrip_reader.h
+++ b/src/subrip_reader.h
@@ -20,6 +20,9 @@
#include "reader.h"
#include "time_pair.h"
+struct subrip_reader_convert_line_test;
+struct subrip_reader_convert_time_test;
+
namespace sub {
class SubripReader : public Reader
@@ -30,9 +33,10 @@ public:
private:
/* For tests */
friend struct ::subrip_reader_convert_line_test;
+ friend struct ::subrip_reader_convert_time_test;
SubripReader () {}
- TimePair convert_time (std::string t);
+ static TimePair convert_time (std::string t);
void convert_line (std::string t, int line_number, TimePair from, TimePair to);
void maybe_content (RawSubtitle& p);
};
diff --git a/test/subrip_reader_test.cc b/test/subrip_reader_test.cc
index f294e55..f95b6fd 100644
--- a/test/subrip_reader_test.cc
+++ b/test/subrip_reader_test.cc
@@ -272,3 +272,11 @@ BOOST_AUTO_TEST_CASE (subrip_reader_convert_line_test)
++i;
r._subs.clear ();
}
+
+
+/** Test SubripReader::convert_time */
+BOOST_AUTO_TEST_CASE (subrip_reader_convert_time_test)
+{
+ BOOST_CHECK_EQUAL (sub::SubripReader::convert_time ("00:03:10,500"), sub::TimePair (sub::MetricTime (0, 3, 10, 500)));
+ BOOST_CHECK_EQUAL (sub::SubripReader::convert_time ("04:19:51,782"), sub::TimePair (sub::MetricTime (4, 19, 51, 782)));
+}