test: compile support tests

Files messages.exs and random_init.exs become messages.ex and random_init.ex (note the missing trailing 's')
ahamez · Oct 4, 2024 · 9e79bde · 9e79bde
1 parent 242d97c
commit 9e79bde
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 31 deletions.
diff --git a/mix.exs b/mix.exs
@@ -24,7 +24,7 @@ defmodule Protox.Mixfile do
 
   # Do not compile conformance and benchmarks related files when in production
   defp elixirc_paths(:prod), do: ["lib"]
-  defp elixirc_paths(_), do: ["lib", "conformance", "benchmarks"]
+  defp elixirc_paths(_), do: ["lib", "conformance", "benchmarks", "test/support"]
 
   def application do
     [

diff --git a/test/protox/decode_test.exs b/test/protox/decode_test.exs
@@ -1,8 +1,3 @@
-# A dedicated module to make sure all messages are compiled before Protox.DecodeTest.
-defmodule Protox.DecodeTestMessages do
-  Code.require_file("./test/support/messages.exs")
-end
-
 defmodule Protox.DecodeTest do
   use ExUnit.Case
 

diff --git a/test/protox/encode_test.exs b/test/protox/encode_test.exs
@@ -1,8 +1,6 @@
 defmodule Protox.EncodeTest do
   use ExUnit.Case
 
-  Code.require_file("./test/support/messages.exs")
-
   test "Empty" do
     assert %Sub{} |> Protox.encode!() |> :binary.list_to_bin() == <<>>
   end

diff --git a/test/protox/generate_test.exs b/test/protox/generate_test.exs
@@ -1,8 +1,6 @@
 defmodule Protox.GenerateTest do
   use ExUnit.Case
 
-  Code.require_file("./test/support/messages.exs")
-
   test "Generate code in a single file" do
     file = Path.join(__DIR__, "../samples/prefix/bar/bar.proto")
     generated_file_name = "generated_code.ex"

diff --git a/test/protox/json_decode_test.exs b/test/protox/json_decode_test.exs
@@ -1,8 +1,3 @@
-# A dedicated module to make sure all messages are compiled before Protox.JsonDecodeTest.
-defmodule Protox.JsonDecodeTestMessages do
-  Code.require_file("./test/support/messages.exs")
-end
-
 defmodule Protox.JsonDecodeTest do
   use ExUnit.Case
   use Protox.Float

diff --git a/test/protox/json_encode_test.exs b/test/protox/json_encode_test.exs
@@ -1,7 +1,3 @@
-defmodule Protox.JsonEncodeTestMessages do
-  Code.require_file("./test/support/messages.exs")
-end
-
 defmodule Protox.JsonEncodeTest do
   use ExUnit.Case, async: false
   use Protox.Float

diff --git a/test/protox/merge_message_test.exs b/test/protox/merge_message_test.exs
@@ -1,8 +1,6 @@
 defmodule Protox.MergeMessageTest do
   use ExUnit.Case
 
-  Code.require_file("./test/support/messages.exs")
-
   doctest Protox.MergeMessage
 
   test "Protobuf 2, replace only set scalar fields" do

diff --git a/test/protox_properties_test.exs b/test/protox_properties_test.exs
@@ -2,9 +2,6 @@ defmodule Protox.PropertiesTest do
   use ExUnit.Case
   use PropCheck
 
-  Code.require_file("test/support/messages.exs")
-  Code.require_file("test/support/random_init.exs")
-
   @moduletag :slow
   @moduletag timeout: 60_000 * 5
 

diff --git a/test/protox_test.exs b/test/protox_test.exs
@@ -1,9 +1,6 @@
 defmodule ProtoxTest do
   use ExUnit.Case
 
-  Code.require_file("test/support/messages.exs")
-  Code.require_file("test/support/random_init.exs")
-
   use Protox,
     schema: """
       syntax = "proto3";
@@ -342,7 +339,7 @@ defmodule ProtoxTest do
                label: :optional,
                name: :oneof_1_foreign_enum,
                tag: 6,
-               type: {:enum, Abc.Def.ForeignEnum}
+               type: {:enum, Abc.Def.MyForeignEnum}
              },
              %Protox.Field{
                json_name: "oneof1Proto2a",
@@ -575,7 +572,7 @@ defmodule ProtoxTest do
                label: :optional,
                name: :oneof_1_foreign_enum,
                tag: 6,
-               type: {:enum, Namespace.Abc.Def.ForeignEnum}
+               type: {:enum, Namespace.Abc.Def.MyForeignEnum}
              },
              %Protox.Field{
                json_name: "oneof1Proto2a",

diff --git a/test/samples/proto3.proto b/test/samples/proto3.proto
@@ -4,7 +4,7 @@ import "proto2.proto";
 
 package abc.def;
 
-enum ForeignEnum {
+enum MyForeignEnum {
   option allow_alias = true;
   FOREIGN_ZERO    = 0;
   FOREIGN_ONE     = 1;
@@ -25,7 +25,7 @@ message Proto3 {
   oneof oneof_1 {
     int32 oneof_1_int32 = 4;
     double oneof_1_double = 5;
-    ForeignEnum oneof_1_foreign_enum = 6;
+    MyForeignEnum oneof_1_foreign_enum = 6;
     Proto2A oneof_1_proto2a = 7;
   }
 

diff --git a/test/support/messages.exs → test/support/messages.ex b/test/support/messages.exs → test/support/messages.ex
diff --git a/test/support/random_init.exs → test/support/random_init.ex b/test/support/random_init.exs → test/support/random_init.ex