From 01af7515f1d70d0c885c41435ed9a15ad985dc2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Boris=20M=C3=BChmer?= Date: Sun, 10 Nov 2013 20:16:45 +0100 Subject: fix documentation --- lib/wx/doc/overview.edoc | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'lib') diff --git a/lib/wx/doc/overview.edoc b/lib/wx/doc/overview.edoc index 8bff6c34e1..054016f515 100644 --- a/lib/wx/doc/overview.edoc +++ b/lib/wx/doc/overview.edoc @@ -12,11 +12,11 @@ of wxWidgets. This document describes the erlang mapping to wxWidgets and it's implementation. It is not a complete users guide to wxWidgets. If you need that, you will have to read the wxWidgets documentation instead. wx tries to keep a one-to-one mapping with -the original api so that the original documentation and examples shall be +the original API so that the original documentation and examples shall be as easy as possible to use. wxErlang examples and test suite can be found in the erlang src release. -They can also provide some help on how to use the api. +They can also provide some help on how to use the API. This is currently a very brief introduction to wx. The application is still under development, which means the interface may change, @@ -33,17 +33,17 @@ and the test suite currently have a poor coverage ratio. == Introduction == -The original wxWidgets is an object-oriented (C++) api and +The original wxWidgets is an object-oriented (C++) API and that is reflected in the erlang mapping. In most cases each class in wxWidgets is represented as a module in erlang. This gives the wx application a huge interface, spread over several modules, and it all starts with the wx module. The wx module contains functions to create and -destroy the gui, i.e. wx:new/0,wx:destroy/0, and +destroy the GUI, i.e. wx:new/0, wx:destroy/0, and some other useful functions. Objects or object references in wx should be seen as erlang -processes rather then erlang terms. When you operate on them they can +processes rather than erlang terms. When you operate on them they can change state, e.g. they are not functional objects as erlang terms are. Each object has a type or rather a class, which is manipulated with the corresponding module or by sub-classes of that object. Type @@ -62,7 +62,7 @@ For example the wxWindow C++ class is implemented in the member wxWindow::CenterOnParent is thus wxWindow:centerOnParent. The following C++ code: 
-  wxWindow MyWin = new wxWindo();
+  wxWindow MyWin = new wxWindow();
   MyWin.CenterOnParent(wxVERTICAL);
   ...
   delete MyWin;
@@ -91,7 +91,7 @@ they are directly mapped to corresponding erlang terms:
   
wxGridCellCoords is represented by {Row,Column}

 
 
-In the places where the erlang api differs from the original one it should
+In the places where the erlang API differs from the original one it should
 be obvious from the erlang documentation which representation has
 been used. E.g. the C++ arrays and/or lists are sometimes represented
 as erlang lists and sometimes as tuples.
@@ -112,7 +112,7 @@ Additionally some global functions, i.e. non-class functions, exist in
 the wx_misc module.
 
 wxErlang is implemented as a (threaded) driver and a rather direct
-interface to the C++ api, with the drawback that if the erlang
+interface to the C++ API, with the drawback that if the erlang
 programmer does an error, it might crash the emulator.
 
 Since the driver is threaded it requires a smp enabled emulator,
@@ -121,7 +121,7 @@ that provides a thread safe interface to the driver.
 == Multiple processes and memory handling == 
 
 The intention is that each erlang application calls wx:new() once to
-setup it's gui which creates an environment and a memory mapping.  To
+setup it's GUI which creates an environment and a memory mapping.  To
 be able to use wx from several processes in your application,
 you must share the environment. You can get the active environment with
 wx:get_env/0 and set it in the new processes
@@ -153,26 +153,26 @@ increasing memory usage. This is especially important when
 wxWidgets assumes or recommends that you (or rather the C++
 programmer) have allocated the object on the stack since that will
 never be done in the erlang binding. For example wxDC class
-or its sub-classes or  wxSizerFlags. 
+or its sub-classes or wxSizerFlags. 
 
 Currently the dialogs show modal function freezes wxWidgets
 until the dialog is closed. That is intended but in erlang where you
