From 3448e2aa81a01244458824aae94d3e746a9a4c24 Mon Sep 17 00:00:00 2001 From: Hans Bolinder Date: Sat, 5 Jan 2013 09:26:34 +0100 Subject: Fix some FOP warnings Examples overflowing the width of PDF pages have been fixed. The remaining warnings are due to table cells, and require more work. --- lib/common_test/doc/src/common_test_app.xml | 11 ++++-- lib/common_test/doc/src/ct_hooks_chapter.xml | 27 ++++++------- lib/common_test/doc/src/run_test_chapter.xml | 6 ++- lib/common_test/doc/src/write_test_chapter.xml | 52 +++++++++++++------------- 4 files changed, 50 insertions(+), 46 deletions(-) (limited to 'lib/common_test') diff --git a/lib/common_test/doc/src/common_test_app.xml b/lib/common_test/doc/src/common_test_app.xml index b6d4a633cb..151159ad69 100644 --- a/lib/common_test/doc/src/common_test_app.xml +++ b/lib/common_test/doc/src/common_test_app.xml @@ -4,7 +4,7 @@
- 20032012 + 20032013 Ericsson AB. All Rights Reserved. @@ -170,7 +170,9 @@ UserData = term() Conns = [atom()] CSSFile = string() - CTHs = [CTHModule | {CTHModule, CTHInitArgs} | {CTHModule, CTHInitArgs, CTHPriority}] + CTHs = [CTHModule | +         {CTHModule, CTHInitArgs} | +         {CTHModule, CTHInitArgs, CTHPriority}] CTHModule = atom() CTHInitArgs = term() @@ -297,8 +299,9 @@ UserData = term() Conns = [atom()] CSSFile = string() - CTHs = [CTHModule | {CTHModule, CTHInitArgs} | - {CTHModule, CTHInitArgs, CTHPriority}] + CTHs = [CTHModule | +         {CTHModule, CTHInitArgs} | +         {CTHModule, CTHInitArgs, CTHPriority}] CTHModule = atom() CTHInitArgs = term() diff --git a/lib/common_test/doc/src/ct_hooks_chapter.xml b/lib/common_test/doc/src/ct_hooks_chapter.xml index 27d56fd47d..fe871eb516 100644 --- a/lib/common_test/doc/src/ct_hooks_chapter.xml +++ b/lib/common_test/doc/src/ct_hooks_chapter.xml @@ -4,7 +4,7 @@
- 20112012 + 20112013 Ericsson AB. All Rights Reserved. @@ -439,14 +439,14 @@ terminate(State) -> - CTH Name - Is Built-in - Description + CTH Name + Is Built-in + Description - cth_log_redirect - yes - Captures all error_logger and SASL logging events and prints them + cth_log_redirect + yes + Captures all error_logger and SASL logging events and prints them to the current test case log. If an event can not be associated with a testcase it will be printed in the common test framework log. This will happen for testcases which are run in parallel and events which occur @@ -455,9 +455,9 @@ terminate(State) -> using the normal SASL mechanisms. - cth_surefire - no -

Captures all test results and outputs them as surefire + cth_surefire + no +

Captures all test results and outputs them as surefire XML into a file. The file which is created is by default called junit_report.xml. The file name can be changed by setting the path option for this hook, e.g.

@@ -467,13 +467,14 @@ terminate(State) ->

If the url_base option is set, an additional attribute named url will be added to each testsuite and testcase XML element. The value will - be a constructed from the url_base and a relative path + be constructed from the url_base and a relative path to the test suite or test case log respectively, e.g.

- -ct_hooks cth_surefire [{url_base,"http://myserver.com/"}] + -ct_hooks cth_surefire [{url_base, "http://myserver.com/"}]

will give a url attribute value similar to

- "http://myserver.com/ct_run.ct@myhost.2012-12-12_11.19.39/x86_64-unknown-linux-gnu.my_test.logs/run.2012-12-12_11.19.39/suite.log.html" + "http://myserver.com/ct_run.ct@myhost.2012-12-12_11.19.39/ +x86_64-unknown-linux-gnu.my_test.logs/run.2012-12-12_11.19.39/suite.log.html"

