mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
14,682 Commits 7 Branches 39 Tags 356 MiB
Commit Graph

374 Commits

Author SHA1 Message Date
Gymnasiast 3891b9874d Fix testpaint 2017-09-12 11:29:43 +02:00
Gymnasiast a28509e24c Split Ride and rct2_ride 2017-09-12 11:16:57 +02:00
Ted John ef84f6283d Fix testpaint 2017-09-03 02:59:14 +01:00
Ted John 43c6f7fda0 Pass paint session to ps functions 2017-09-03 02:27:07 +01:00
Ted John f2b8cf181e Pass paint session to remaining support functions 2017-09-03 01:56:56 +01:00
Ted John 1cc82d1cb5 Pass paint session to tunnel functions 2017-09-03 01:51:59 +01:00
Ted John 2980be0667 Pass paint session to more ps functions 2017-09-02 23:22:19 +01:00
Ted John 6b3f3ddb70 Pass paint session to scenery_paint 2017-09-02 22:44:39 +01:00
Ted John 8456639b47 Pass paint session to entrance_paint 2017-09-02 22:43:45 +01:00
Ted John 1f6f83163a Pass paint session to fence_paint 2017-09-02 22:41:36 +01:00
Ted John 00cde34b39 Pass paint session to scenery_multiple_paint 2017-09-02 22:40:19 +01:00
Ted John 5c8700d054 Pass paint session to banner_paint 2017-09-02 22:38:26 +01:00
Ted John 4c78827c45 Pass paint session to path_paint 2017-09-02 22:31:39 +01:00
Ted John 47521335fa Pass paint session to surface_paint 2017-09-02 22:25:45 +01:00
Ted John 4ea9ac2d07 Fix testpaint 2017-09-02 19:00:54 +01:00
Michał Janiszewski ef5ad36cf5 Build RCT2 tests even when not running them 2017-08-31 11:02:25 +02:00
Richard Jenkins 71e580a58f Refactor game load functions, resolves #6011 2017-08-23 08:04:36 +02:00
Ted John 6b48f4344e Fix #6100: Paths don't connect to exit 
Regression from db438a27b7, % does not work on negative numbers.
 2017-08-06 00:18:32 +01:00
Michał Janiszewski ede8054726 Make multilaunch retest ride count after some updates 2017-08-02 23:50:49 +02:00
Michał Janiszewski b3b2a1ece2 Improve multilaunch test to delete the load result 2017-08-02 23:50:38 +02:00
Michał Janiszewski 01271f68d8 Call game_load_init() in multilaunch test 2017-08-02 19:39:52 +02:00
Michał Janiszewski c3dd3f193f Extend multilaunch test to perform game_logic_updates 2017-08-02 19:39:52 +02:00
Michael Steenbeek 2f3a30f22b Fix cast to bool in map element functions 2017-08-01 13:42:50 +02:00
Gymnasiast db438a27b7 Use map_element_get_direction in more places, create map_element_get_direction_with_offset() 2017-07-27 21:23:26 +02:00
Michael Steenbeek 46de90df86 Create map_get_water_height() 2017-07-27 17:15:56 +02:00
Michael Steenbeek 41b5e8bbca Remove direct usage of map element track sequence field 2017-07-27 16:19:01 +02:00
Gymnasiast d936b23072 Get and set map element station index via helper functions 2017-07-27 14:13:16 +02:00
Hendrik v. Raven 75275d64b7 add a warning when using system gtest 
gtest upstream advices against using a globally installed gtest. Make
sure the user is aware of this.
 2017-07-26 11:44:06 +02:00
Hendrik v. Raven 5b3f0454dd reformatting to match if clause 
reformat the existing code to match the newly introduced indention level
 2017-07-26 11:44:06 +02:00
Hendrik v. Raven 0f111de224 add SYSTEM_GTEST option to use gtest of the system 
This adds a new configure option forcing the system to use googletest
installed on the system instead of downloading a version. The default
is still to download googletest.
 2017-07-26 11:44:06 +02:00
