Reorganize test files

Author: jonatanklosko

test/.gitignore

@@ -17,7 +17,7 @@ erl_crash.dump
 *.ez
 
 # Ignore package tarball (built via "mix hex.build").
-fine_test-*.tar
+finest-*.tar
 
 # Temporary files, for example, from tests.
 /tmp/

test/Makefile

@@ -1,10 +1,10 @@
-PRIV_DIR = $(MIX_APP_PATH)/priv
-NIF_PATH = $(PRIV_DIR)/libfine_test.so
+PRIV_DIR := $(MIX_APP_PATH)/priv
+NIF_PATH := $(PRIV_DIR)/libfinest.so
+C_SRC := $(shell pwd)/c_src
 
-C_SRC = $(shell pwd)/c_src/fine_test
-CPPFLAGS = -shared -fPIC -std=c++17 -Wall -Wextra
+CPPFLAGS := -shared -fPIC -std=c++17 -Wall -Wextra
 CPPFLAGS += -I$(ERTS_INCLUDE_DIR) -I$(FINE_INCLUDE_DIR)
-# We want to eliminate all warnings, so the end user doesn't see any
+# We want to eliminate all warnings, so the end user doesn't see any.
 CPPFLAGS += -Werror
 
 ifdef DEBUG
@@ -13,21 +13,19 @@ else
 	CPPFLAGS += -O3
 endif
 
-UNAME_S := $(shell uname -s)
 ifndef TARGET_ABI
-ifeq ($(UNAME_S),Darwin)
-	TARGET_ABI = darwin
-endif
+  TARGET_ABI := $(shell uname -s | tr '[:upper:]' '[:lower:]')
 endif
 
 ifeq ($(TARGET_ABI),darwin)
 	CPPFLAGS += -undefined dynamic_lookup -flat_namespace
 endif
 