-can have several gui applications running at the same time it causes
+can have several GUI applications running at the same time it causes
 trouble. This will hopefully be fixed in future wxWidgets
 releases.
 
 == Event Handling ==
 
-Event handling in wx differs most the from the original api.
+Event handling in wx differs most from the original API.
 You must specify every event you want to handle in wxWidgets,
-that is the same in the erlang binding but can you choose to receive
-the events as messages or handle them with callback funs.
+that is the same in the erlang binding but you can choose to receive
+the events as messages or handle them with callback  funs.
 
 Otherwise the event subscription is handled as wxWidgets
 dynamic event-handler connection. You subscribe to events of a certain
-type from objects with an ID or within a range of ID:s. The
-callback fun is optional, if not supplied the event will be sent to the
-process that called connect/2. Thus, a handler is a callback fun
+type from objects with an ID or within a range of IDs. The
+callback fun is optional, if not supplied the event will be sent to the
+process that called connect/2. Thus, a handler is a callback fun
 or a process which will receive an event message.
 
 Events are handled in order from bottom to top, in the widgets
@@ -195,7 +195,7 @@ subscribed to
 wxKey event record where Event#wxKey.type =
 key_up.
 
-In wxWidgets the developer have to call 
+In wxWidgets the developer has to call 
 wxEvent:skip() if he wants the event to be processed by
 other handlers. You can do the same in wx if you use
 callbacks. If you want the event as messages you just don't supply a
@@ -217,11 +217,11 @@ following handlers. The actual event objects are deleted after
 the fun returns.
 
 The callbacks are always invoked by another process and have
-exclusive usage of the gui when invoked. This means that a callback fun
+exclusive usage of the GUI when invoked. This means that a callback fun
 can not use the process dictionary and should not make calls to other
-processes.  Calls to another process inside a callback fun may cause a
+processes.  Calls to another process inside a callback fun may cause a
 deadlock if the other process is waiting on completion of his call to
-the gui.
+the GUI.
 
 == Acknowledgments ==
 
-- 
cgit v1.2.3


From 5987cd070b80a0e14905359149af6baeacd3d310 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Mon, 18 Nov 2013 11:45:13 +0100
Subject: [common_test] Don't hang netconf client when close-session times out

When the netconf server did not respond to the close-session request,
the call to ct_netconfc:close_session/2 would hang forever waiting for
the netconf client to terminate. This has been corrected. The client
will now always terminate (and take down the connection) if the
close-session request times out.
---
 lib/common_test/src/ct_netconfc.erl                  |  8 ++++++--
 .../test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl  | 20 ++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/common_test/src/ct_netconfc.erl b/lib/common_test/src/ct_netconfc.erl
