Fix tests; Provided mocks from test utils;

aeternity · Sep 29, 2020 · 80f52da · 80f52da
1 parent e6857d9
commit 80f52da
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/apps/aehyperchains/test/aehc_connector_tests.erl b/apps/aehyperchains/test/aehc_connector_tests.erl
@@ -13,30 +13,28 @@
 
 hyperchains_simulator_test_() ->
     {foreach,
-     fun() ->
-             InitialApps = {running_apps(), loaded_apps()},
-             meck:new(aehc_app, [passthrough]),
-             meck:expect(aehc_app, get_connector_id, 0, <<"aehc_chain_sim_connector">>),
+        fun() ->
+            meck:new(aehc_app, [passthrough]),
+            meck:expect(aehc_app, get_connector_id, 0, <<"aehc_chain_sim_connector">>),
 
-             meck:new(aecore_sup, [passthrough]),
-             meck:expect(aecore_sup, start_link, 0, {ok, pid}),
-             meck:new(aec_jobs_queues, [passthrough]),
-             meck:expect(aec_jobs_queues, start, 0, ok),
-             ok = lager:start(),
-             InitialApps
-     end,
-     fun({OldRunningApps, OldLoadedApps}) ->
-             ok = restore_stopped_and_unloaded_apps(OldRunningApps, OldLoadedApps)
-end,
-     [{"Sent payload == Requested payload",
-       fun() ->
-            %
-            aec_chain_sim:start(),
-            Payload = <<"test">>,
-            aehc_connector:send_tx(Payload),
-            %
-               io:format("~nTest is run ~p~n",[?MODULE]),
-            ?assertEqual(ok, aehc_connector:send_tx(Payload)),
-            ok
-       end}
-     ]}.
+            application:ensure_started(gproc),
+            ok = application:ensure_started(crypto),
+
+            aec_test_utils:mock_genesis_and_forks(),
+            Dir = aec_test_utils:aec_keys_setup(),
+            aehc_chain_sim_connector:start_link(),
+            Dir
+        end,
+        fun(TmpDir) ->
+            aec_test_utils:aec_keys_cleanup(TmpDir),
+            aec_test_utils:unmock_genesis_and_forks()
+        end,
+        [{"Sent payload == Requested payload",
+            fun() ->
+                %
+                Payload = <<"test">>,
+                %
+                ?assertEqual(ok, aehc_connector:send_tx(Payload)),
+                ok
+            end}
+        ]}.
diff --git a/apps/aehyperchains/test/connectors/aehc_chain_sim_connector.erl b/apps/aehyperchains/test/connectors/aehc_chain_sim_connector.erl
@@ -49,7 +49,7 @@ get_block_by_hash(Hash) ->
 init([]) ->
     process_flag(trap_exit, true),
     true = aec_events:subscribe(top_changed),
-    {ok, Pid} = aec_chain_sim:start(#{}),
+    {ok, Pid} = aec_chain_sim:start(#{ simulator => parent_chain }),
     lager:info("Parent chain's connector ~p is attached: ~p", [?MODULE, Pid]),
     {ok, #state{ pid = Pid }}.