From 07bc7b9a06a445348b7be12ea897ff08b35f2dda Mon Sep 17 00:00:00 2001 From: Raffi Enficiaud Date: Mon, 11 May 2015 17:50:18 +0200 Subject: [PATCH] Updating the examples for datasets (+1 squashed commits) Squashed commits: [39fea4e] Adding examples to the build Update example 63 --- doc/examples/dataset_example59.cpp | 6 ++-- doc/examples/dataset_example59.output | 24 ++++++------- doc/examples/dataset_example61.cpp | 4 +-- doc/examples/dataset_example61.output | 8 ++--- doc/examples/dataset_example62.cpp | 4 +-- doc/examples/dataset_example62.output | 8 ++--- doc/examples/dataset_example63.cpp | 14 ++++---- doc/examples/dataset_example63.output | 49 ++++++++++++++++----------- doc/examples/dataset_example64.cpp | 2 +- doc/examples/dataset_example64.output | 32 ++++++++++------- doc/examples/dataset_example65.cpp | 2 +- doc/examples/dataset_example65.output | 2 +- doc/examples/dataset_example66.cpp | 2 +- doc/examples/dataset_example66.output | 2 +- doc/examples/dataset_example67.output | 2 +- doc/examples/dataset_example68.cpp | 4 +-- doc/examples/dataset_example68.output | 26 +++++++------- test/Jamfile.v2 | 11 ++++-- 18 files changed, 112 insertions(+), 90 deletions(-) diff --git a/doc/examples/dataset_example59.cpp b/doc/examples/dataset_example59.cpp index f6c52c59..b288a95c 100644 --- a/doc/examples/dataset_example59.cpp +++ b/doc/examples/dataset_example59.cpp @@ -6,7 +6,7 @@ // See http://www.boost.org/libs/test for the library home page. //[example_code -#define BOOST_TEST_MODULE example59 +#define BOOST_TEST_MODULE dataset_example59 #include #include #include @@ -15,7 +15,7 @@ namespace bdata = boost::unit_test::data; BOOST_DATA_TEST_CASE( test1, bdata::xrange(5) ) { - std::cout << "test 1 " << sample << std::endl; + std::cout << "test 1: " << sample << std::endl; BOOST_TEST((sample <= 4 && sample >= 0)); } @@ -23,7 +23,7 @@ BOOST_DATA_TEST_CASE( test2, bdata::xrange( (bdata::begin=1, bdata::end=10, bdata::step=3)) ) { - std::cout << "test 2 " << sample << std::endl; + std::cout << "test 2: " << sample << std::endl; BOOST_TEST((sample <= 4 && sample >= 0)); } //] diff --git a/doc/examples/dataset_example59.output b/doc/examples/dataset_example59.output index 133dd60e..de6ea57d 100644 --- a/doc/examples/dataset_example59.output +++ b/doc/examples/dataset_example59.output @@ -1,17 +1,17 @@ //[example_output ->example +> dataset_example61 Running 8 test cases... -test 1 0 -test 1 1 -test 1 2 -test 1 3 -test 1 4 -test 2 1 -test 2 4 -test 2 7 -example59.cpp:27: error: in "test_case_snippet_2": check sample <= 4 && sample >= 0 has failed +test 1: 0 +test 1: 1 +test 1: 2 +test 1: 3 +test 1: 4 +test 2: 1 +test 2: 4 +test 2: 7 +dataset_example59.cpp(27): error: in "test2": check (sample <= 4 && sample >= 0) has failed Failure occurred in a following context: - sample = 7; + sample = 7; -*** 1 failure detected in test module "Master Test Suite" +*** 1 failure is detected in the test module "dataset_example59" //] \ No newline at end of file diff --git a/doc/examples/dataset_example61.cpp b/doc/examples/dataset_example61.cpp index 2f42ed25..1bedf342 100644 --- a/doc/examples/dataset_example61.cpp +++ b/doc/examples/dataset_example61.cpp @@ -6,7 +6,7 @@ // See http://www.boost.org/libs/test for the library home page. //[example_code -#define BOOST_TEST_MAIN +#define BOOST_TEST_MODULE dataset_example61 #include #include #include @@ -17,7 +17,7 @@ int samples1[] = {1,2}; char const* samples2[] = {"qwerty", "asdfg"}; BOOST_DATA_TEST_CASE( - test_name, + test1, data::make(samples1)^samples2, integer_values, string_value) diff --git a/doc/examples/dataset_example61.output b/doc/examples/dataset_example61.output index 3d05e50f..8eff76c2 100644 --- a/doc/examples/dataset_example61.output +++ b/doc/examples/dataset_example61.output @@ -1,8 +1,8 @@ //[example_output ->example -Running 1 test cases... -`` +> dataset_example61 +Running 2 test cases... 1, qwerty 2, asdfg -`` + +*** No errors detected //] \ No newline at end of file diff --git a/doc/examples/dataset_example62.cpp b/doc/examples/dataset_example62.cpp index 9f8758c0..b53bb1ec 100644 --- a/doc/examples/dataset_example62.cpp +++ b/doc/examples/dataset_example62.cpp @@ -6,7 +6,7 @@ // See http://www.boost.org/libs/test for the library home page. //[example_code -#define BOOST_TEST_MAIN +#define BOOST_TEST_MODULE dataset_example62 #include #include #include @@ -17,7 +17,7 @@ int samples1[] = {1, 2}; int samples2[] = {8, 9, 10}; BOOST_DATA_TEST_CASE( - test_name, + test1, data::make(samples1) + samples2, var) { diff --git a/doc/examples/dataset_example62.output b/doc/examples/dataset_example62.output index 36ea4ad0..31331044 100644 --- a/doc/examples/dataset_example62.output +++ b/doc/examples/dataset_example62.output @@ -1,11 +1,11 @@ //[example_output ->example -Running 1 test cases... -`` +> dataset_example62 +Running 5 test cases... 1 2 8 9 10 -`` + +*** No errors detected //] \ No newline at end of file diff --git a/doc/examples/dataset_example63.cpp b/doc/examples/dataset_example63.cpp index efb666f9..e951bd8f 100644 --- a/doc/examples/dataset_example63.cpp +++ b/doc/examples/dataset_example63.cpp @@ -6,7 +6,7 @@ // See http://www.boost.org/libs/test for the library home page. //[example_code -#define BOOST_TEST_MODULE example63 +#define BOOST_TEST_MODULE dataset_example63 #include #include #include @@ -15,23 +15,23 @@ namespace bdata = boost::unit_test::data; BOOST_DATA_TEST_CASE( - test_case_snippet_1, + test1, bdata::random(1, 17) ^ bdata::xrange(7), random_sample, index ) { - std::cout << "test 1 " << random_sample - << "," << index << std::endl; + std::cout << "test 1: " << random_sample + << ", " << index << std::endl; BOOST_TEST((random_sample <= 17 && random_sample >= 1)); } BOOST_DATA_TEST_CASE( - test_case_snippet_2, + test2, bdata::random( (bdata::distribution=std::uniform_real_distribution(1, 2)) ) ^ bdata::xrange(7), random_sample, index ) { - std::cout << "test 2 " << random_sample - << "," << index << std::endl; + std::cout << "test 2: " << random_sample + << ", " << index << std::endl; BOOST_CHECK(random_sample < 1.7); // 30% chance of failure } //] diff --git a/doc/examples/dataset_example63.output b/doc/examples/dataset_example63.output index b2ae0124..69cfc25c 100644 --- a/doc/examples/dataset_example63.output +++ b/doc/examples/dataset_example63.output @@ -1,26 +1,35 @@ //[example_output ->example +> dataset_example63 Running 14 test cases... -test 1 3 -test 1 15 -test 1 3 -test 1 1 -test 1 5 -test 1 9 -test 1 8 -test 2 1.00002 -test 2 1.08503 -test 2 1.60135 -test 2 1.89161 -example63.cpp:33: error: in "test_case_snippet_2": check random_sample < 1.7 has failed +test 1: 1, 0 +test 1: 14, 1 +test 1: 13, 2 +test 1: 15, 3 +test 1: 13, 4 +test 1: 17, 5 +test 1: 11, 6 +test 2: 1.81472, 0 +dataset_example63.cpp(35): error: in "test2": check random_sample < 1.7 has failed Failure occurred in a following context: - random_sample = 1.89161134; index = 3; -test 2 1.96796 -example63.cpp:33: error: in "test_case_snippet_2": check random_sample < 1.7 has failed + random_sample = 1.81472373; index = 0; +test 2: 1.13548, 1 +test 2: 1.90579, 2 +dataset_example63.cpp(35): error: in "test2": check random_sample < 1.7 has failed Failure occurred in a following context: - random_sample = 1.96795571; index = 4; -test 2 1.18969 -test 2 1.51498 + random_sample = 1.905792; index = 2; +test 2: 1.83501, 3 +dataset_example63.cpp(35): error: in "test2": check random_sample < 1.7 has failed +Failure occurred in a following context: + random_sample = 1.83500862; index = 3; +test 2: 1.12699, 4 +test 2: 1.96887, 5 +dataset_example63.cpp(35): error: in "test2": check random_sample < 1.7 has failed +Failure occurred in a following context: + random_sample = 1.96886778; index = 5; +test 2: 1.91338, 6 +dataset_example63.cpp(35): error: in "test2": check random_sample < 1.7 has failed +Failure occurred in a following context: + random_sample = 1.91337585; index = 6; -*** 2 failures detected in test module "Master Test Suite" +*** 5 failures are detected in the test module "dataset_example63" //] \ No newline at end of file diff --git a/doc/examples/dataset_example64.cpp b/doc/examples/dataset_example64.cpp index 373e25f8..04807938 100644 --- a/doc/examples/dataset_example64.cpp +++ b/doc/examples/dataset_example64.cpp @@ -6,7 +6,7 @@ // See http://www.boost.org/libs/test for the library home page. //[example_code -#define BOOST_TEST_MODULE example64 +#define BOOST_TEST_MODULE dataset_example64 #include #include #include diff --git a/doc/examples/dataset_example64.output b/doc/examples/dataset_example64.output index 5b5ef87b..899695b1 100644 --- a/doc/examples/dataset_example64.output +++ b/doc/examples/dataset_example64.output @@ -1,5 +1,5 @@ //[example_output ->example +> dataset_example64 Running 12 test cases... test 1: 0, 0 test 1: 0, 1 @@ -7,18 +7,24 @@ test 1: 0, 2 test 1: 1, 0 test 1: 1, 1 test 1: 1, 2 -test 2: 0 / 1.00002, 0 -test 2: 0 / 1.08503, 1 -test 2: 1 / 1.60135, 0 -test 2: 1 / 1.89161, 1 -example64.cpp:40: error: in "test_case_snippet_2": check random_sample < 1.7 has failed +test 2: 0 / 1.81472, 0 +dataset_example64.cpp(40): error: in "test2": check random_sample < 1.7 has failed [1.81472373 >= 1.7] Failure occurred in a following context: - xr = 1; random_sample = 1.89161134; index = 1; -test 2: 2 / 1.96796, 0 -example64.cpp:40: error: in "test_case_snippet_2": check random_sample < 1.7 has failed + xr = 0; random_sample = 1.81472373; index = 0; +test 2: 0 / 1.13548, 1 +test 2: 1 / 1.90579, 0 +dataset_example64.cpp(40): error: in "test2": check random_sample < 1.7 has failed [1.905792 >= 1.7] Failure occurred in a following context: - xr = 2; random_sample = 1.96795571; index = 0; -test 2: 2 / 1.18969, 1 + xr = 1; random_sample = 1.905792; index = 0; +test 2: 1 / 1.83501, 1 +dataset_example64.cpp(40): error: in "test2": check random_sample < 1.7 has failed [1.83500862 >= 1.7] +Failure occurred in a following context: + xr = 1; random_sample = 1.83500862; index = 1; +test 2: 2 / 1.12699, 0 +test 2: 2 / 1.96887, 1 +dataset_example64.cpp(40): error: in "test2": check random_sample < 1.7 has failed [1.96886778 >= 1.7] +Failure occurred in a following context: + xr = 2; random_sample = 1.96886778; index = 1; -*** 2 failures detected in test module "Master Test Suite" -//] \ No newline at end of file +*** 4 failures are detected in the test module "dataset_example64" +//] diff --git a/doc/examples/dataset_example65.cpp b/doc/examples/dataset_example65.cpp index cb43b083..8b63f36e 100644 --- a/doc/examples/dataset_example65.cpp +++ b/doc/examples/dataset_example65.cpp @@ -6,7 +6,7 @@ // See http://www.boost.org/libs/test for the library home page. //[example_code -#define BOOST_TEST_MODULE example65 +#define BOOST_TEST_MODULE dataset_example65 #include #include #include diff --git a/doc/examples/dataset_example65.output b/doc/examples/dataset_example65.output index 03cfa061..6f3f9434 100644 --- a/doc/examples/dataset_example65.output +++ b/doc/examples/dataset_example65.output @@ -1,5 +1,5 @@ //[example_output ->example +> dataset_example65 Running 4 test cases... test 1: 2 test 2: 0, 2 diff --git a/doc/examples/dataset_example66.cpp b/doc/examples/dataset_example66.cpp index 66f2ea20..bd4e8478 100644 --- a/doc/examples/dataset_example66.cpp +++ b/doc/examples/dataset_example66.cpp @@ -6,7 +6,7 @@ // See http://www.boost.org/libs/test for the library home page. //[example_code -#define BOOST_TEST_MODULE example66 +#define BOOST_TEST_MODULE dataset_example66 #include #include #include diff --git a/doc/examples/dataset_example66.output b/doc/examples/dataset_example66.output index 84f1d1cf..77f07d3f 100644 --- a/doc/examples/dataset_example66.output +++ b/doc/examples/dataset_example66.output @@ -1,5 +1,5 @@ //[example_output ->example +> dataset_example66 Running 2 test cases... test 1: 0, cat test 1: 1, dog diff --git a/doc/examples/dataset_example67.output b/doc/examples/dataset_example67.output index 2ee49ed1..78c6be42 100644 --- a/doc/examples/dataset_example67.output +++ b/doc/examples/dataset_example67.output @@ -1,5 +1,5 @@ //[example_output -> example67 +> dataset_example67 Running 15 test cases... test 1: 0 test 1: 1 diff --git a/doc/examples/dataset_example68.cpp b/doc/examples/dataset_example68.cpp index 1c660f7d..21854d33 100644 --- a/doc/examples/dataset_example68.cpp +++ b/doc/examples/dataset_example68.cpp @@ -6,7 +6,7 @@ // See http://www.boost.org/libs/test for the library home page. //[example_code -#define BOOST_TEST_MODULE example68 +#define BOOST_TEST_MODULE dataset_example68 #include #include #include @@ -80,8 +80,8 @@ BOOST_DATA_TEST_CASE( { std::cout << "test 1: " << fib_sample + << " / index: " << index << std::endl; BOOST_TEST(fib_sample <= 13); } - //] diff --git a/doc/examples/dataset_example68.output b/doc/examples/dataset_example68.output index a40d2e62..42c46c30 100644 --- a/doc/examples/dataset_example68.output +++ b/doc/examples/dataset_example68.output @@ -1,22 +1,22 @@ //[example_output > example68 Running 10 test cases... -test 1: 0 -test 1: 1 -test 1: 1 -test 1: 2 -test 1: 3 -test 1: 5 -test 1: 8 -test 1: 13 -test 1: 21 -example68.cpp(84): error: in "test1": check fib_sample <= 13 has failed [21 > 13] +test 1: 0 / index: 0 +test 1: 1 / index: 1 +test 1: 1 / index: 2 +test 1: 2 / index: 3 +test 1: 3 / index: 4 +test 1: 5 / index: 5 +test 1: 8 / index: 6 +test 1: 13 / index: 7 +test 1: 21 / index: 8 +dataset_example68.cpp(85): error: in "test1": check fib_sample <= 13 has failed [21 > 13] Failure occurred in a following context: fib_sample = 21; index = 8; -test 1: 34 -example68.cpp(84): error: in "test1": check fib_sample <= 13 has failed [34 > 13] +test 1: 34 / index: 9 +dataset_example68.cpp(85): error: in "test1": check fib_sample <= 13 has failed [34 > 13] Failure occurred in a following context: fib_sample = 34; index = 9; -*** 2 failures are detected in the test module "example68" +*** 2 failures are detected in the test module "dataset_example68" //] diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 410830b1..339ffd91 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -152,8 +152,15 @@ test-suite "unit_test_framework_test" # examples in datasets - [ test-btl-lib-c11 run : example67 : : : ../doc/examples/example67.cpp ] - [ test-btl-lib-c11 run-fail : example68 : : : ../doc/examples/example68.cpp ] + [ test-btl-lib-c11 run-fail : dataset_example59 : : : ../doc/examples/dataset_example59.cpp ] + [ test-btl-lib-c11 run : dataset_example61 : : : ../doc/examples/dataset_example61.cpp ] + [ test-btl-lib-c11 run : dataset_example62 : : : ../doc/examples/dataset_example62.cpp ] + [ test-btl-lib-c11 run-fail : dataset_example63 : : : ../doc/examples/dataset_example63.cpp ] + [ test-btl-lib-c11 run-fail : dataset_example64 : : : ../doc/examples/dataset_example64.cpp ] + [ test-btl-lib-c11 run : dataset_example65 : : : ../doc/examples/dataset_example65.cpp ] + [ test-btl-lib-c11 run : dataset_example66 : : : ../doc/examples/dataset_example66.cpp ] + [ test-btl-lib-c11 run : dataset_example67 : : : ../doc/examples/dataset_example67.cpp ] + [ test-btl-lib-c11 run-fail : dataset_example68 : : : ../doc/examples/dataset_example68.cpp ] ;