Merge pull request #2054 from tolbrino/fix-parallel-edoc-test

Fix duplicate module naming in edoc test suite data

12 files changed, 22 insertions, 21 deletions

diff --git a/test/rebar_edoc_SUITE_data/bad/apps/bar1/src/bar1.app.src b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar1/src/bad_bar1.app.src
index 6e7ec24..323eccc 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/bar1/src/bar1.app.src
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar1/src/bad_bar1.app.src
@@ -1,8 +1,8 @@
-{application, bar1,
+{application, bad_bar1,
  [{description, "An OTP application"},
   {vsn, "0.1.0"},
   {registered, []},
-  {mod, { bar1_app, []}},
+  {mod, { bad_bar1_app, []}},
   {applications,
    [kernel,
     stdlib
diff --git a/test/rebar_edoc_SUITE_data/bad/apps/bar1/src/bar1.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar1/src/bad_bar1.erl
index 2700aef..04bcca2 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/bar1/src/bar1.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar1/src/bad_bar1.erl
@@ -1,4 +1,4 @@
--module(bar1).

+-module(bad_bar1).

 -export([bar1/0]).

 -export_type([barer1/0]).

 

@@ -6,4 +6,4 @@
 

 % @doc Bar1 bars the bar.

 -spec bar1() -> barer1().

-bar1() -> "Barer1".
\ No newline at end of file
+bar1() -> "Barer1".

diff --git a/test/rebar_edoc_SUITE_data/bad/apps/bar1/src/bar1_app.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar1/src/bad_bar1_app.erl
index 414ac30..9a709ca 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/bar1/src/bar1_app.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar1/src/bad_bar1_app.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(bar1_app).
+-module(bad_bar1_app).
 
 -behaviour(application).
 
@@ -15,7 +15,7 @@
 %%====================================================================
 
 start(_StartType, _StartArgs) ->
-    bar1_sup:start_link().
+    bad_bar1_sup:start_link().
 
 %%--------------------------------------------------------------------
 stop(_State) ->
diff --git a/test/rebar_edoc_SUITE_data/bad/apps/bar1/src/bar1_sup.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar1/src/bad_bar1_sup.erl
index f9d6670..8735f9c 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/bar1/src/bar1_sup.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar1/src/bad_bar1_sup.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(bar1_sup).
+-module(bad_bar1_sup).
 
 -behaviour(supervisor).
 
diff --git a/test/rebar_edoc_SUITE_data/bad/apps/bar2/src/bar2.app.src b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar2/src/bad_bar2.app.src
index 58de8bc..bb147ce 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/bar2/src/bar2.app.src
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar2/src/bad_bar2.app.src
@@ -1,8 +1,8 @@
-{application, bar2,
+{application, bad_bar2,
  [{description, "An OTP application"},
   {vsn, "0.1.0"},
   {registered, []},
-  {mod, { bar2_app, []}},
+  {mod, { bad_bar2_app, []}},
   {applications,
    [kernel,
     stdlib
diff --git a/test/rebar_edoc_SUITE_data/bad/apps/bar2/src/bar2.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar2/src/bad_bar2.erl
index 2afb745..be60adc 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/bar2/src/bar2.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar2/src/bad_bar2.erl
@@ -1,7 +1,7 @@
 %% @doc one docline is fine

 %% @doc a second docline causes a failure

 %% @doc if not, then a & causes a bad ref error.

--module(bar2).

+-module(bad_bar2).

 -export([bar2/0]).

 -export_type([barer2/0]).

 

diff --git a/test/rebar_edoc_SUITE_data/bad/apps/bar2/src/bar2_app.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar2/src/bad_bar2_app.erl
index d0058a0..85cd4f5 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/bar2/src/bar2_app.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar2/src/bad_bar2_app.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(bar2_app).
+-module(bad_bar2_app).
 
 -behaviour(application).
 
@@ -15,7 +15,7 @@
 %%====================================================================
 
 start(_StartType, _StartArgs) ->
-    bar2_sup:start_link().
+    bad_bar2_sup:start_link().
 
 %%--------------------------------------------------------------------
 stop(_State) ->
diff --git a/test/rebar_edoc_SUITE_data/bad/apps/bar2/src/bar2_sup.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar2/src/bad_bar2_sup.erl
index 0bdaf4a..7dbe0cb 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/bar2/src/bar2_sup.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_bar2/src/bad_bar2_sup.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(bar2_sup).
+-module(bad_bar2_sup).
 
 -behaviour(supervisor).
 
diff --git a/test/rebar_edoc_SUITE_data/bad/apps/foo/src/foo.app.src b/test/rebar_edoc_SUITE_data/bad/apps/bad_foo/src/bad_foo.app.src
index 9987fd5..77cc873 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/foo/src/foo.app.src
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_foo/src/bad_foo.app.src
@@ -1,12 +1,13 @@
-{application, foo,
+{application, bad_foo,
  [{description, "An OTP application"},
   {vsn, "0.1.0"},
   {registered, []},
-  {mod, { foo_app, []}},
+  {mod, { bad_foo_app, []}},
   {applications,
    [kernel,
     stdlib,
-    bar1, bar2
+    bad_bar1,
+    bad_bar2
    ]},
   {env,[]},
   {modules, []},
diff --git a/test/rebar_edoc_SUITE_data/bad/apps/foo/src/foo.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_foo/src/bad_foo.erl
index 52e3d0a..72632fb 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/foo/src/foo.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_foo/src/bad_foo.erl
@@ -1,4 +1,4 @@
--module(foo).

+-module(bad_foo).

 

 -export([foo/0, bar1/0, bar2/0]).

 

@@ -16,4 +16,4 @@ bar1() -> bar1:bar1().
 

 % @doc Bar2 functions returns barer2.

 -spec bar2() -> bar2:barer2().

-bar2() -> bar2:bar2().
\ No newline at end of file
+bar2() -> bar2:bar2().

diff --git a/test/rebar_edoc_SUITE_data/bad/apps/foo/src/foo_app.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_foo/src/bad_foo_app.erl
index d0158d7..21629f4 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/foo/src/foo_app.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_foo/src/bad_foo_app.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(foo_app).
+-module(bad_foo_app).
 
 -behaviour(application).
 
@@ -15,7 +15,7 @@
 %%====================================================================
 
 start(_StartType, _StartArgs) ->
-    foo_sup:start_link().
+    bad_foo_sup:start_link().
 
 %%--------------------------------------------------------------------
 stop(_State) ->
diff --git a/test/rebar_edoc_SUITE_data/bad/apps/foo/src/foo_sup.erl b/test/rebar_edoc_SUITE_data/bad/apps/bad_foo/src/bad_foo_sup.erl
index 67e88b4..af499c0 100644
--- a/test/rebar_edoc_SUITE_data/bad/apps/foo/src/foo_sup.erl
+++ b/test/rebar_edoc_SUITE_data/bad/apps/bad_foo/src/bad_foo_sup.erl
@@ -3,7 +3,7 @@
 %% @end
 %%%-------------------------------------------------------------------
 
--module(foo_sup).
+-module(bad_foo_sup).
 
 -behaviour(supervisor).