aboutsummaryrefslogtreecommitdiffstats
path: root/lib/reltool/test
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2012-02-29 16:30:13 +0100
committerSiri Hansen <[email protected]>2012-03-19 09:48:54 +0100
commit2be5415d4a5d024c223d340381ef74e3697fc7ea (patch)
treee7da5710fb75cbc064a3708be28d98f790feeef8 /lib/reltool/test
parenta3a7c3590f549c609749cff16da7d00af2c114d3 (diff)
downloadotp-2be5415d4a5d024c223d340381ef74e3697fc7ea.tar.gz
otp-2be5415d4a5d024c223d340381ef74e3697fc7ea.tar.bz2
otp-2be5415d4a5d024c223d340381ef74e3697fc7ea.zip
[reltool] Display warnings continously in GUI
OTP-9967 All active warnings are now displayed in a specific warning list at the bottom of the sys windows. Warnings do no longer cause popup dialogs during configuration. The reason for this is to avoid the same warning to pop up many times. This would happen since each configuration change now causes a fresh reading of the file system - and thus each warning would be detected each time the configuration was changed. reltool_manual_gui_SUITE is updated to test the new functionality.
Diffstat (limited to 'lib/reltool/test')
-rw-r--r--lib/reltool/test/reltool_manual_gui_SUITE.erl48
1 files changed, 33 insertions, 15 deletions
diff --git a/lib/reltool/test/reltool_manual_gui_SUITE.erl b/lib/reltool/test/reltool_manual_gui_SUITE.erl
index c6b1d56988..1ebee9fae1 100644
--- a/lib/reltool/test/reltool_manual_gui_SUITE.erl
+++ b/lib/reltool/test/reltool_manual_gui_SUITE.erl
@@ -67,37 +67,49 @@ config(Config) ->
SimpleConfigFile = create_simple_config(PrivDir),
WarningConfigFile = create_warning_config(PrivDir,DataDir),
- break("there are no modules in the 'Included' and 'Excluded' columns",
+ break("there are no modules in the 'Included' and 'Excluded' columns, "
+ "and now warnings are displayed",
{"load configuration ~p",[SimpleConfigFile]}),
break("kernel, stdlib and sasl are included and all other are excluded",
"undo"),
break("we are back to default - no included and no excluded applications",
"undo again"),
break("kernel, stdlib and sasl are included and all other are excluded",
- {"load configuration ~p, but click 'cancel' in the warning dialog",
+ {"load configuration ~p",
[WarningConfigFile]}),
- break("no change is done",
- "load same configuration again and this time click 'ok' in the dialog"),
- break("application a is added in the 'Included' column",
+ break("a warning is displayed in the warning list",
+ "undo"),
+ break("no warning is displayed in the warning list",
+ "load same configuration again"),
+ break("application a is added in the 'Included' column and "
+ "one warning is displayed",
"reset configuration"),
- break("we are back to default - no included and no excluded applications",
+ break("we are back to default - no included and no excluded applications, "
+ "and no warnings",
"undo"),
- break("a warning dialog is displayed, with only an ok button",
- "click ok"),
- break("a, kernel, stdlib and sasl are included and all other are excluded",
+ break("a, kernel, stdlib and sasl are included and all other are excluded. "
+ "One warning should now exist through the rest of this test case",
+ "double click the warning"),
+ break("a popup window occurs displaying the warning text",
+ "close it with the 'Close' button"),
+ break("it disappears",
+ "open it again"),
+ break("the warning text can be marked, copied and pasted",
+ "close the popup with the close box on the top frame"),
+ break("it disappears",
"select application a from 'Included' column and click red cross to "
"exclude it"),
break("application a is moved to 'Excluded' column",
"select application tools from 'Excluded' column and click green V to "
"include it"),
break("application tools is moved to 'Included' column",
- "select application runtime-tools from 'Excluded' column and click "
+ "select application runtime_tools from 'Excluded' column and click "
"green V to include it"),
- break("application runtime-tools is moved to 'Included' column",
+ break("application runtime_tools is moved to 'Included' column",
"undo"),
ExplicitConfig = filename:join(PrivDir,"explicit.config"),
- break("application runtime-tools is moved back to 'Excluded' column",
+ break("application runtime_tools is moved back to 'Excluded' column",
{"save configuration as 'explicit' to ~p",[ExplicitConfig]}),
ExpectedExplicitConfig =
{sys,[{lib_dirs,[filename:join(DataDir,"faulty_app_file")]},
@@ -113,7 +125,7 @@ config(Config) ->
"Now go to the 'Libraries' tab and change the root directory to "
"some invalid directory."),
break("an error dialog occurs saying that there is no lib dir",
- {"add library directory ~p, and click 'ok' in warning dialog",
+ {"add library directory ~p",
[filename:join(DataDir,"dependencies")]}),
break("applications x, y and z are added to the 'Excluded' column in "
"'Applications' tab",
@@ -121,7 +133,7 @@ config(Config) ->
"to 'derived'"),
break("a is excluded, kernel, stdlib, sasl and tools are included and "
"x, y and z are available in the 'Applications' tab",
- "undo, and click ok in the warning dialog"),
+ "undo"),
break("all non included application are moved to the 'Excluded' column "
"and that 'Application inclusion policy' under 'System settings' "
"tab is set back to 'exclude'",
@@ -218,7 +230,13 @@ break(Check,Do) ->
break(CheckStr,DoStr).
break(Str) ->
- test_server:break(Str).
+ Count =
+ case get(count) of
+ undefined -> 1;
+ C -> C
+ end,
+ put(count,Count+1),
+ test_server:break("Step " ++ integer_to_list(Count) ++ ":\n" ++ Str).
check_config(Expected,File) ->
{ok,[Config]} = file:consult(File),