diff options
author | Hans Bolinder <[email protected]> | 2019-08-20 08:53:24 +0200 |
---|---|---|
committer | Hans Bolinder <[email protected]> | 2019-08-20 08:53:24 +0200 |
commit | 6f602caf460bdd9217e3b4fa7edca37f0f643ceb (patch) | |
tree | af912bb0a5a13381bf66db36848c3b0412ff2ad4 /lib/eunit/test/eunit_SUITE.erl | |
parent | ae97c3416bbbc7a5aa181814bb82b573cbc9da7f (diff) | |
parent | dbcf2d350b52d42afe8694d296f8cf779f73b6c4 (diff) | |
download | otp-6f602caf460bdd9217e3b4fa7edca37f0f643ceb.tar.gz otp-6f602caf460bdd9217e3b4fa7edca37f0f643ceb.tar.bz2 otp-6f602caf460bdd9217e3b4fa7edca37f0f643ceb.zip |
Merge branch 'ampleyfly/eunit/surefire_controlchars/OTP-15950/ERL-991/PR-2316'
* ampleyfly/eunit/surefire_controlchars/OTP-15950/ERL-991/PR-2316:
ERL-991 Strip control codes from eunit_surefire output
Diffstat (limited to 'lib/eunit/test/eunit_SUITE.erl')
-rw-r--r-- | lib/eunit/test/eunit_SUITE.erl | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/eunit/test/eunit_SUITE.erl b/lib/eunit/test/eunit_SUITE.erl index 63bdc6c334..b9f4ea4557 100644 --- a/lib/eunit/test/eunit_SUITE.erl +++ b/lib/eunit/test/eunit_SUITE.erl @@ -21,14 +21,16 @@ -export([all/0, suite/0,groups/0,init_per_suite/1, end_per_suite/1, init_per_group/2,end_per_group/2, - app_test/1,appup_test/1,eunit_test/1,surefire_utf8_test/1,surefire_latin_test/1]). + app_test/1,appup_test/1,eunit_test/1,surefire_utf8_test/1,surefire_latin_test/1, + surefire_c0_test/1]). -include_lib("common_test/include/ct.hrl"). suite() -> [{ct_hooks,[ts_install_cth]}]. all() -> - [app_test, appup_test, eunit_test, surefire_utf8_test, surefire_latin_test]. + [app_test, appup_test, eunit_test, surefire_utf8_test, surefire_latin_test, + surefire_c0_test]. groups() -> []. @@ -65,11 +67,24 @@ surefire_utf8_test(Config) when is_list(Config) -> check_surefire(tutf8), ok. +surefire_c0_test(Config) when is_list(Config) -> + ok = file:set_cwd(proplists:get_value(priv_dir, Config, ".")), + Chars = check_surefire(tc0), + %% Check that these characters were not stripped + true = lists:member($\n, Chars), + true = lists:member($\r, Chars), + true = lists:member($\t, Chars), + ok. + check_surefire(Module) -> File = "TEST-"++atom_to_list(Module)++".xml", file:delete(File), % ignore test result, some fail on purpose eunit:test(Module, [{report,{eunit_surefire,[{dir,"."}]}}]), {ok, Bin} = file:read_file(File), - [_|_] = unicode:characters_to_list(Bin, unicode), - ok.
\ No newline at end of file + Chars = unicode:characters_to_list(Bin, unicode), + %% Check that unicode decoding succeeded + [_|_] = Chars, + %% Check that file is valid XML + xmerl_scan:file(File), + Chars. |