Surefire XML can for instance be used by Jenkins to display test results.

 diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml index b804f134c6..d5f5d89e05 100644 --- a/lib/common_test/doc/src/run_test_chapter.xml +++ b/lib/common_test/doc/src/run_test_chapter.xml @@ -4,7 +4,7 @@
- 20032012 + 20032013 Ericsson AB. All Rights Reserved. @@ -752,7 +752,9 @@ PrivDirOption = auto_per_run | auto_per_tc | manual_per_tc EventHandlers = atom() | [atom()] InitArgs = [term()] - CTHModules = [CTHModule | {CTHModule, CTHInitArgs} | {CTHModule, CTHInitArgs, CTHPriority}] + CTHModules = [CTHModule | + {CTHModule, CTHInitArgs} | + {CTHModule, CTHInitArgs, CTHPriority}] CTHModule = atom() CTHInitArgs = term() Dir = string() diff --git a/lib/common_test/doc/src/write_test_chapter.xml b/lib/common_test/doc/src/write_test_chapter.xml index 248d7de8b6..cc8d913994 100644 --- a/lib/common_test/doc/src/write_test_chapter.xml +++ b/lib/common_test/doc/src/write_test_chapter.xml @@ -4,7 +4,7 @@
- 20032012 + 20032013 Ericsson AB. All Rights Reserved. @@ -982,38 +982,36 @@

Example:

+   Some printouts during test case execution:
 
-      Some printouts during test case execution:
+     io:format("1. Standard IO, importance = ~w~n", [?STD_IMPORTANCE]),
+     ct:log("2. Uncategorized, importance = ~w", [?STD_IMPORTANCE]),
+     ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]]),
+     ct:log(info, ?LOW_IMPORTANCE, "4. Categorized info, importance = ~w", [?LOW_IMPORTANCE]),
+     ct:log(error, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
+     ct:log(error, ?HI_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),
 
-        io:format("1. Standard IO, importance = ~w~n", [?STD_IMPORTANCE]),
-        ct:log("2. Uncategorized, importance = ~w", [?STD_IMPORTANCE]),
-        ct:log(info, "3. Categorized info, importance = ~w", [?STD_IMPORTANCE]]),
-        ct:log(info, ?LOW_IMPORTANCE, "4. Categorized info, importance = ~w", [?LOW_IMPORTANCE]),
-        ct:log(error, "5. Categorized error, importance = ~w", [?HI_IMPORTANCE]),
-        ct:log(error, ?HI_IMPORTANCE, "6. Categorized error, importance = ~w", [?MAX_IMPORTANCE]),
+   If starting the test without specifying any verbosity levels:
 
-      If starting the test without specifying any verbosity levels:
+     $ ct_run ...
 
-        $ ct_run ...
+   the following gets printed:
 
-      the following gets printed:
-      
-        1. Standard IO, importance = 50
-        2. Uncategorized, importance = 50
-        3. Categorized info, importance = 50
-        5. Categorized error, importance = 75
-        6. Categorized error, importance = 99
-
-      If starting the test with:
-        
-        $ ct_run -verbosity 1 and info 75
-      
-      the following gets printed:
+     1. Standard IO, importance = 50
+     2. Uncategorized, importance = 50
+     3. Categorized info, importance = 50
+     5. Categorized error, importance = 75
+     6. Categorized error, importance = 99
+
+   If starting the test with:
+
+     $ ct_run -verbosity 1 and info 75
+
+   the following gets printed:
 
-        3. Categorized info, importance = 50
-	4. Categorized info, importance = 25
-        6. Categorized error, importance = 99
-
+ 3. Categorized info, importance = 50 + 4. Categorized info, importance = 25 + 6. Categorized error, importance = 99

How categories can be mapped to CSS tags is documented in the Running Tests -- cgit v1.2.3