From 0ff19e6586d7e7eaf847ba30506019009a064cd9 Mon Sep 17 00:00:00 2001
From: Joseph Wayne Norton <norton@alum.mit.edu>
Date: Sun, 27 Jan 2013 21:55:10 +0900
Subject: [PATCH 1/1] Remove parametrized module test
Erlang/OTP R16, coming soon, will do away with parameterized modules
(see Issue 4 under http://www.erlang.org/news/35 for details).
Conflicts:
test/meck_tests.erl
---
test/meck_test_parametrized_module.erl | 7 -------
test/meck_tests.erl | 26 --------------------------
2 files changed, 33 deletions(-)
delete mode 100644 test/meck_test_parametrized_module.erl
diff --git a/test/meck_test_parametrized_module.erl b/test/meck_test_parametrized_module.erl
deleted file mode 100644
index 1912679..0000000
--- a/test/meck_test_parametrized_module.erl
+++ /dev/null
@@ -1,7 +0,0 @@
--module(meck_test_parametrized_module, [Var1, Var2]).
--export([which/0, var1/0, var2/0]).
-
-which() -> original.
-
-var1() -> {original, Var1}.
-var2() -> {original, Var2}.
diff --git a/test/meck_tests.erl b/test/meck_tests.erl
index 9e01952..3cc22c9 100644
--- a/test/meck_tests.erl
+++ b/test/meck_tests.erl
@@ -851,32 +851,6 @@ cannot_expect_bif_or_autogenerated_test() ->
meck:expect(unicode, module_info, 0, doh)),
?assertEqual(ok, meck:unload(unicode)).
-meck_parametrized_module_test() ->
- ?assertEqual(ok, meck:new(meck_test_parametrized_module)),
- ?assertEqual(ok, meck:expect(meck_test_parametrized_module, new,
- fun(V1, V2) ->
- {meck_test_parametrized_module, V1, V2}
- end)),
- ?assertEqual(ok, meck:expect(meck_test_parametrized_module, which, 1, mecked)),
- Object = meck_test_parametrized_module:new(var1, var2),
- ?assertEqual(mecked, Object:which()),
- ?assertEqual(ok, meck:unload(meck_test_parametrized_module)).
-
-meck_parametrized_module_passthrough_test() ->
- ?assertEqual(ok, meck:new(meck_test_parametrized_module, [passthrough])),
- ?assertEqual(ok, meck:expect(meck_test_parametrized_module, new,
- fun(V1, V2) ->
- {meck_test_parametrized_module, V1, V2}
- end)),
- ?assertEqual(ok, meck:expect(meck_test_parametrized_module, var2,
- fun({_, _Var1, Var2} = _This) ->
- {mecked, Var2}
- end)),
- Object = meck_test_parametrized_module:new(var1, var2),
- ?assertEqual({original, var1}, Object:var1()),
- ?assertEqual({mecked, var2}, Object:var2()),
- ?assertEqual(ok, meck:unload(meck_test_parametrized_module)).
-
%%==============================================================================
%% Internal Functions
%%==============================================================================
--
1.8.1.4