From 75a7a237465e37215525831f942a3904d20d1380 Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Thu, 17 Jan 2019 10:57:15 -0500
Subject: Tests: Rename RunCMake.CTestCommandLine show-only test cases

The current name was chosen from an earlier design iteration of the
command-line option name.  Rename the case to match the final name.
---
 Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake |  16 ++--
 .../RunCMake/CTestCommandLine/ShowAsJson1-check.py | 106 ---------------------
 .../ShowAsJsonVersionOne-check.cmake               |   1 -
 .../RunCMake/CTestCommandLine/ShowAsJson_check.py  |  24 -----
 .../CTestCommandLine/show-only_json-v1-check.cmake |   1 +
 .../CTestCommandLine/show-only_json-v1_check.py    | 106 +++++++++++++++++++++
 .../CTestCommandLine/show_only_json_check.py       |  24 +++++
 7 files changed, 139 insertions(+), 139 deletions(-)
 delete mode 100644 Tests/RunCMake/CTestCommandLine/ShowAsJson1-check.py
 delete mode 100644 Tests/RunCMake/CTestCommandLine/ShowAsJsonVersionOne-check.cmake
 delete mode 100644 Tests/RunCMake/CTestCommandLine/ShowAsJson_check.py
 create mode 100644 Tests/RunCMake/CTestCommandLine/show-only_json-v1-check.cmake
 create mode 100644 Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py
 create mode 100644 Tests/RunCMake/CTestCommandLine/show_only_json_check.py

diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index cae14b1..c8ea3fc 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -174,12 +174,12 @@ function(run_TestStdin)
 endfunction()
 run_TestStdin()
 
