Commit graph

855 commits

Author SHA1 Message Date
Dane Springmeyer
15589c8568 pull in latest master 2015-06-22 13:51:09 -07:00
Dane Springmeyer
e4631f15ae fix #2921 2015-06-22 13:43:07 -07:00
artemp
fec6d11560 Merge branch 'master' into large_csv 2015-06-19 17:30:18 +02:00
Dane Springmeyer
d626cf83ad update visual tests [skip ci] 2015-06-18 12:35:12 -07:00
artemp
d893718343 Merge branch 'master' into large_csv 2015-06-18 13:06:28 +02:00
artemp
93937ca443 prefer STL containers - boost::unordered_map --> std::unordered_map 2015-06-18 11:01:16 +02:00
Dane Springmeyer
4fe3c87a84 tame a few more boost -Wsign-conversion warnings 2015-06-17 13:29:54 -07:00
Blake Thompson
ad99cce6dd Revert change in test directory 2015-06-17 14:50:35 -05:00
Blake Thompson
6619de7b16 Modified where in travis mason publish is run 2015-06-17 14:48:49 -05:00
Blake Thompson
fa1950c5d0 Updated visual tests 2015-06-16 20:54:24 -05:00
Blake Thompson
983be86487 Updating visual tests 2015-06-16 20:48:34 -05:00
Blake Thompson
1272796822 Updated visual tests 2015-06-16 14:21:55 -05:00
Blake Thompson
bd9e580cd8 Merge branch 'master' into offset 2015-06-16 11:50:04 -05:00
Dane Springmeyer
6d0cd6870b remove dead code 2015-06-15 20:41:52 -07:00
Dane Springmeyer
6a76f0fa31 fix variable shadowing 2015-06-15 20:41:51 -07:00
Dane Springmeyer
b2c85e0c65 fix a slew of -Wsign-conversion, -Wconversion, -Wunused-argument warnings 2015-06-15 20:41:51 -07:00
Dane Springmeyer
b355e65fe1 unit coverage of css_color_grammar converters 2015-06-15 20:41:48 -07:00
Dane Springmeyer
bb2e938302 Add unit test for safe_cast (aka saturated_cast) a clamping numeric_cast 2015-06-15 20:41:48 -07:00
Dane Springmeyer
9da198631b more xml2 leak fixes 2015-06-15 20:41:46 -07:00
Dane Springmeyer
2b02677cb5 Centralize memory/valgrind cleanup code 2015-06-15 20:41:46 -07:00
Dane Springmeyer
c94cb6251a update tests for #2912 2015-06-12 19:04:33 -07:00
Dane Springmeyer
0d86afff36 start using -Wsign-compare and -Wshadow + fix heaps of warnings - refs #2907 2015-06-12 14:51:18 -07:00
artemp
74d6e7740d Merge branch 'master' into fix_pixel_cast 2015-06-12 13:01:14 +01:00
Jiri Drbalek
01fc7315ca update visual tests 2015-06-12 10:07:46 +00:00
Dane Springmeyer
8e89b788df Add a a few tests for set/get pixel - refs #2893 2015-06-12 00:12:28 -07:00
Dane Springmeyer
62b0d2b06e update visual tests to get travis passing again post #2898 2015-06-11 16:51:47 -07:00
Dane Springmeyer
5465adc229 fix expected error message 2015-06-11 14:04:20 -07:00
Dane Springmeyer
84a0c49ec3 Avoid crashing if we try to read a png as a jpeg - closes #2903 2015-06-11 14:02:34 -07:00
Blake Thompson
d3f37d8f1e Updated clipper to be reversed and fixes to the way the algorithm operates. 2015-06-11 12:47:00 -05:00
Dane Springmeyer
87541f19d5 update test data 2015-06-10 22:01:13 -07:00
Dane Springmeyer
352586e9d7 handle pj_transform HUGE_VAL results (aka inf)
- turns out pj_transform will not always return an error code for
   failed transforms and may instead just set values as HUGE_VAL
 - this commit handles this and calls it an error by return false
   from forward/backward

