From 8c9352bfad6864a0c00e72500d67492c072f4372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 26 Aug 2014 17:22:18 +0200
Subject: stdlib: Document maps:with/2

---
 lib/stdlib/doc/src/maps.xml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/lib/stdlib/doc/src/maps.xml b/lib/stdlib/doc/src/maps.xml
index b37f7fd7fd..64229fa8d3 100644
--- a/lib/stdlib/doc/src/maps.xml
+++ b/lib/stdlib/doc/src/maps.xml
@@ -318,6 +318,23 @@ false</code>
 			</desc>
 		</func>
 
+		<func>
+			<name name="with" arity="2"/>
+			<fsummary></fsummary>
+			<desc>
+				<p>
+					Returns a new map <c><anno>Map2</anno></c> with the keys <c>K1</c> through <c>Kn</c> and their associated values from map <c><anno>Map1</anno></c>.
+					Any key in <c><anno>Ks</anno></c> that does not exist in <c><anno>Map1</anno></c> are ignored.
+				</p>
+				<p>Example:</p>
+				<code type="none">
+> Map = #{42 => value_three,1337 => "value two","a" => 1},
+  Ks = ["a",42,"other key"],
+  maps:without(Ks,Map).
+#{42 => value_three,"a" => 1}</code>
+			</desc>
+		</func>
+
 		<func>
 			<name name="without" arity="2"/>
 			<fsummary></fsummary>
-- 
cgit v1.2.3


From 127f3e2594d96089aeb51c5652173acf5e3fe6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
Date: Tue, 26 Aug 2014 17:23:09 +0200
Subject: stdlib: Test maps:with/2

---
 lib/stdlib/test/maps_SUITE.erl | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/lib/stdlib/test/maps_SUITE.erl b/lib/stdlib/test/maps_SUITE.erl
index c826ee731a..dda20a615b 100644
--- a/lib/stdlib/test/maps_SUITE.erl
+++ b/lib/stdlib/test/maps_SUITE.erl
@@ -24,10 +24,7 @@
 
 -include_lib("test_server/include/test_server.hrl").
 
-% Default timetrap timeout (set in init_per_testcase).
-% This should be set relatively high (10-15 times the expected
-% max testcasetime).
--define(default_timeout, ?t:minutes(4)).
+-define(default_timeout, ?t:minutes(1)).
 
 % Test server specific exports
 -export([all/0]).
@@ -37,13 +34,13 @@
 -export([init_per_testcase/2]).
 -export([end_per_testcase/2]).
 
--export([get3/1]).
+-export([t_get_3/1,t_with_2/1,t_without_2/1]).
 
 suite() ->
     [{ct_hooks, [ts_install_cth]}].
 
 all() ->
-    [get3].
+    [t_get_3,t_with_2,t_without_2].
 
 init_per_suite(Config) ->
     Config.
@@ -52,7 +49,7 @@ end_per_suite(_Config) ->
     ok.
 
 init_per_testcase(_Case, Config) ->
-    ?line Dog=test_server:timetrap(?default_timeout),
+    Dog=test_server:timetrap(?default_timeout),
     [{watchdog, Dog}|Config].
 
 end_per_testcase(_Case, Config) ->
@@ -60,10 +57,24 @@ end_per_testcase(_Case, Config) ->
     test_server:timetrap_cancel(Dog),
     ok.
 
-get3(Config) when is_list(Config) ->
+t_get_3(Config) when is_list(Config) ->
     Map = #{ key1 => value1, key2 => value2 },
     DefaultValue = "Default value",
-    ?line value1 = maps:get(key1, Map, DefaultValue),
-    ?line value2 = maps:get(key2, Map, DefaultValue),
-    ?line DefaultValue = maps:get(key3, Map, DefaultValue),
+    value1 = maps:get(key1, Map, DefaultValue),
+    value2 = maps:get(key2, Map, DefaultValue),
+    DefaultValue = maps:get(key3, Map, DefaultValue),
+    ok.
+
+t_without_2(_Config) ->
+    Ki = [11,22,33,44,55,66,77,88,99],
+    M0 = maps:from_list([{{k,I},{v,I}}||I<-lists:seq(1,100)]),
+    M1 = maps:from_list([{{k,I},{v,I}}||I<-lists:seq(1,100) -- Ki]),
+    M1 = maps:without([{k,I}||I <- Ki],M0),
+    ok.
+
+t_with_2(_Config) ->
+    Ki = [11,22,33,44,55,66,77,88,99],
+    M0 = maps:from_list([{{k,I},{v,I}}||I<-lists:seq(1,100)]),
+    M1 = maps:from_list([{{k,I},{v,I}}||I<-Ki]),
+    M1 = maps:with([{k,I}||I <- Ki],M0),
     ok.
-- 
cgit v1.2.3