diff options
author | Jay Berkenbilt <ejb@ql.org> | 2018-12-20 17:25:19 +0100 |
---|---|---|
committer | Jay Berkenbilt <ejb@ql.org> | 2018-12-22 01:11:57 +0100 |
commit | fa3664357b6fd23b6d74c6835bbf6c8e911892aa (patch) | |
tree | 9a2597f665a593b62792843b0a1f5a80bf548350 /libtests | |
parent | 313ba081265f69ac9a0324f9fe87087c72918191 (diff) | |
download | qpdf-fa3664357b6fd23b6d74c6835bbf6c8e911892aa.tar.zst |
Move numrange code from qpdf.cc to QUtil.cc
Also move tests to libtests.
Diffstat (limited to 'libtests')
-rw-r--r-- | libtests/build.mk | 1 | ||||
-rw-r--r-- | libtests/numrange.cc | 36 | ||||
-rw-r--r-- | libtests/qtest/numrange.test | 63 |
3 files changed, 100 insertions, 0 deletions
diff --git a/libtests/build.mk b/libtests/build.mk index 7143eb56..214bd17c 100644 --- a/libtests/build.mk +++ b/libtests/build.mk @@ -13,6 +13,7 @@ BINS_libtests = \ json \ lzw \ md5 \ + numrange \ pointer_holder \ predictors \ qutil \ diff --git a/libtests/numrange.cc b/libtests/numrange.cc new file mode 100644 index 00000000..6cbb90ac --- /dev/null +++ b/libtests/numrange.cc @@ -0,0 +1,36 @@ +#include <qpdf/QUtil.hh> +#include <iostream> + +static void test_numrange(char const* range) +{ + if (range == 0) + { + std::cout << "null" << std::endl; + } + else + { + std::vector<int> result = QUtil::parse_numrange(range, 15); + std::cout << "numeric range " << range << " ->"; + for (std::vector<int>::iterator iter = result.begin(); + iter != result.end(); ++iter) + { + std::cout << " " << *iter; + } + std::cout << std::endl; + } +} + +int main(int argc, char* argv[]) +{ + try + { + test_numrange(argv[1]); + } + catch (std::exception& e) + { + std::cout << e.what() << std::endl; + return 2; + } + + return 0; +} diff --git a/libtests/qtest/numrange.test b/libtests/qtest/numrange.test new file mode 100644 index 00000000..9acf6ea4 --- /dev/null +++ b/libtests/qtest/numrange.test @@ -0,0 +1,63 @@ +#!/usr/bin/env perl +require 5.008; +use warnings; +use strict; + +require TestDriver; + +my $td = new TestDriver('numrange'); + +my @nrange_tests = ( + [",5", + "error at * in numeric range *,5: unexpected separator", + 2], + ["4,,5", + "error at * in numeric range 4,*,5: unexpected separator", + 2], + ["4,5,", + "error at * in numeric range 4,5,*: number expected", + 2], + ["z1,", + "error at * in numeric range z*1,: digit not expected", + 2], + ["1z,", + "error at * in numeric range 1*z,: z not expected", + 2], + ["1-5?", + "error at * in numeric range 1-5*?: unexpected character", + 2], + ["1-30", + "error in numeric range 1-30: number 30 out of range", + 2], + ["1-10,0,5", + "error in numeric range 1-10,0,5: number 0 out of range", + 2], + ["1-10,1234,5", + "error in numeric range 1-10,1234,5: number 1234 out of range", + 2], + ["1,r,3", + "error in numeric range 1,r,3: number 16 out of range", + 2], + ["1,r16,3", + "error in numeric range 1,r16,3: number 0 out of range", + 2], + ["1,3,5-10,z-13,13,9,z,2,r2-r4", + "numeric range 1,3,5-10,z-13,13,9,z,2,r2-r4" . + " -> 1 3 5 6 7 8 9 10 15 14 13 13 9 15 2 14 13 12", + 0], + ["r1-r15", # r\d+ at end + "numeric range r1-r15" . + " -> 15 14 13 12 11 10 9 8 7 6 5 4 3 2 1", + 0], + ); +foreach my $d (@nrange_tests) +{ + my ($range, $output, $status) = @$d; + $td->runtest("numeric range $range", + {$td->COMMAND => ['numrange', $range], + $td->FILTER => "grep 'numeric range'"}, + {$td->STRING => $output . "\n", $td->EXIT_STATUS => $status}, + $td->NORMALIZE_NEWLINES); +} + +$td->report(scalar(@nrange_tests)); |