Hendrik v. Raven cfa20d2117 rename GTEST_INCLUDE_DIR to GTEST_INCLUDE_DIRS 
GTEST_INCLUDE_DIRS is the name used by the CMake GTest package. This
is a preparation for the optional usage of a system installed gtest.
 2017-07-26 11:44:06 +02:00
Michael Steenbeek 367efa2020 Use remap flags, SPRITE_ID_PALETTE_COLOUR_1 and _2 in many more places 2017-07-20 20:56:29 +02:00
Brian Callahan e7da549920 No -ldl on the BSDs, so make sure only Linux gets it 2017-06-25 23:28:04 +02:00
Ted John f275e5ba9b Remove all platform.h includes from header files 
System headers, particularly windows.h polute the namespace too much with macros and unwanted definitions. Do not use them in header files.
 2017-06-25 18:59:56 +01:00
Michał Janiszewski 21e65934d6 Change number of launches in multilaunch test to 3 
[ci skip]
 2017-06-24 09:56:51 +02:00
Michał Janiszewski 6aa4722c22 Add MultiLaunch test 2017-06-24 09:56:51 +02:00
Gymnasiast 4059d9e8a7 Clean up boosters, ride_type_null, max rides per entry, formatting 2017-06-14 16:06:43 +02:00
Ted John 906b71796c Remove testpaint for VS 2017-06-13 12:23:26 +01:00
Ted John 29f0372da8 Reduce SDL2 in headers 2017-06-12 19:56:32 +01:00
Michał Janiszewski 61d38511bc Expand tabs to spaces 
This commit expands tabs to spaces (ts=4) in all the files under src/
and test/.

Until now we had two wildly different code styles with C using tabs and
new C++ using spaces. It is painful to maintain as none of the commonly
used tools support this kind of setup and in reality is needless, as we
can simply convert all the sources to spaces and have opened PRs do the
same, where needed.

Additionally, trailing whitespace has been removed.
 2017-06-06 23:46:14 +02:00
Michał Janiszewski 105f353092 Fix symlink created for ride ratings test 2017-06-05 23:09:43 +02:00
Michał Janiszewski eafd2ac7a7 Add option to force-disable RCT2 tests 2017-06-05 23:08:45 +02:00
Michał Janiszewski c64076e17d Disable ride ratings test on CI 2017-06-05 22:51:57 +02:00
Michał Janiszewski 46e9978262 Create symlink for rides test 2017-06-05 22:46:49 +02:00
Ted John 9a619b3e0a Clean up branch 2017-06-05 17:38:14 +01:00
Ted John 38fb37c84c Enable ride ratings test for cmake 2017-06-04 00:48:45 +01:00
Ted John 0662f1630a Fix ride ratings test to work with new Context flow 2017-06-04 00:48:45 +01:00
Ted John f2524c07b3 Add rating test data 2017-06-04 00:47:34 +01:00
Ted John e9898ba82f Use new rating test data 2017-06-04 00:47:33 +01:00
Ted John 7ca1173bcb Fix warning 2017-06-04 00:47:33 +01:00
Ted John b28fde6ae7 Create test data helpers 2017-06-04 00:47:33 +01:00
Ted John cf7f1b7335 Change location of test data 2017-06-04 00:47:33 +01:00
Ted John d65d31f632 Fix test expectations and describe ride types 2017-06-04 00:47:33 +01:00
Ted John 443e17c8fc Force rating update on each ride before testing 2017-06-04 00:47:33 +01:00
Ted John c5306d72f7 Add ride ratings test 2017-06-04 00:47:33 +01:00
Michał Janiszewski 79d76759bb Fix #5516: Update copyrights for 2017 
Not all files were necessarily _changed_, but all were touched, see
https://github.com/OpenRCT2/OpenRCT2/pull/4932
 2017-06-01 21:55:10 +02:00
