Align test directories with /case_utils structure

A follow-on patch will regenerate files that will have updated UUIDs.

Signed-off-by: Alex Nelson <alexander.nelson@nist.gov>

Author: ajnelson-nist

tests/Makefile

@@ -15,22 +15,14 @@ SHELL := /bin/bash
 
 top_srcdir := $(shell cd .. ; pwd)
 
-srcdir := $(shell pwd)
-
 PYTHON3 ?= $(shell which python3.9 2>/dev/null || which python3.8 2>/dev/null || which python3.7 2>/dev/null || which python3.6 2>/dev/null || which python3)
 
 all: \
-  all-case_file \
-  all-case_sparql_construct \
-  all-case_sparql_select
+  all-case_utils
 
 .PHONY: \
-  all-case_file \
-  all-case_sparql_construct \
-  all-case_sparql_select \
-  check-case_file \
-  check-case_sparql_construct \
-  check-case_sparql_select \
+  all-case_utils \
+  check-case_utils \
   check-isomorphic_diff \
   check-mypy \
   download
@@ -60,51 +52,26 @@ all: \
 	      .
 	touch $@
 
-all-case_file: \
-  .venv.done.log
-	$(MAKE) \
-	  --directory case_file
-
-all-case_sparql_construct: \
-  .venv.done.log
-	$(MAKE) \
-	  --directory case_sparql_construct
 
-all-case_sparql_select: \
+all-case_utils: \
   .venv.done.log
 	$(MAKE) \
-	  --directory case_sparql_select
+	  --directory case_utils
 
 # These check calls are provided in preferred run-order.
 check: \
-  check-isomorphic_diff \
   check-mypy \
-  check-case_file \
-  check-case_sparql_construct \
-  check-case_sparql_select
+  check-isomorphic_diff \
+  check-case_utils
 	source venv/bin/activate \
 	  && pytest \
-	    --ignore case_file \
-	    --ignore case_sparql_construct \
-	    --ignore case_sparql_select \
+	    --ignore case_utils \
 	    --log-level=DEBUG
 
-check-case_file: \
-  .venv.done.log
-	$(MAKE) \
-	  --directory case_file \
-	  check
-
-check-case_sparql_construct: \
-  .venv.done.log
-	$(MAKE) \
-	  --directory case_sparql_construct \
-	  check
-
-check-case_sparql_select: \
+check-case_utils: \
   .venv.done.log
 	$(MAKE) \
-	  --directory case_sparql_select \
+	  --directory case_utils \
 	  check
 
 check-isomorphic_diff: \
@@ -119,21 +86,13 @@ check-mypy: \
 	source venv/bin/activate \
 	  && mypy \
 	    $(top_srcdir)/case_utils \
-	    case_file \
-	    case_sparql_construct \
 	    case_utils \
 	    hexbinary \
 	    src
 
 clean:
 	@$(MAKE) \
-	  --directory case_sparql_select \
-	  clean
-	@$(MAKE) \
-	  --directory case_sparql_construct \
-	  clean
-	@$(MAKE) \
-	  --directory case_file \
+	  --directory case_utils \
 	  clean
 	@rm -f \
 	  .venv.done.log

tests/case_utils/Makefile

@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+
+# This software was developed at the National Institute of Standards
+# and Technology by employees of the Federal Government in the course
+# of their official duties. Pursuant to title 17 Section 105 of the
+# United States Code this software is not subject to copyright
+# protection and is in the public domain. NIST assumes no
+# responsibility whatsoever for its use by other parties, and makes
+# no guarantees, expressed or implied, about its quality,
+# reliability, or any other characteristic.
+#
+# We would appreciate acknowledgement if the software is used.
+
+SHELL := /bin/bash
+
+top_srcdir := $(shell cd ../.. ; pwd)
+
+tests_srcdir := $(top_srcdir)/tests
+
+all: \
+  all-case_file \
+  all-case_sparql_construct \
+  all-case_sparql_select
+
+.PHONY: \
+  all-case_file \
+  all-case_sparql_construct \
+  all-case_sparql_select \
+  check-case_file \
+  check-case_sparql_construct \
+  check-case_sparql_select
+
+all-case_file: \
+  $(tests_srcdir)/.venv.done.log
+	$(MAKE) \
+	  --directory case_file
+
+all-case_sparql_construct: \
+  $(tests_srcdir)/.venv.done.log
+	$(MAKE) \
+	  --directory case_sparql_construct
+
+all-case_sparql_select: \
+  $(tests_srcdir)/.venv.done.log
+	$(MAKE) \
+	  --directory case_sparql_select
+
+check: \
+  check-case_file \
+  check-case_sparql_construct \
+  check-case_sparql_select
+	source $(tests_srcdir)/venv/bin/activate \
+	  && pytest \
+	    --ignore case_file \
+	    --ignore case_sparql_construct \
+	    --ignore case_sparql_select \
+	    --log-level=DEBUG
+
+check-case_file: \
+  $(tests_srcdir)/.venv.done.log
+	$(MAKE) \
+	  --directory case_file \
+	  check
+
+check-case_sparql_construct: \
+  $(tests_srcdir)/.venv.done.log
+	$(MAKE) \
+	  --directory case_sparql_construct \
+	  check
+
+check-case_sparql_select: \
+  $(tests_srcdir)/.venv.done.log
+	$(MAKE) \
+	  --directory case_sparql_select \
+	  check
+
+clean:
+	@$(MAKE) \
+	  --directory case_sparql_select \
+	  clean
+	@$(MAKE) \
+	  --directory case_sparql_construct \
+	  clean
+	@$(MAKE) \
+	  --directory case_file \
+	  clean

tests/case_file/.gitignore renamed to tests/case_utils/case_file/.gitignore

@@ -13,7 +13,7 @@
 
 SHELL := /bin/bash
 
-top_srcdir := $(shell cd ../.. ; pwd)
+top_srcdir := $(shell cd ../../.. ; pwd)
 
 tests_srcdir := $(top_srcdir)/tests
 

tests/case_file/Makefile renamed to tests/case_utils/case_file/Makefile

@@ -13,7 +13,7 @@
 
 SHELL := /bin/bash
 
-top_srcdir := $(shell cd ../.. ; pwd)
+top_srcdir := $(shell cd ../../.. ; pwd)
 
 tests_srcdir := $(top_srcdir)/tests
 

tests/case_file/kb.json renamed to tests/case_utils/case_file/kb.json

@@ -13,7 +13,7 @@
 
 SHELL := /bin/bash
 
-top_srcdir := $(shell cd ../.. ; pwd)
+top_srcdir := $(shell cd ../../.. ; pwd)
 
 tests_srcdir := $(top_srcdir)/tests