Arguably if `point_count` > 1 some values might be correctly transformed
while others might be HUGE_VAL. For the purposes of Mapnik we will consider
any HUGE_VAL as an error because we have no way to handle partial failures.
2015-06-10 18:34:11 -07:00
artemp
793a2f9ffb better not to rely on implicit conversion to bool but use pointer comparison with nullptr 2015-06-10 11:42:34 +01:00
Blake Thompson
d209e5bc33 After some tweaking determined what I feel like are the best values for threshold and limiting sharp corners 2015-06-09 13:15:12 -05:00
Blake Thompson
75f7cb26bb Reversed the offsets 2015-06-09 09:18:52 -05:00
Dane Springmeyer
804e523e71 update tests after #2897 2015-06-08 19:06:43 -07:00
Blake Thompson
735ac5a6e1 Updated visual tests 2015-06-08 21:00:36 -05:00
Blake Thompson
42de75593d Updated unit test to be correct 2015-06-08 20:32:21 -05:00
Blake Thompson
a74c4abe57 Reverted to original offset directions for now 2015-06-08 19:33:00 -05:00
Blake Thompson
eb5ca2af87 Merge branch 'offset' of github.com:mapnik/mapnik into offset 2015-06-08 17:13:58 -05:00
Blake Thompson
7aa7860b65 Added tests to offset 2015-06-08 17:13:02 -05:00
Dane Springmeyer
bca0fb872c update visual test images after #2894 2015-06-08 14:21:00 -07:00
Dane Springmeyer
fad969421f ensure visual tests compile if GRID_RENDERER is disabled 2015-06-06 12:42:00 -07:00
Dane Springmeyer
583fbaec14 fix test compile if cairo is disabled 2015-06-06 12:30:56 -07:00
Dane Springmeyer
29c9e97d76 minor code cleanup in process_group_symbolizer 2015-06-06 08:09:06 -07:00
Blake Thompson
c3574c1008 Initial commit changing offsets 2015-06-05 10:04:24 -05:00
Dane Springmeyer
dcfa0b655c fix #2863 by adding back compatibility of point symbolizer interior placement on point geometries + update visual tests 2015-06-04 07:45:44 -07:00
Dane Springmeyer
a38cc2aab6 disable tiff test on windows - closes #2838 2015-06-03 15:04:50 -07:00
Dane Springmeyer
e17505686c fix compile - followup to #2880 2015-06-03 14:16:30 -07:00
Dane Springmeyer
4bf4bb0104 Merge pull request #2880 from zerebubuth/fix/rapidxml-loader-trim-whitespace
Fix rapidxml XML loader to trim whitespace
2015-06-03 14:03:53 -07:00
Matt Amos
1778d19b22 Added headers required on Mac OS - not sure why not on Linux. 2015-06-03 15:56:37 +01:00
Jiri Drbalek
fa35e1c193 update test data 2015-06-03 13:10:57 +00:00
Blake Thompson
a138b8717d Removed angus clipper library from code and updated all visual tests to master 2015-06-02 14:14:21 -05:00
Matt Amos
b21ed59190 Add test for XML parser whitespace trimming behaviour.
This tests the at the XML parser trims whitespace from XML text
nodes. This was already the behaviour of the libxml2 parser, but
not the rapidxml parser.

