From 66becce691871c25123ba28b78c27f32934504f8 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 6 Dec 2022 10:19:50 -0500 Subject: [PATCH 1/4] Have case_sparql_select output end with newline No effects were observed on Make-managed files. Signed-off-by: Alex Nelson --- case_utils/case_sparql_select/__init__.py | 3 +++ .../case_sparql_select/.check-subclass-explicit-none.md | 2 +- .../case_sparql_select/.check-subclass-implicit-any.md | 2 +- tests/case_utils/case_sparql_select/.check-w3-output.html | 2 +- tests/case_utils/case_sparql_select/.check-w3-output.md | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/case_utils/case_sparql_select/__init__.py b/case_utils/case_sparql_select/__init__.py index b753664..92c0e6b 100644 --- a/case_utils/case_sparql_select/__init__.py +++ b/case_utils/case_sparql_select/__init__.py @@ -153,6 +153,9 @@ def main() -> None: with open(args.out_table, "w") as out_fh: out_fh.write(table_text) + if table_text[-1] != "\n": + # End file with newline. + out_fh.write("\n") if __name__ == "__main__": diff --git a/tests/case_utils/case_sparql_select/.check-subclass-explicit-none.md b/tests/case_utils/case_sparql_select/.check-subclass-explicit-none.md index 5d9d1ef..587732b 100644 --- a/tests/case_utils/case_sparql_select/.check-subclass-explicit-none.md +++ b/tests/case_utils/case_sparql_select/.check-subclass-explicit-none.md @@ -1,3 +1,3 @@ | | ?nFile | |----|------------------------------| -| 0 | http://example.org/kb/file-1 | \ No newline at end of file +| 0 | http://example.org/kb/file-1 | diff --git a/tests/case_utils/case_sparql_select/.check-subclass-implicit-any.md b/tests/case_utils/case_sparql_select/.check-subclass-implicit-any.md index 251fcf6..c94f185 100644 --- a/tests/case_utils/case_sparql_select/.check-subclass-implicit-any.md +++ b/tests/case_utils/case_sparql_select/.check-subclass-implicit-any.md @@ -1,4 +1,4 @@ | | ?nFile | |----|------------------------------| | 0 | http://example.org/kb/file-1 | -| 1 | http://example.org/kb/file-2 | \ No newline at end of file +| 1 | http://example.org/kb/file-2 | diff --git a/tests/case_utils/case_sparql_select/.check-w3-output.html b/tests/case_utils/case_sparql_select/.check-w3-output.html index aff9beb..bee5944 100644 --- a/tests/case_utils/case_sparql_select/.check-w3-output.html +++ b/tests/case_utils/case_sparql_select/.check-w3-output.html @@ -18,4 +18,4 @@ mailto:peter@example.org - \ No newline at end of file + diff --git a/tests/case_utils/case_sparql_select/.check-w3-output.md b/tests/case_utils/case_sparql_select/.check-w3-output.md index 77b05f4..af68b84 100644 --- a/tests/case_utils/case_sparql_select/.check-w3-output.md +++ b/tests/case_utils/case_sparql_select/.check-w3-output.md @@ -1,4 +1,4 @@ | | ?name | ?mbox | |----|-------------------|--------------------------| | 0 | Johnny Lee Outlaw | mailto:jlow@example.com | -| 1 | Peter Goodguy | mailto:peter@example.org | \ No newline at end of file +| 1 | Peter Goodguy | mailto:peter@example.org | From 894d7b171cdcadf3e52659d686ca1ecc46ee61b8 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 6 Dec 2022 11:26:02 -0500 Subject: [PATCH 2/4] Update documentation comment Signed-off-by: Alex Nelson --- case_utils/case_sparql_select/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/case_utils/case_sparql_select/__init__.py b/case_utils/case_sparql_select/__init__.py index 5c50e78..424848c 100644 --- a/case_utils/case_sparql_select/__init__.py +++ b/case_utils/case_sparql_select/__init__.py @@ -164,7 +164,7 @@ def main() -> None: with open(args.out_table, "w") as out_fh: out_fh.write(table_text) if table_text[-1] != "\n": - # End file with newline. + # End file with newline. CSV and TSV modes end with a built-in newline. out_fh.write("\n") From 22306b9bd8437d0e714cb131fd8812ea687a8e73 Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 6 Dec 2022 13:29:03 -0500 Subject: [PATCH 3/4] Align test files with new behavior A follow-on patch will address Make-managed files. Signed-off-by: Alex Nelson --- .../case_utils/case_sparql_select/.check-prefixed_results.html | 2 +- tests/case_utils/case_sparql_select/.check-prefixed_results.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/case_utils/case_sparql_select/.check-prefixed_results.html b/tests/case_utils/case_sparql_select/.check-prefixed_results.html index 10e210b..4b41f69 100644 --- a/tests/case_utils/case_sparql_select/.check-prefixed_results.html +++ b/tests/case_utils/case_sparql_select/.check-prefixed_results.html @@ -15,4 +15,4 @@ kb:file-2 - \ No newline at end of file + diff --git a/tests/case_utils/case_sparql_select/.check-prefixed_results.md b/tests/case_utils/case_sparql_select/.check-prefixed_results.md index f49a624..f07d435 100644 --- a/tests/case_utils/case_sparql_select/.check-prefixed_results.md +++ b/tests/case_utils/case_sparql_select/.check-prefixed_results.md @@ -1,4 +1,4 @@ | | ?nFile | |----|-----------| | 0 | kb:file-1 | -| 1 | kb:file-2 | \ No newline at end of file +| 1 | kb:file-2 | From c4a9f584b2f6cc4c41b92e4c8e5df73124ad72ca Mon Sep 17 00:00:00 2001 From: Alex Nelson Date: Tue, 6 Dec 2022 13:31:04 -0500 Subject: [PATCH 4/4] Remove Make-managed files This directory had not been tracking the non-dot files. Signed-off-by: Alex Nelson --- tests/case_utils/case_sparql_select/.gitignore | 1 + .../case_sparql_select/prefixed_results.html | 18 ------------------ .../case_sparql_select/prefixed_results.md | 4 ---- 3 files changed, 1 insertion(+), 22 deletions(-) delete mode 100644 tests/case_utils/case_sparql_select/prefixed_results.html delete mode 100644 tests/case_utils/case_sparql_select/prefixed_results.md diff --git a/tests/case_utils/case_sparql_select/.gitignore b/tests/case_utils/case_sparql_select/.gitignore index 0ae4849..9d94989 100644 --- a/tests/case_utils/case_sparql_select/.gitignore +++ b/tests/case_utils/case_sparql_select/.gitignore @@ -1,2 +1,3 @@ +prefixed* subclass-*.md w3-output.* diff --git a/tests/case_utils/case_sparql_select/prefixed_results.html b/tests/case_utils/case_sparql_select/prefixed_results.html deleted file mode 100644 index 10e210b..0000000 --- a/tests/case_utils/case_sparql_select/prefixed_results.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - -
?nFile
0kb:file-1
1kb:file-2
\ No newline at end of file diff --git a/tests/case_utils/case_sparql_select/prefixed_results.md b/tests/case_utils/case_sparql_select/prefixed_results.md deleted file mode 100644 index f49a624..0000000 --- a/tests/case_utils/case_sparql_select/prefixed_results.md +++ /dev/null @@ -1,4 +0,0 @@ -| | ?nFile | -|----|-----------| -| 0 | kb:file-1 | -| 1 | kb:file-2 | \ No newline at end of file