index 7f10e1db09..64fe8b4bb0 100644
--- a/lib/common_test/src/ct_netconfc.erl
+++ b/lib/common_test/src/ct_netconfc.erl
@@ -1129,10 +1129,14 @@ handle_msg({Ref,timeout},
     ct_gen_conn:return(Caller,{error,{hello_session_failed,timeout}}),
     {stop,State#state{hello_status={error,timeout}}};
 handle_msg({Ref,timeout},#state{pending=Pending} = State) ->
-    {value,#pending{caller=Caller},Pending1} =
+    {value,#pending{op=Op,caller=Caller},Pending1} =
 	lists:keytake(Ref,#pending.ref,Pending),
     ct_gen_conn:return(Caller,{error,timeout}),
-    {noreply,State#state{pending=Pending1}}.
+    R = case Op of
+	    close_session -> stop;
+	    _ -> noreply
+	end,
+    {R,State#state{pending=Pending1}}.
 
 %% @private
 %% Called by ct_util_server to close registered connections before terminate.
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index 6ee7fdd6f6..179a900ea5 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -84,7 +84,9 @@ all() ->
 	     no_host,
 	     no_port,
 	     invalid_opt,
+	     timeout_close_session,
 	     get,
+	     timeout_get,
 	     get_xpath,
 	     get_config,
 	     get_config_xpath,
@@ -344,6 +346,15 @@ invalid_opt(Config) ->
     {error,{invalid_option,{some_other_opt,true}}} = ct_netconfc:open(Opts2),
     ok.
 
+timeout_close_session(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect('close-session'),
+    true = erlang:is_process_alive(Client),
+    {error,timeout} = ct_netconfc:close_session(Client,1000),
+    false = erlang:is_process_alive(Client),
+    ok.
+
 get(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
@@ -354,6 +365,15 @@ get(Config) ->
     ?ok = ct_netconfc:close_session(Client),
     ok.
 
+timeout_get(Config) ->
+    DataDir = ?config(data_dir,Config),
+    {ok,Client} = open_success(DataDir),
+    ?NS:expect('get'),
+    {error,timeout} = ct_netconfc:get(Client,{server,[{xmlns,"myns"}],[]},1000),
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client),
+    ok.
+
 get_xpath(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
-- 
cgit v1.2.3


From 6c8967fbbb0ec23eed27d34e75dea285145a1240 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Fri, 22 Nov 2013 15:10:57 +0100
Subject: [common_test] Minor corrections in test of ct_netconfc

---
 lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl | 5 ++---
 lib/common_test/test/ct_netconfc_SUITE_data/ns.erl              | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index 6ee7fdd6f6..7acc05d5b2 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -143,11 +143,10 @@ init_per_suite(Config) ->
     end.
 
 end_per_suite(Config) ->
-    PrivDir = ?config(priv_dir, Config),
     ?NS:stop(?config(server,Config)),
     ssh:stop(),
     crypto:stop(),
-    remove_id_keys(PrivDir),
+    remove_id_keys(Config),
     Config.
 
 hello(Config) ->
@@ -698,7 +697,7 @@ timeout_receive_chunked_data(Config) ->
     ?ok = ct_netconfc:close_session(Client),
     ok.
 
-%% Same as receive_chunked_data, but timeout waiting for last part.
+%% Same as receive_chunked_data, but close while waiting for last part.
 close_while_waiting_for_chunked_data(Config) ->
     DataDir = ?config(data_dir,Config),
     {ok,Client} = open_success(DataDir),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index 09217f60a3..fb0734d48e 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -98,8 +98,9 @@ start(Dir) ->
 
 %% Stop the netconf server
 stop(Pid) ->
-    Pid ! {stop,self()},
-    receive stopped -> ok end.
+    Ref = erlang:monitor(process,Pid),
+    Pid ! stop,
+    receive {'DOWN',Ref,process,Pid,_} -> ok end.
 
 %% Set the session id for the hello message.
 %% If this is not called prior to starting the session, no hello
@@ -177,9 +178,9 @@ init_server(Dir) ->
 
 loop(Daemon) ->
     receive
-	{stop,From} ->
+	stop ->
 	    ssh:stop_daemon(Daemon),
-	    From ! stopped;
+	    ok;
 	{table_trans,Fun,Args,From} ->
 	    %% Simple transaction mechanism for ets table
 	    R = apply(Fun,Args),
-- 
cgit v1.2.3


From 70039d8c87a0af63e865cdfd91c809c274b590d1 Mon Sep 17 00:00:00 2001
From: Siri Hansen 
Date: Tue, 26 Nov 2013 15:39:42 +0100
Subject: [observer] Fix copy/paste error in observer_SUITE:app_file/1

---
 lib/observer/test/observer_SUITE.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/observer/test/observer_SUITE.erl b/lib/observer/test/observer_SUITE.erl
index 8dea0d8ea8..b6665cb70b 100644
--- a/lib/observer/test/observer_SUITE.erl
+++ b/lib/observer/test/observer_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2006-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2013. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -66,5 +66,5 @@ app_file(suite) ->
 app_file(doc) ->
     ["Testing .app file"];
 app_file(Config) when is_list(Config) ->
-    ?line ok = ?t:app_test(os_mon),
+    ?line ok = ?t:app_test(observer),
     ok.
-- 
cgit v1.2.3