Note that this makes #2878 pass for the rapidxml parser as well
as the libxml2 parser. It seems that Travis uses the rapidxml
parser only.
2015-06-02 17:50:08 +01:00
artemp
90a27abccb catch and remove more spurious std::move's 2015-06-02 15:36:31 +01:00
artemp
df4226a825 remove spurious std::move's (clang - moving a temporary object prevents copy elision [-Wpessimizing-move]) 2015-06-02 14:26:35 +01:00
Jiri Drbalek
b0759e8ade visual tests: update visual data 2015-05-27 10:25:25 +00:00
Paul Norman
d683795af5 make test/run independent of bash location 2015-05-26 14:38:51 -07:00
Blake Thompson
847a9f0d45 Merge pull request #2839 from mapnik/static_strategy
Changed from numeric casts to static casts in strategies
2015-05-26 16:19:13 -05:00
Blake Thompson
ee551cd949 Removed vector tile strategy 2015-05-26 16:18:10 -05:00
Blake Thompson
3768702699 Updated unit tests 2015-05-26 16:03:25 -05:00
Blake Thompson
506d2f435f Added vector tile strategy 2015-05-26 15:52:41 -05:00
Blake Thompson
611eb6e7a3 Changed from numeric casts to static casts 2015-05-26 15:52:41 -05:00
Blake Thompson
775fcb5378 Updated clipper so that it uses stable_sort rather then sort so results are the same across operating systems 2015-05-26 14:40:16 -05:00
Jiri Drbalek
b5d07a7e0d visual tests: update visual data 2015-05-25 21:32:47 +00:00
Jiri Drbalek
d4de1226ab visual tests: add support for grid renderer 2015-05-25 21:03:40 +00:00
Jiri Drbalek
c1461f495a visual tests: handle runner exceptions 2015-05-25 21:03:40 +00:00
Jiri Drbalek
86ce91bd09 visual tests: apply constness 2015-05-25 21:03:40 +00:00
Dane Springmeyer
77907bdb1e another ifdef for renderers 2015-05-23 12:53:58 -07:00
Dane Springmeyer
c6adab02f4 Merge branch 'master' of github.com:mapnik/mapnik into svg-visual-tests 2015-05-23 12:08:58 -07:00
Dane Springmeyer
ad09abee21 free memory in visual tests to keep valgrind happier 2015-05-23 12:05:10 -07:00
Dane Springmeyer
018c595dda properly ifdef cairo and svg renderers 2015-05-23 11:59:48 -07:00
Dane Springmeyer
0646e9446e use new visual test data with svg 2015-05-23 11:10:24 -07:00
Dane Springmeyer
99560b23ab add svg_renderer to visual tests 2015-05-23 11:08:51 -07:00
Dane Springmeyer
aae52dad2e u_cleanup is called from unit/run.cpp already [skip ci] 2015-05-22 13:56:59 -07:00
Dane Springmeyer
6c8a72dfb0 also skip running unit tests since they (currently at least) depend on test data - followup to #2845 2015-05-22 09:52:01 -07:00
Jiri Drbalek
c349412056 visual tests: skip visual tests when test data are not present 2015-05-22 17:02:52 +00:00
artemp
9c9a7a06a0 unit test geometry - use appropriete std::string constructor ( file_io.get() doesn't guarantee to return null terminated C-string!) 2015-05-22 09:24:45 +01:00
Dane Springmeyer
d5e4197aa2 fixup webp test 2015-05-21 20:42:18 -07:00
Dane Springmeyer
c2e94c68a5 fix crash + add crashing testcase for #2842 2015-05-21 20:39:14 -07:00
Dane Springmeyer
4a69a94fed always compile tests even if not installing 2015-05-21 07:41:28 -07:00
Blake Thompson
8534d5e5c2 Updated to latest visual test version 2015-05-20 17:35:08 -05:00
Dane Springmeyer
fad048861d use latest visual test data 2015-05-20 14:23:28 -07:00
Dane Springmeyer
0f8b379eea update visual tests after mapnik/test-data-visual#1 2015-05-20 11:24:01 -07:00
Blake Thompson
2031215247 Renamed set_opacity to apply_opacity, reverted it to the old logic of set_alpha. Updated tests, clamping is now used. 2015-05-20 13:08:18 -05:00
Blake Thompson
b68d079255 Changed the name of the set_alpha and multiply_alpha to be set_opacity and multiply_opacity 2015-05-20 12:39:01 -05:00
Blake Thompson
25c6576fdd Updated the way that multiply_alpha works, such that it is not clamped at the multiplier, but rather at the result of the multiplier and alpha. 2015-05-20 12:39:00 -05:00
Dane Springmeyer
6537183f86 Merge pull request #2827 from mapycz/visual-tests-parallel
visual tests: set number of parallel threads by JOBS environment variable
2015-05-20 10:17:00 -07:00
Jiri Drbalek
b5c2b98412 visual tests: set number of parallel threads by JOBS environment variable 2015-05-19 18:05:38 +00:00
Jiri Drbalek
5ad9b4531c visual tests: allow style paths in command line arguments 2015-05-19 17:30:58 +00:00
Jiri Drbalek
8519bde143 visual tests: drop config.cpp 2015-05-19 17:30:58 +00:00
Jiri Drbalek
3db7b0ca9b visual tests: use boost::filesystem::path for paths 2015-05-19 17:30:58 +00:00
Matt Amos
0db207d076 Bump submodule hash for new test data file. 2015-05-19 00:33:46 +01:00
Matt Amos
782a949543 Use approx when testing floating point approximate equality. 2015-05-18 22:53:11 +01:00
Matt Amos
369887428e Use REQUIRE_THROWS instead of manually checking with try/catch. 2015-05-18 22:40:34 +01:00
Matt Amos
26f233c505 Test failure on thrown exception is already handled by the test framework. 2015-05-18 22:37:13 +01:00
Matt Amos
2bb50371ca Need optional I/O header on clang++, apparently. 2015-05-18 22:34:34 +01:00
Matt Amos
a16b6156ed Ported CSV tests from Python. 2015-05-18 22:14:37 +01:00
Matt Amos
818ede5b93 Ported box2d_test.py 2015-05-18 15:10:55 +01:00
Matt Amos
8e62007e4f Added port of agg_rasterizer_integer_overflow_test.py 2015-05-18 14:46:01 +01:00
Matt Amos
468bc5257b Re-order libs to satify correct link order for ICU symbols from mapnik-json library. 2015-05-18 14:45:30 +01:00
Blake Thompson
4d7c31abba Updated test data again 2015-05-15 17:09:42 -05:00
Dane Springmeyer
2a1005c040 avoid warnings in geometry_equal test 2015-05-15 14:43:42 -07:00
Blake Thompson
776f9aee9a Updates to test/data 2015-05-15 13:54:24 -05:00
Dane Springmeyer
c6c0c5907f update visual tests and data 2015-05-15 11:33:20 -07:00
Dane Springmeyer
77cf3697ae move sourcing of mapnik-settings.env to localize.sh 2015-05-15 11:28:55 -07:00
Blake Thompson
3e24c5a417 Doh, fixing stupid C++ that I wrote after properly writing a unit test 2015-05-15 13:21:51 -05:00
Blake Thompson
90de0d65cb Corrected errors in palette unit test and corrected logic in bounding box projection transform 2015-05-15 12:15:27 -05:00
Blake Thompson
cf68412ef1 Merge pull request #2814 from mapnik/feature/add_tests
Palette unit tests
2015-05-15 10:39:00 -05:00
Blake Thompson
22d70decd4 Palette unit tests 2015-05-15 10:37:52 -05:00
Dane Springmeyer
3ae6e49a2e Merge pull request #2812 from mapnik/feature/add_tests
Adding tests and cleanup
2015-05-14 23:05:48 -07:00
Dane Springmeyer
956de13d4e fix issues reported by scan-build - closes #2813 2015-05-14 18:00:25 -07:00
Jiri Drbalek
a2d7ba4665 update visual tests 2015-05-14 16:18:15 +00:00
Jiri Drbalek
7a0f38c8f2 update visual tests 2015-05-14 15:50:26 +00:00
Jiri Drbalek
87d4990f9a handle styles with missing reference images 2015-05-14 11:36:08 +00:00
artemp
5126491705 fix unit test 2015-05-14 12:08:14 +01:00
Blake Thompson
d1616737f2 Removed the mapnik type of 'byte' because it seemed sparsely used and simply providing data type should be easier as it is never going to change. Also added some tests around mapnik palette 2015-05-13 19:32:54 -05:00
Blake Thompson
f3abe7fc25 Added test coverage to image buffer 2015-05-13 16:50:31 -05:00
Blake Thompson
86b65146a7 Added more tests around image_any 2015-05-13 16:50:31 -05:00
Blake Thompson
deba4c114a Added test coverage for image_any 2015-05-13 16:50:31 -05:00
Blake Thompson
cebbca16d4 Improved test coverage for image and image view 2015-05-13 16:50:31 -05:00
Blake Thompson
f2b26f5707 Initial commit for image unit test 2015-05-13 16:50:31 -05:00
Blake Thompson
c3dfda4977 Merge pull request #2808 from mapnik/bugfix/strategy_rounding
Bugfix/strategy rounding
2015-05-13 13:45:26 -05:00
Blake Thompson
166e606b71 Better tests to fully cover all cases 2015-05-12 15:01:17 -05:00
Blake Thompson
39428585f0 Added the rounding_cast utility, and added a scale_rounding_strategy to support this new casting type. Added tests for it 2015-05-12 14:36:29 -05:00
Blake Thompson
1dddfd17ef Removed try catch around set_alpha, and just checked bounds. Added unit tests for image_view 2015-05-12 12:24:14 -05:00
Jiri Drbalek
7ca96eb824 visual tests: use boost::filesystem::unique_path() instead of boost::uuids::uuid 2015-05-12 12:52:02 +00:00
Dane Springmeyer
d0abe672fc support older boost in visual tests - closes #2801 2015-05-11 21:23:39 -07:00
Dane Springmeyer
2d2f63f27f visual tests: show errors when hit both in console and in html report 2015-05-11 19:49:38 -07:00
Dane Springmeyer
b9d39a2883 avoid crash on uninitialized pointer [skip ci] 2015-05-11 19:22:44 -07:00
Dane Springmeyer
175e9f1571 fix spelling [skip ci] 2015-05-11 19:07:33 -07:00
Dane Springmeyer
a79b33236a fix spelling [skip ci] 2015-05-11 19:04:23 -07:00
Dane Springmeyer
41ad16f4d7 hello world plugin is now standalone at https://github.com/mapnik/hello-world-input-plugin - refs #2790 2015-05-11 17:07:33 -07:00
Blake Thompson
e44cdef805 Fix get_pixel with image_view 2015-05-11 18:19:24 -05:00
Blake Thompson
ba0cc39046 Updated tests so that they use REQUIRE_THROWS 2015-05-11 15:51:50 -05:00
Jiri Drbalek
5220afb9f2 Merge pull request #2796 from mapycz/cpp-visual-test-runner
new visual test runner
2015-05-11 22:14:32 +02:00
Jiri Drbalek
220ecb1215 update visual tests 2015-05-11 20:13:21 +00:00
Blake Thompson
f54164da75 Changed the way that set alpha worked, renaming old method to multiply_alpha, added new set_alpha, that simply sets the alpha. Added protection for overflows and underflows. Added unit tests to cover all code 2015-05-11 13:12:13 -05:00
Jiri Drbalek
688f76a260 new visual test runner 2015-05-10 20:14:04 +00:00
Blake Thompson
1ca5ae4446 Forgot to add unit test 2015-05-10 14:28:10 -05:00
Blake Thompson
fbfd6664bc Added unit test for premultiply 2015-05-08 20:19:50 -05:00
Dane Springmeyer
126c777c8d shuffle around boost/geometry usage in headers to reduce compile time 2015-05-05 22:04:49 -07:00
Dane Springmeyer
655d27775b update test data 2015-04-30 14:26:49 -07:00
Dane Springmeyer
404f942e4b update test-data submodule 2015-04-30 08:02:47 -07:00
Dane Springmeyer
5a594dd0c1 move C++ test running to test/run + make output prettier 2015-04-30 07:41:16 -07:00
Dane Springmeyer
77d9c886a2 fix paths for font_registration_test.cpp - refs #2787 2015-04-30 07:12:30 -07:00
Dane Springmeyer
ad2e8afb55 fix failing C++ tests that depend on test data - closes #2787 2015-04-30 06:57:47 -07:00
Dane Springmeyer
b730d437f7 pj_clear_initcache is only available in proj >= 4.8 2015-04-29 18:00:47 -07:00
Dane Springmeyer
f861df2130 fix compile on windows (M_PI) [skip ci] 2015-04-29 15:58:13 -07:00
Dane Springmeyer
66ad95cbbe remove extra unit test print [skip ci] 2015-04-26 23:32:37 +02:00
Dane Springmeyer
d9ea4e9b6e ensure clean valgrind run 2015-04-26 23:26:11 +02:00
Dane Springmeyer
d83afb3c75 pull data from test-data repo 2015-04-26 20:23:02 +02:00
Dane Springmeyer
8a64d6aeba drop useless test (should be covered by visual tests) 2015-04-26 01:16:25 +02:00
Dane Springmeyer
6227ca8588 upgrade catch 2015-04-26 01:15:31 +02:00
Dane Springmeyer
c4f497be0a drop old cpp_tests folder [skip ci] 2015-04-25 22:13:26 +02:00
Dane Springmeyer
edf7616b19 reorganize c++ tests 2015-04-25 22:08:12 +02:00