Ted John 00199051c1 Add SDL2 include to test cmake 2017-05-29 22:38:45 +02:00
Ted John 82288f92e6 Add cmake for testpaint 2017-05-29 22:38:44 +02:00
Ted John 1f8f354e49 Update root cmake and enable tests 2017-05-29 22:38:44 +02:00
Ted John 23a314d4ba Convert tabs to spaces for test cmakelists 2017-05-29 22:38:44 +02:00
Gymnasiast d4bb9c38c9 Delete unused file 2017-05-17 22:57:23 +02:00
Gymnasiast 09f0425c2f Unify River Rafts and Splash Boats drawing code 2017-05-17 20:49:07 +02:00
Michael Steenbeek a53b01d5b9 Remove magic numbers and Americanisms 2017-05-08 23:54:38 +02:00
CraigCraig e0b875398b Tons of spelling fixes (#5413) 
[ci skip]
 2017-04-30 06:39:24 +02:00
Gymnasiast cc92300e3a Load CSG1 booster sprites for the Looping and Corkscrew RC 2017-04-11 22:38:09 +02:00
Ted John 0ec43e3611 Improve String::Split and add tests 2017-03-08 19:06:42 +00:00
Michał Janiszewski 6181d968e8 Add case insensitive test to INI tests 2017-03-06 22:28:33 +01:00
Michał Janiszewski d610ef5447 Remove unnecessary libs from linking to tests 
[ci skip]
 2017-02-25 00:10:27 +01:00
Michał Janiszewski e39444b592 Add more test cases to StringTest 2017-02-25 00:07:45 +01:00
Michał Janiszewski 62ab0e0e03 Add missing include to IniReaderTest 2017-02-25 00:07:45 +01:00
Ted John f851198645 Fix and format test data 2017-02-24 23:01:06 +00:00
Ted John fe2cb79d18 Use strings for test data in IniReaderTest 2017-02-24 22:57:32 +00:00
Michał Janiszewski 7d0cc83908 Add tests for untrimmed INI 2017-02-24 23:39:01 +01:00
Michał Janiszewski 5f43c37ca0 Add String test to CMake 2017-02-24 23:04:36 +01:00
Michał Janiszewski d41293fa6b Extract common test sources into library 2017-02-24 23:04:20 +01:00
Ted John 3b341de835 Fix String::Trim and add test 2017-02-24 21:48:06 +00:00
Michał Janiszewski 84d69b797b Change type of variable used in test 2017-02-24 20:58:01 +01:00
Michał Janiszewski 58da1cde84 Make IniReader not throw while parsing invalid values 2017-02-24 20:26:49 +01:00
Michał Janiszewski 21827c91ab Extend duplicate INI tests with values 2017-02-24 20:18:30 +01:00
Michał Janiszewski 94f0b39f0f Add tests for duplicate sections 2017-02-24 20:15:15 +01:00
Michał Janiszewski 0a77374899 Move MemoryStreams in INI tests to stack 2017-02-24 19:53:23 +01:00
Michał Janiszewski d23edb0f91 Fix INI tests for Windows' 2-byte newlines 2017-02-24 00:10:04 +01:00
Michał Janiszewski e5d569ac6c Add INI tests to MSVC 2017-02-23 23:38:25 +01:00
Michał Janiszewski 8143be0707 Add IniReader, IniWriter tests 2017-02-23 23:37:22 +01:00
Michał Janiszewski 4f852d1ea5 Fix testpaint target for new config 2017-02-21 07:29:06 +01:00
Ted John 8ba5db0697 Fix build for some configurations 2017-02-20 20:05:59 +00:00
Ted John e649e7ad4a Move creation of version string to Version.cpp 2017-02-09 17:58:19 +00:00
Ted John 3a4bc87198 Allow control of assertion behaviour 
This allows tests to change the behaviour at runtime so that OpenRCT2 aborts instead of showing a message box.
 2017-02-09 17:57:39 +00:00
zaxcav 25e57ca50d Updated code as requested by reviewer. 
Removed display of raw cut height value.

Changed display of cut height in METRIC/SI from 1DP to 2DP to display odd raw heights with accurate value.

Changed display of cut height in IMPERIAL to 1DP to display odd raw heights with accurate value.
 2017-01-22 21:02:19 +01:00
zaxcav e952c607cc Add definition of gClipHeight to compat.c 2017-01-22 20:41:34 +01:00
Marijn van der Werf 2ffbbe0678 Test vertical tunnels properly 2017-01-17 23:57:53 +01:00
Michał Janiszewski 77a0c141a7 Merge pull request #5044 from janisozaur/ninja 
Add BUILD_BYPRODUCTS entries to CMakeLists for googletest
 2017-01-16 09:38:58 +01:00
Michał Janiszewski 85c6ed778b Add overrides in TestTrack.cpp 2017-01-13 11:44:14 +01:00
Michał Janiszewski 99032651d2 Add BUILD_BYPRODUCTS entries to CMakeLists for googletest 
This allows building tests with ninja build system
 2017-01-11 12:10:40 +01:00
Ted John b7b58817bb Rename openrct2-lib to libopenrct2 2017-01-10 17:29:03 +00:00
Ted John 73b21b5880 Convert openrct2 to static library 2017-01-10 17:29:02 +00:00
Michael Steenbeek 1c2458b6dd Combine drawing of the Spiral and Mini RC (#5025) 2017-01-09 22:09:33 +01:00
Michael Steenbeek 2b35986746 Add and use constant for number of ride types 2017-01-05 09:19:22 +01:00
Marijn van der Werf 24a0405345 Update testpaint 2017-01-04 18:28:40 +00:00
Michał Janiszewski 0d88276abe Fix tests for new source layout 2017-01-04 18:28:39 +00:00
Ted John a2e3f10ca1 Update VS project files 2017-01-04 18:28:37 +00:00
Michał Janiszewski d15112dcb3 Fix broken includes in TestPaint.cpp 2016-12-28 19:07:46 +01:00
Broxzier 6c29bdbf21 CppCheck fixes 2016-12-24 13:10:03 +01:00
Marijn van der Werf 2fca2adbc1 Fix prepended wooden supports 2016-12-19 18:45:08 +01:00
Ted John 870a8fc6b6 Move addresses and hook into rct2 sub directory 2016-12-16 01:25:05 +00:00
Ted John c8dbc24ceb Enable all C++ features for MSVC 2016-12-16 01:19:41 +00:00
Michał Janiszewski 2e674b9202 Migrate Linux Travis-CI jobs to docker containers 2016-12-15 16:55:17 +00:00
Ted John e9bafc2973 Refactor RCT2 interop code to new source 2016-12-11 12:16:43 +00:00
Michał Janiszewski f9424455e7 Merge pull request janisozaur/OpenRCT2#23 
Add msbuild / msvc / windows support for tests
 2016-12-02 22:52:07 +01:00
Michał Janiszewski 3253ef7cae Verify decoded chunk length 2016-12-02 22:12:55 +01:00
Michał Janiszewski 28098776b2 Convert tests to class + fixtures 
This makes test data not require `extern`
 2016-12-02 22:00:02 +01:00
Ted John 756e26ad45 Fix main function 2016-12-02 17:16:12 +00:00
Ted John d26e1df21e Automatically download googletest 2016-12-02 13:36:03 +00:00
Ted John 4ccb50409b Add test configurations 2016-12-02 02:49:50 +00:00
Ted John 91e19c7d48 Move a lot of the common properties to a shared props file 2016-12-02 00:59:52 +00:00
Ted John a08af1a253 Get tests to build for Windows and VS 2016-12-02 00:34:14 +00:00
Michał Janiszewski 86a336dd3d Extend LanguagePack test with negative tests 2016-12-01 23:28:01 +01:00
Michał Janiszewski a2d30ac405 Add multibyte LanguagePack test 2016-12-01 23:21:35 +01:00
Michał Janiszewski e3a3cf375d Add LanguagePackTest 2016-12-01 23:04:10 +01:00
Michał Janiszewski 729934193c Improve tests' CMakeLists.txt 2016-12-01 16:03:27 +01:00
Michał Janiszewski b0e5333ce6 Improve sawyercoding_test.cpp 2016-12-01 16:03:27 +01:00
Michał Janiszewski cae3f776f3 Run tests on travis 2016-12-01 16:03:27 +01:00
Michał Janiszewski f496fceb00 Download and compile our own gtest 2016-12-01 16:03:27 +01:00
Michał Janiszewski be1028b20e Add CMakeLists.txt file for tests 2016-12-01 16:03:27 +01:00
Michał Janiszewski fdcbd583e3 Add first test for sawyercoding 2016-12-01 16:03:27 +01:00
Marijn van der Werf 15a6575346 Update hooks to return CPU flags 2016-12-01 14:15:47 +01:00
Ted John ee0ca426b3 Allow building for both VS2015 and VS2017 2016-11-26 23:53:29 +00:00
Michał Janiszewski 3f7fd56328 Remove trailing whitespace in sources 2016-11-13 20:32:55 +01:00
Ted John 84e8b00900 Merge pull request #4678 from marijnvdwerf/fix/paint-4 
Track Paint fixes: segment support height
 2016-10-22 14:22:03 +01:00
Marijn van der Werf 4b4c00a1af Check for `SEGMENTS_ALL` when printing 2016-10-22 14:42:30 +02:00
Marijn van der Werf 157d535f67 Only fallback if only one element differs 2016-10-22 02:40:35 +02:00
Marijn van der Werf 6f2b20d3c0 Fix lay down rc station tunnels 2016-10-22 01:51:55 +02:00
Marijn van der Werf ce5831f9b4 Fix upward single-tile turns 2016-10-22 01:36:50 +02:00
Marijn van der Werf ffbe380da7 Fix tunnel dumping 2016-10-22 01:04:17 +02:00
Marijn van der Werf 1be2dd996c Make testpaint a lot more quiet 2016-10-19 01:58:47 +02:00
Marijn van der Werf 3dcebfc97f Update TODOs 2016-10-18 19:37:08 +02:00
Marijn van der Werf a44745e2fa Fix General/SegmentSupportHeightCalls 2016-10-17 23:12:54 +02:00
Marijn van der Werf 4f10555002 Move include to extern C 2016-10-17 21:43:31 +02:00
Michał Janiszewski 262655e2e0 Validate access to functionNames 
# Conflicts:
#	test/testpaint/Printer.cpp
 2016-10-17 21:42:03 +02:00
Marijn van der Werf d7f27cff72 Fix GCC 2016-10-17 21:28:27 +02:00
Marijn van der Werf c150c968bf Remove `printf` call 2016-10-17 20:04:24 +02:00
Marijn van der Werf a93e12b5d9 Add silent mode 2016-10-17 20:04:13 +02:00
Marijn van der Werf ed9f67cc46 Fix original call 2016-10-17 19:56:26 +02:00
Marijn van der Werf 58e5df75f0 Fix MSVC 2016-10-17 19:16:53 +02:00
Marijn van der Werf 54964857da Indent call test 2016-10-17 19:15:57 +02:00
Marijn van der Werf ba986f14ae Actually return after failed test 2016-10-17 18:04:12 +02:00
Marijn van der Werf 7d126126ed Add filters 2016-10-17 17:59:51 +02:00
Marijn van der Werf e1c4e3e8f2 Remove more C bridging code 2016-10-17 16:07:32 +02:00
Marijn van der Werf d05dfbe5dc Rename intercept2 to TestPaint 2016-10-17 16:06:05 +02:00
Marijn van der Werf 455080d8b8 Fix MSVC 2016-10-17 15:36:26 +02:00