1 files changed, 15 insertions, 25 deletions
diff --git a/lib/diameter/test/diameter_reg_SUITE.erl b/lib/diameter/test/diameter_reg_SUITE.erl
index 4939019f7a..e2a1ca00c3 100644
--- a/lib/diameter/test/diameter_reg_SUITE.erl
+++ b/lib/diameter/test/diameter_reg_SUITE.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2012. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2016. 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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
 %%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %%
 %% %CopyrightEnd%
 %%
@@ -32,8 +33,7 @@
 %% testcases
 -export([add/1,
          add_new/1,
-         del/1,
-         repl/1,
+         remove/1,
          terms/1,
          pids/1]).
 
@@ -55,8 +55,7 @@ groups() ->
 tc() ->
     [add,
      add_new,
-     del,
-     repl,
+     remove,
      terms,
      pids].
 
@@ -81,20 +80,11 @@ add_new(_) ->
     true = ?reg:add_new(Ref),
     false = ?reg:add_new(Ref).
 
-del(_) ->
+remove(_) ->
     Ref = make_ref(),
     true = ?reg:add_new(Ref),
     true = ?reg:add_new({Ref}),
-    true = ?reg:del({Ref}),
-    [{Ref, Pid}] = ?reg:match(Ref),
-    Pid = self().
-
-repl(_) ->
-    Ref = make_ref(),
-    true = ?reg:add_new({Ref}),
-    true = ?reg:repl({Ref}, Ref),
-    false = ?reg:add_new(Ref),
-    false = ?reg:repl({Ref}, Ref),
+    true = ?reg:remove({Ref}),
     [{Ref, Pid}] = ?reg:match(Ref),
     Pid = self().