Rename progress-tests to progress-runner

- to use more consistent namings
- also clean up and simplify Makefile

Author: mengdaming

.goreleaser.yml

@@ -60,9 +60,9 @@ builds:
     goarch:
       - amd64
       - arm64
-  - id: "progress-tests"
+  - id: "progress-runner"
     dir: ./progress
-    binary: progress-tests
+    binary: progress-runner
     command: test
     no_main_check: true
     env:

Makefile

@@ -4,9 +4,6 @@ else
 	EXT := ""
 endif
 
-# Run with java by default when environment variable is not set
-LANG_IMPL_PATH ?= java
-
 CONFIG_PKG="github.com/murex/gamekit-coffeemachine/settings"
 export CGO_ENABLED=0
 
@@ -48,13 +45,9 @@ $(cli_bin):
         -X ${CONFIG_PKG}.BuildAuthor="`id -un`" \
         "
 
-.PHONY: run-cli
-run-cli: $(cli_bin)
-	@$< $(LANG_IMPL_PATH)
-
-progress_tests_bin := bin/progress-tests$(EXT)
-build: $(progress_tests_bin)
-$(progress_tests_bin):
+progress_runner_bin := bin/progress-runner$(EXT)
+build: $(progress_runner_bin)
+$(progress_runner_bin):
 	@mkdir -p bin
 	@go test -c -o $@ ./progress -ldflags "-s -w \
  	  -X ${CONFIG_PKG}.BuildVersion="`git describe --tags`" \
@@ -78,25 +71,9 @@ $(test2json_bin):
 	@mkdir -p bin
 	@go build -o $@ -ldflags="-s -w" cmd/test2json
 
-define RUN_PROGRESS_TESTS
-mkdir -p _test_results
-export LANG_IMPL_PATH=$(1)
-export LANGUAGE=$(basename $(1))
-$(gotestsum_bin) \
-  --format testdox \
-  --junitfile _test_results/progress-tests-$(LANGUAGE).xml \
-  --hide-summary=all \
-  --raw-command \
-  -- $(test2json_bin) -t -p progress-tests-$(LANGUAGE) bin/progress-tests$(EXT) -test.v=test2json
-endef
-
-.PHONY: run-progress
-run-progress: $(progress_tests_bin) $(test2json_bin) $(gotestsum_bin)
-	@$(call RUN_PROGRESS_TESTS,$(LANG_IMPL_PATH))
-
 .PHONY: test
 test:
-	@env LANG_IMPL_PATH=java gotestsum ./...
+	@gotestsum ./...
 
 .PHONY: clean
 clean:

dev-doc/build.md

@@ -84,14 +84,14 @@ make
 
 This command generates all the gamification kit executables in the [bin](../bin) directory.
 
-| Executable                 | Description                                                                        |
-|----------------------------|------------------------------------------------------------------------------------|
-| `bin/progress-tests[.exe]` | Progress Runner executable. This is the test executable running all progress tests |
-| `bin/gotestsum[.exe]`      | gotestsum executable used for running and rendering go test results (*)            |
-| `bin/test2json[.exe]`      | go tool used for converting raw go test results into json (*)                      |
-| `bin/cli[.exe]`            | Command Line Interface utility                                                     |
-
-(*) These executables are built here so that they can be re-distributed along with progress-tests executable
+| Executable                  | Description                                                                        |
+|-----------------------------|------------------------------------------------------------------------------------|
+| `bin/progress-runner[.exe]` | Progress Runner executable. This is the test executable running all progress tests |
+| `bin/gotestsum[.exe]`       | gotestsum executable used for running and rendering go test results (*)            |
+| `bin/test2json[.exe]`       | go tool used for converting raw go test results into json (*)                      |
+| `bin/cli[.exe]`             | Command Line Interface utility                                                     |
+
+(*) These executables are built here so that they can be re-distributed along with progress-runner executable
 without the need to have Go SDK installed on the end user machine.
 
 ## Run gamification kit executables
@@ -106,40 +106,29 @@ coffee machine implementation.
 
 #### Default mode (one dot per test case)
 
-Either:
-
-```shell
-env LANG_IMPL_PATH=../kata-coffeemachine/java make run-progress
-```
-
-Or:
-
 ```shell
-./run-progress-runner.sh ../kata-coffeemachine/java
+./progress-runner.sh ../kata-coffeemachine/java
 ```
 
 #### Verbose mode (one line per test case with test description)
 
 ```shell
-./run-progress-runner.sh ../kata-coffeemachine/java -v
+./progress-runner.sh ../kata-coffeemachine/java -v
 ```
 
 #### Very verbose mode (one line per test case with test description + failed tests output details)
 
 ```shell
-./run-progress-runner.sh ../kata-coffeemachine/java -vv
+./progress-runner.sh ../kata-coffeemachine/java -vv
 ```
 
 ### Run the command line interface utility
 
-Either:
-
 ```shell
-env LANG_IMPL_PATH=../kata-coffeemachine/java make run-cli
+./bin/cli ../kata-coffeemachine/java
 ```
-
-Or:
+## Clean up generated files and directories
 
 ```shell
-./bin/cli ../kata-coffeemachine/java
+make clean
 ```

progress-runner.sh

@@ -39,31 +39,31 @@ mkdir -p _test_results
 
 gotestsum_exe="${base_dir}/bin/gotestsum${extension}"
 test2json_exe="${base_dir}/bin/test2json${extension}"
-progress_tests_exe="${base_dir}/bin/progress-tests${extension}"
+progress_runner_exe="${base_dir}/bin/progress-runner${extension}"
 
-package_name=progress-tests-"${language}"
-junitfile=_test_results/progress_tests-"${language}".xml
+package_name=progress-runner-"${language}"
+junitfile=_test_results/progress_runner-"${language}".xml
 if [ "${trace_mode}" == "-vv" ]; then
   # Prints test names and failed tests output
   ${gotestsum_exe} \
     --format testdox \
     --junitfile "${junitfile}" \
     --raw-command \
-    -- "${test2json_exe}" -t -p "${package_name}" "${progress_tests_exe}" -test.v=test2json
+    -- "${test2json_exe}" -t -p "${package_name}" "${progress_runner_exe}" -test.v=test2json
 elif [ "${trace_mode}" == "-v" ]; then
   # Prints test names but not failed tests output
   ${gotestsum_exe} \
     --format testdox \
     --hide-summary=all \
     --junitfile "${junitfile}" \
     --raw-command \
-    -- "${test2json_exe}" -t -p "${package_name}" "${progress_tests_exe}" -test.v=test2json
+    -- "${test2json_exe}" -t -p "${package_name}" "${progress_runner_exe}" -test.v=test2json
 else
   # Prints dots only
   ${gotestsum_exe} \
     --format dots \
     --hide-summary=all \
     --junitfile "${junitfile}" \
     --raw-command \
-    -- "${test2json_exe}" -t -p "${package_name}" "${progress_tests_exe}" -test.v=test2json
+    -- "${test2json_exe}" -t -p "${package_name}" "${progress_runner_exe}" -test.v=test2json
 fi