-function(ShowAsJson_check_python v)
+function(show_only_json_check_python v)
   set(json_file "${RunCMake_TEST_BINARY_DIR}/ctest.json")
   file(WRITE "${json_file}" "${actual_stdout}")
   set(actual_stdout "" PARENT_SCOPE)
   execute_process(
-    COMMAND ${PYTHON_EXECUTABLE} "${RunCMake_SOURCE_DIR}/ShowAsJson${v}-check.py" "${json_file}"
+    COMMAND ${PYTHON_EXECUTABLE} "${RunCMake_SOURCE_DIR}/show-only_json-v${v}_check.py" "${json_file}"
     RESULT_VARIABLE result
     OUTPUT_VARIABLE output
     ERROR_VARIABLE output
@@ -190,15 +190,15 @@ function(ShowAsJson_check_python v)
   endif()
 endfunction()
 
-function(run_ShowAsJson)
-  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ShowAsJson)
+function(run_ShowOnly)
+  set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/ShowOnly)
   set(RunCMake_TEST_NO_CLEAN 1)
   file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
   file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
   file(WRITE "${RunCMake_TEST_BINARY_DIR}/CTestTestfile.cmake" "
-    add_test(ShowAsJson \"${CMAKE_COMMAND}\" -E echo)
-    set_tests_properties(ShowAsJson PROPERTIES WILL_FAIL true _BACKTRACE_TRIPLES \"file1;1;add_test;file0;;\")
+    add_test(ShowOnly \"${CMAKE_COMMAND}\" -E echo)
+    set_tests_properties(ShowOnly PROPERTIES WILL_FAIL true _BACKTRACE_TRIPLES \"file1;1;add_test;file0;;\")
 ")
-  run_cmake_command(ShowAsJsonVersionOne ${CMAKE_CTEST_COMMAND} --show-only=json-v1)
+  run_cmake_command(show-only_json-v1 ${CMAKE_CTEST_COMMAND} --show-only=json-v1)
 endfunction()
-run_ShowAsJson()
+run_ShowOnly()
diff --git a/Tests/RunCMake/CTestCommandLine/ShowAsJson1-check.py b/Tests/RunCMake/CTestCommandLine/ShowAsJson1-check.py
deleted file mode 100644
index d794e7d..0000000
--- a/Tests/RunCMake/CTestCommandLine/ShowAsJson1-check.py
+++ /dev/null
@@ -1,106 +0,0 @@
-from ShowAsJson_check import *
-
-def check_kind(k):
-    assert is_string(k)
-    assert k == "ctestInfo"
-
-def check_version(v):
-    assert is_dict(v)
-    assert sorted(v.keys()) == ["major", "minor"]
-    assert is_int(v["major"])
-    assert is_int(v["minor"])
-    assert v["major"] == 1
-    assert v["minor"] == 0
-
-def check_backtracegraph(b):
-    assert is_dict(b)
-    assert sorted(b.keys()) == ["commands", "files", "nodes"]
-    check_backtracegraph_commands(b["commands"])
-    check_backtracegraph_files(b["files"])
-    check_backtracegraph_nodes(b["nodes"])
-
-def check_backtracegraph_commands(c):
-    assert is_list(c)
-    assert len(c) == 1
-    assert is_string(c[0])
-    assert c[0] == "add_test"
-
-def check_backtracegraph_files(f):
-    assert is_list(f)
-    assert len(f) == 2
-    assert is_string(f[0])
-    assert is_string(f[1])
-    assert f[0] == "file1"
-    assert f[1] == "file0"
-
-def check_backtracegraph_nodes(n):
-    assert is_list(n)
-    assert len(n) == 2
-    node = n[0]
-    assert is_dict(node)
-    assert sorted(node.keys()) == ["file"]
-    assert is_int(node["file"])
-    assert node["file"] == 1
-    node = n[1]
-    assert is_dict(node)
-    assert sorted(node.keys()) == ["command", "file", "line", "parent"]
-    assert is_int(node["command"])
-    assert is_int(node["file"])
-    assert is_int(node["line"])
-    assert is_int(node["parent"])
-    assert node["command"] == 0
-    assert node["file"] == 0
-    assert node["line"] == 1
-    assert node["parent"] == 0
-
-def check_command(c):
-    assert is_list(c)
-    assert len(c) == 3
-    assert is_string(c[0])
-    check_re(c[0], "/cmake(\.exe)?$")
-    assert is_string(c[1])
-    assert c[1] == "-E"
-    assert is_string(c[2])
-    assert c[2] == "echo"
-
-def check_willfail_property(p):
-    assert is_dict(p)
-    assert sorted(p.keys()) == ["name", "value"]
-    assert is_string(p["name"])
-    assert is_bool(p["value"])
-    assert p["name"] == "WILL_FAIL"
-    assert p["value"] == True
-
-def check_workingdir_property(p):
-    assert is_dict(p)
-    assert sorted(p.keys()) == ["name", "value"]
-    assert is_string(p["name"])
-    assert is_string(p["value"])
-    assert p["name"] == "WORKING_DIRECTORY"
-    assert p["value"].endswith("Tests/RunCMake/CTestCommandLine/ShowAsJson")
-
-def check_properties(p):
-    assert is_list(p)
-    assert len(p) == 2
-    check_willfail_property(p[0])
-    check_workingdir_property(p[1])
-
-def check_tests(t):
-    assert is_list(t)
-    assert len(t) == 1
-    test = t[0]
-    assert is_dict(test)
-    assert sorted(test.keys()) == ["backtrace", "command", "name", "properties"]
-    assert is_int(test["backtrace"])
-    assert test["backtrace"] == 1
-    check_command(test["command"])
-    assert is_string(test["name"])
-    assert test["name"] == "ShowAsJson"
-    check_properties(test["properties"])
-
-assert is_dict(ctest_json)
-assert sorted(ctest_json.keys()) == ["backtraceGraph", "kind", "tests", "version"]
-check_backtracegraph(ctest_json["backtraceGraph"])
-check_kind(ctest_json["kind"])
-check_version(ctest_json["version"])
-check_tests(ctest_json["tests"])
diff --git a/Tests/RunCMake/CTestCommandLine/ShowAsJsonVersionOne-check.cmake b/Tests/RunCMake/CTestCommandLine/ShowAsJsonVersionOne-check.cmake
deleted file mode 100644
index f8bcd2c..0000000
--- a/Tests/RunCMake/CTestCommandLine/ShowAsJsonVersionOne-check.cmake
+++ /dev/null
@@ -1 +0,0 @@
-ShowAsJson_check_python(1)
diff --git a/Tests/RunCMake/CTestCommandLine/ShowAsJson_check.py b/Tests/RunCMake/CTestCommandLine/ShowAsJson_check.py
deleted file mode 100644
index 493c9e5..0000000
--- a/Tests/RunCMake/CTestCommandLine/ShowAsJson_check.py
+++ /dev/null
@@ -1,24 +0,0 @@
-import sys
-import json
-import re
-
-def is_bool(x):
-    return isinstance(x, bool)
-
-def is_dict(x):
-    return isinstance(x, dict)
-
-def is_list(x):
-    return isinstance(x, list)
-
-def is_int(x):
-    return isinstance(x, int) or isinstance(x, long)
-
-def is_string(x):
-    return isinstance(x, str) or isinstance(x, unicode)
-
-def check_re(x, regex):
-    assert re.search(regex, x)
-
-with open(sys.argv[1]) as f:
-    ctest_json = json.load(f)
diff --git a/Tests/RunCMake/CTestCommandLine/show-only_json-v1-check.cmake b/Tests/RunCMake/CTestCommandLine/show-only_json-v1-check.cmake
new file mode 100644
index 0000000..f9234f8
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/show-only_json-v1-check.cmake
@@ -0,0 +1 @@
+show_only_json_check_python(1)
diff --git a/Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py b/Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py
new file mode 100644
index 0000000..4dff90c
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/show-only_json-v1_check.py
@@ -0,0 +1,106 @@
+from show_only_json_check import *
+
+def check_kind(k):
+    assert is_string(k)
+    assert k == "ctestInfo"
+
+def check_version(v):
+    assert is_dict(v)
+    assert sorted(v.keys()) == ["major", "minor"]
+    assert is_int(v["major"])
+    assert is_int(v["minor"])
+    assert v["major"] == 1
+    assert v["minor"] == 0
+
+def check_backtracegraph(b):
+    assert is_dict(b)
+    assert sorted(b.keys()) == ["commands", "files", "nodes"]
+    check_backtracegraph_commands(b["commands"])
+    check_backtracegraph_files(b["files"])
+    check_backtracegraph_nodes(b["nodes"])
+
+def check_backtracegraph_commands(c):
+    assert is_list(c)
+    assert len(c) == 1
+    assert is_string(c[0])
+    assert c[0] == "add_test"
+
+def check_backtracegraph_files(f):
+    assert is_list(f)
+    assert len(f) == 2
+    assert is_string(f[0])
+    assert is_string(f[1])
+    assert f[0] == "file1"
+    assert f[1] == "file0"
+
+def check_backtracegraph_nodes(n):
+    assert is_list(n)
+    assert len(n) == 2
+    node = n[0]
+    assert is_dict(node)
+    assert sorted(node.keys()) == ["file"]
+    assert is_int(node["file"])
+    assert node["file"] == 1
+    node = n[1]
+    assert is_dict(node)
+    assert sorted(node.keys()) == ["command", "file", "line", "parent"]
+    assert is_int(node["command"])
+    assert is_int(node["file"])
+    assert is_int(node["line"])
+    assert is_int(node["parent"])
+    assert node["command"] == 0
+    assert node["file"] == 0
+    assert node["line"] == 1
+    assert node["parent"] == 0
+
+def check_command(c):
+    assert is_list(c)
+    assert len(c) == 3
+    assert is_string(c[0])
+    check_re(c[0], "/cmake(\.exe)?$")
+    assert is_string(c[1])
+    assert c[1] == "-E"
+    assert is_string(c[2])
+    assert c[2] == "echo"
+
+def check_willfail_property(p):
+    assert is_dict(p)
+    assert sorted(p.keys()) == ["name", "value"]
+    assert is_string(p["name"])
+    assert is_bool(p["value"])
+    assert p["name"] == "WILL_FAIL"
+    assert p["value"] == True
+
+def check_workingdir_property(p):
+    assert is_dict(p)
+    assert sorted(p.keys()) == ["name", "value"]
+    assert is_string(p["name"])
+    assert is_string(p["value"])
+    assert p["name"] == "WORKING_DIRECTORY"
+    assert p["value"].endswith("Tests/RunCMake/CTestCommandLine/ShowOnly")
+
+def check_properties(p):
+    assert is_list(p)
+    assert len(p) == 2
+    check_willfail_property(p[0])
+    check_workingdir_property(p[1])
+
+def check_tests(t):
+    assert is_list(t)
+    assert len(t) == 1
+    test = t[0]
+    assert is_dict(test)
+    assert sorted(test.keys()) == ["backtrace", "command", "name", "properties"]
+    assert is_int(test["backtrace"])
+    assert test["backtrace"] == 1
+    check_command(test["command"])
+    assert is_string(test["name"])
+    assert test["name"] == "ShowOnly"
+    check_properties(test["properties"])
+
+assert is_dict(ctest_json)
+assert sorted(ctest_json.keys()) == ["backtraceGraph", "kind", "tests", "version"]
+check_backtracegraph(ctest_json["backtraceGraph"])
+check_kind(ctest_json["kind"])
+check_version(ctest_json["version"])
+check_tests(ctest_json["tests"])
diff --git a/Tests/RunCMake/CTestCommandLine/show_only_json_check.py b/Tests/RunCMake/CTestCommandLine/show_only_json_check.py
new file mode 100644
index 0000000..493c9e5
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/show_only_json_check.py
@@ -0,0 +1,24 @@
+import sys
+import json
+import re
+
+def is_bool(x):
+    return isinstance(x, bool)
+
+def is_dict(x):
+    return isinstance(x, dict)
+
+def is_list(x):
+    return isinstance(x, list)
+
+def is_int(x):
+    return isinstance(x, int) or isinstance(x, long)
+
+def is_string(x):
+    return isinstance(x, str) or isinstance(x, unicode)
+
+def check_re(x, regex):
+    assert re.search(regex, x)
+
+with open(sys.argv[1]) as f:
+    ctest_json = json.load(f)
-- 
cgit v0.12