-SOURCES = $(wildcard $(C_SRC)/*.cpp)
-FINE_HEADERS = $(wildcard $(FINE_INCLUDE_DIR)/*.hpp)
+SOURCES := $(wildcard $(C_SRC)/*.cpp)
+# We add dependency on Fine header file, since it can change as we test.
+FINE_HEADERS := $(wildcard $(FINE_INCLUDE_DIR)/*.hpp)
 
-build: $(NIF_PATH)
+all: $(NIF_PATH)
 	@ echo > /dev/null # Dummy command to avoid the default output "Nothing to be done"
 
 $(NIF_PATH): $(SOURCES) $(FINE_HEADERS)

test/Makefile.win

@@ -1,16 +1,17 @@
 PRIV_DIR=$(MIX_APP_PATH)\priv
-NIF_PATH=$(PRIV_DIR)\libfine_test.dll
+NIF_PATH=$(PRIV_DIR)\libfinest.dll
+C_SRC=$(MAKEDIR)\c_src
 
-C_SRC=$(MAKEDIR)\c_src\fine_test
 CPPFLAGS=/LD /std:c++17 /W4 /O2 /EHsc
 CPPFLAGS=$(CPPFLAGS) /I"$(ERTS_INCLUDE_DIR)" /I"$(FINE_INCLUDE_DIR)"
-# We want to eliminate all warnings, so the end user doesn't see any
+# We want to eliminate all warnings, so the end user doesn't see any.
 CPPFLAGS=$(CPPFLAGS) /WX
 
 SOURCES=$(C_SRC)\*.cpp
+# We add dependency on Fine header file, since it can change as we test.
 FINE_HEADERS=$(FINE_INCLUDE_DIR)\*.hpp
 
-build: $(NIF_PATH)
+all: $(NIF_PATH)
 
 $(NIF_PATH): $(SOURCES) $(FINE_HEADERS)
 	@ if not exist "$(PRIV_DIR)" mkdir "$(PRIV_DIR)"

test/c_src/fine_test/fine_test.cpp renamed to test/c_src/finest.cpp

@@ -6,11 +6,11 @@
 #include <stdexcept>
 #include <thread>
 
-namespace fine_test {
+namespace finest {
 
 namespace atoms {
-auto ElixirFineTestError = fine::Atom("Elixir.FineTest.Error");
-auto ElixirFineTestPoint = fine::Atom("Elixir.FineTest.Point");
+auto ElixirFinestError = fine::Atom("Elixir.Finest.Error");
+auto ElixirFinestPoint = fine::Atom("Elixir.Finest.Point");
 auto data = fine::Atom("data");
 auto destructor_with_env = fine::Atom("destructor_with_env");
 auto destructor_default = fine::Atom("destructor_default");
@@ -53,7 +53,7 @@ struct ExPoint {
   int64_t x;
   int64_t y;
 
-  static constexpr auto module = &atoms::ElixirFineTestPoint;
+  static constexpr auto module = &atoms::ElixirFinestPoint;
 
   static constexpr auto fields() {
     return std::make_tuple(std::make_tuple(&ExPoint::x, &atoms::x),
@@ -64,7 +64,7 @@ struct ExPoint {
 struct ExError {
   int64_t data;
 
-  static constexpr auto module = &atoms::ElixirFineTestError;
+  static constexpr auto module = &atoms::ElixirFinestError;
 
   static constexpr auto fields() {
     return std::make_tuple(std::make_tuple(&ExError::data, &atoms::data));
@@ -214,6 +214,6 @@ int64_t raise_erlang_error(ErlNifEnv *env) {
 }
 FINE_NIF(raise_erlang_error, 0);
 
-} // namespace fine_test
+} // namespace finest
 
-FINE_INIT("Elixir.FineTest.NIF");
+FINE_INIT("Elixir.Finest.NIF");

test/lib/fine_test/point.ex

@@ -1,4 +1,4 @@
-defmodule FineTest.Error do
+defmodule Finest.Error do
   defexception [:data]
 
   @impl true

test/lib/fine_test/error.ex renamed to test/lib/finest/error.ex

@@ -1,10 +1,10 @@
-defmodule FineTest.NIF do
+defmodule Finest.NIF do
   @moduledoc false
 
   @on_load :__on_load__
 
   def __on_load__ do
-    path = :filename.join(:code.priv_dir(:fine_test), ~c"libfine_test")
+    path = :filename.join(:code.priv_dir(:finest), ~c"libfinest")
 
     case :erlang.load_nif(path, 0) do
       :ok -> :ok

test/lib/fine_test/nif.ex renamed to test/lib/finest/nif.ex

@@ -0,0 +1,3 @@
+defmodule Finest.Point do
+  defstruct [:x, :y]
+end

test/lib/finest/point.ex

@@ -1,9 +1,9 @@
-defmodule FineTest.MixProject do
+defmodule Finest.MixProject do
   use Mix.Project
 
   def project do
     [
-      app: :fine_test,
+      app: :finest,
       version: "0.1.0",
       elixir: "~> 1.15",
       start_permanent: Mix.env() == :prod,

test/mix.exs

@@ -1,7 +1,7 @@
-defmodule FineTestTest do
+defmodule FinestTest do
   use ExUnit.Case, async: true
 
-  alias FineTest.NIF
+  alias Finest.NIF
 
   test "add" do
     assert NIF.add(1, 2) == 3
@@ -172,7 +172,7 @@ defmodule FineTestTest do
     end
 
     test "struct" do
-      struct = %FineTest.Point{x: 1, y: 2}
+      struct = %Finest.Point{x: 1, y: 2}
       assert NIF.codec_struct(struct) == struct
 
       assert_raise ArgumentError, "decode failed, expected a struct", fn ->
@@ -183,13 +183,13 @@ defmodule FineTestTest do
         NIF.codec_struct(%{})
       end
 
-      assert_raise ArgumentError, "decode failed, expected a Elixir.FineTest.Point struct", fn ->
+      assert_raise ArgumentError, "decode failed, expected a Elixir.Finest.Point struct", fn ->
         NIF.codec_struct(~D"2000-01-01")
       end
     end
 
     test "exception struct" do
-      struct = %FineTest.Error{data: 1}
+      struct = %Finest.Error{data: 1}
       assert NIF.codec_struct_exception(struct) == struct
       assert is_exception(NIF.codec_struct_exception(struct))
 
@@ -240,7 +240,7 @@ defmodule FineTestTest do
     end
 
     test "raising an elixir exception" do
-      assert_raise FineTest.Error, "got error with data 10", fn ->
+      assert_raise Finest.Error, "got error with data 10", fn ->
         NIF.raise_elixir_exception()
       end
     end