[PATCH 2/9] reg/tests: Split 'query' tests from reg.c
Hugh McMaster
hugh.mcmaster at outlook.com
Sun Feb 28 21:16:46 CST 2021
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/reg/tests/Makefile.in | 3 +-
programs/reg/tests/query.c | 136 +++++++++++++++++++++++++++++++++
programs/reg/tests/reg.c | 108 +-------------------------
programs/reg/tests/reg_test.h | 3 +
4 files changed, 142 insertions(+), 108 deletions(-)
create mode 100644 programs/reg/tests/query.c
diff --git a/programs/reg/tests/Makefile.in b/programs/reg/tests/Makefile.in
index 791a8cfc4e3..b2f6b6984b2 100644
--- a/programs/reg/tests/Makefile.in
+++ b/programs/reg/tests/Makefile.in
@@ -3,4 +3,5 @@ IMPORTS = advapi32
C_SRCS = \
reg.c \
- delete.c
+ delete.c \
+ query.c
diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c
new file mode 100644
index 00000000000..afa655f8d74
--- /dev/null
+++ b/programs/reg/tests/query.c
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2014 Akihiro Sagawa
+ * Copyright 2016-2018, 2021 Hugh McMaster
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include "reg_test.h"
+
+static void test_query(void)
+{
+ DWORD r;
+ HKEY key, subkey;
+ const char hello[] = "Hello";
+ const char world[] = "World";
+ const char empty1[] = "Empty1";
+ const char empty2[] = "Empty2";
+ const DWORD dword1 = 0x123;
+ const DWORD dword2 = 0xabc;
+
+ delete_tree(HKEY_CURRENT_USER, KEY_BASE);
+ verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
+
+ run_reg_exe("reg query", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg query /?", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query /h", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query -H", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ /* Create a test key */
+ add_key(HKEY_CURRENT_USER, KEY_BASE, &key);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r);
+ ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),
+ "got exit code %d, expected 0\n", r);
+
+ add_value(key, "Test", REG_SZ, hello, sizeof(hello));
+ add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1));
+ add_value(key, NULL, REG_SZ, empty1, sizeof(empty1));
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE, &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ /* Create a test subkey */
+ add_key(key, "Subkey", &subkey);
+ add_value(subkey, "Test", REG_SZ, world, sizeof(world));
+ add_value(subkey, "Wine", REG_DWORD, &dword2, sizeof(dword2));
+ add_value(subkey, NULL, REG_SZ, empty2, sizeof(empty2));
+
+ close_key(subkey);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Wine", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ /* Test recursion */
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /s", &r);
+ ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /s", &r);
+ ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
+ "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine /s", &r);
+ ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
+ "got exit code %d, expected 0\n", r);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE " /ve /s", &r);
+ ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
+ "got exit code %d, expected 0\n", r);
+
+ /* Clean-up, then query */
+ delete_key(key, "subkey");
+ close_key(key);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ delete_key(HKEY_CURRENT_USER, KEY_BASE);
+
+ run_reg_exe("reg query HKCU\\" KEY_BASE, &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+}
+
+START_TEST(query)
+{
+ DWORD r;
+
+ if (!run_reg_exe("reg.exe /?", &r)) {
+ win_skip("reg.exe not available, skipping 'query' tests\n");
+ return;
+ }
+
+ test_query();
+}
diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index 97766e191fa..11dea0d0e28 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -139,8 +139,7 @@ void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey)
lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err);
}
-#define delete_key(k,p) delete_key_(__LINE__,k,p)
-static void delete_key_(unsigned line, const HKEY hkey, const char *path)
+void delete_key_(unsigned line, const HKEY hkey, const char *path)
{
if (path && *path)
{
@@ -617,110 +616,6 @@ static void test_add(void)
delete_tree(HKEY_CURRENT_USER, KEY_BASE);
}
-static void test_query(void)
-{
- DWORD r;
- HKEY key, subkey;
- const char hello[] = "Hello";
- const char world[] = "World";
- const char empty1[] = "Empty1";
- const char empty2[] = "Empty2";
- const DWORD dword1 = 0x123;
- const DWORD dword2 = 0xabc;
-
- delete_tree(HKEY_CURRENT_USER, KEY_BASE);
- verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
-
- run_reg_exe("reg query", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
- run_reg_exe("reg query /?", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query /h", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query -H", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- /* Create a test key */
- add_key(HKEY_CURRENT_USER, KEY_BASE, &key);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r);
- ok(r == REG_EXIT_SUCCESS || broken(r == REG_EXIT_FAILURE /* WinXP */),
- "got exit code %d, expected 0\n", r);
-
- add_value(key, "Test", REG_SZ, hello, sizeof(hello));
- add_value(key, "Wine", REG_DWORD, &dword1, sizeof(dword1));
- add_value(key, NULL, REG_SZ, empty1, sizeof(empty1));
-
- run_reg_exe("reg query HKCU\\" KEY_BASE, &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v Missing", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- /* Create a test subkey */
- add_key(key, "Subkey", &subkey);
- add_value(subkey, "Test", REG_SZ, world, sizeof(world));
- add_value(subkey, "Wine", REG_DWORD, &dword2, sizeof(dword2));
- add_value(subkey, NULL, REG_SZ, empty2, sizeof(empty2));
-
- close_key(subkey);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Test", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /v Wine", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey /ve", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- /* Test recursion */
- run_reg_exe("reg query HKCU\\" KEY_BASE " /s", &r);
- ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /s", &r);
- ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
- "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /v Wine /s", &r);
- ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
- "got exit code %d, expected 0\n", r);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE " /ve /s", &r);
- ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,
- "got exit code %d, expected 0\n", r);
-
- /* Clean-up, then query */
- delete_key(key, "subkey");
- close_key(key);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE "\\subkey", &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-
- delete_key(HKEY_CURRENT_USER, KEY_BASE);
-
- run_reg_exe("reg query HKCU\\" KEY_BASE, &r);
- ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
-}
-
static BOOL write_file(const void *str, DWORD size)
{
HANDLE file;
@@ -4753,7 +4648,6 @@ START_TEST(reg)
}
test_add();
- test_query();
test_import();
test_unicode_import();
test_import_with_whitespace();
diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h
index 78d1098499a..cd48904066f 100644
--- a/programs/reg/tests/reg_test.h
+++ b/programs/reg/tests/reg_test.h
@@ -48,6 +48,9 @@ void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey);
#define add_key(k,p,s) add_key_(__LINE__,k,p,s)
void add_key_(unsigned line, const HKEY hkey, const char *path, HKEY *subkey);
+#define delete_key(k,p) delete_key_(__LINE__,k,p)
+void delete_key_(unsigned line, const HKEY hkey, const char *path);
+
LONG delete_tree(const HKEY key, const char *subkey);
#define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s)
--
2.30.1
More information about the wine-devel
mailing list