From 9f5383d932da1c1ba2ef4859c20e59e47b159394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Wed, 9 Mar 2022 15:23:58 +0100 Subject: [PATCH] Revert "Add c tests for parsing metadata together" This reverts commit 3ef3d4d77e283ee916fc7977cdc3855b912463e0. --- tests/CMakeLists.txt | 4 - tests/fixtures.h | 2 - .../test_xml_parser_main_metadata_together.c | 298 ----- .../modified_repo_files/long_primary.xml | 1060 ----------------- .../repo_02_different_order_filelists.xml | 16 - 5 files changed, 1380 deletions(-) delete mode 100644 tests/test_xml_parser_main_metadata_together.c delete mode 100644 tests/testdata/modified_repo_files/long_primary.xml delete mode 100644 tests/testdata/modified_repo_files/repo_02_different_order_filelists.xml diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 4ffe837..3936176 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -38,10 +38,6 @@ ADD_EXECUTABLE(test_xml_parser_updateinfo test_xml_parser_updateinfo.c) TARGET_LINK_LIBRARIES(test_xml_parser_updateinfo libcreaterepo_c ${GLIB2_LIBRARIES}) ADD_DEPENDENCIES(tests test_xml_parser_updateinfo) -ADD_EXECUTABLE(test_xml_parser_main_metadata_together test_xml_parser_main_metadata_together.c) -TARGET_LINK_LIBRARIES(test_xml_parser_main_metadata_together libcreaterepo_c ${GLIB2_LIBRARIES}) -ADD_DEPENDENCIES(tests test_xml_parser_main_metadata_together) - ADD_EXECUTABLE(test_xml_dump test_xml_dump.c) TARGET_LINK_LIBRARIES(test_xml_dump libcreaterepo_c ${GLIB2_LIBRARIES}) ADD_DEPENDENCIES(tests test_xml_dump) diff --git a/tests/fixtures.h b/tests/fixtures.h index 676518c..a47dd66 100644 --- a/tests/fixtures.h +++ b/tests/fixtures.h @@ -85,8 +85,6 @@ #define TEST_MRF_UE_OTH_00 TEST_MODIFIED_REPO_FILES_PATH"unknown_element_00-other.xml" #define TEST_MRF_UE_OTH_01 TEST_MODIFIED_REPO_FILES_PATH"unknown_element_01-other.xml" #define TEST_MRF_UE_OTH_02 TEST_MODIFIED_REPO_FILES_PATH"unknown_element_02-other.xml" -#define TEST_LONG_PRIMARY TEST_MODIFIED_REPO_FILES_PATH"long_primary.xml" -#define TEST_DIFF_ORDER_FILELISTS TEST_MODIFIED_REPO_FILES_PATH"repo_02_different_order_filelists.xml" // Test files diff --git a/tests/test_xml_parser_main_metadata_together.c b/tests/test_xml_parser_main_metadata_together.c deleted file mode 100644 index a4e4ad7..0000000 --- a/tests/test_xml_parser_main_metadata_together.c +++ /dev/null @@ -1,298 +0,0 @@ -/* - * Copyright (C) 2021 Red Hat, Inc. - * - * Licensed under the GNU Lesser General Public License Version 2.1 - * - * 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 Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include "fixtures.h" -#include "createrepo/error.h" -#include "createrepo/package.h" -#include "createrepo/misc.h" -#include "createrepo/xml_parser.h" -#include "createrepo/xml_parser_internal.h" - -// Callbacks - -static int -pkgcb(cr_Package *pkg, void *cbdata, GError **err) -{ - g_assert(pkg); - g_assert(!err || *err == NULL); - if (cbdata) *((int *)cbdata) += 1; - cr_package_free(pkg); - return CR_CB_RET_OK; -} - -static int -pkgcb_interrupt(cr_Package *pkg, void *cbdata, GError **err) -{ - g_assert(pkg); - g_assert(!err || *err == NULL); - if (cbdata) *((int *)cbdata) += 1; - cr_package_free(pkg); - return CR_CB_RET_ERR; -} - -static int -newpkgcb_skip_fake_bash(cr_Package **pkg, - G_GNUC_UNUSED const char *pkgId, - const char *name, - G_GNUC_UNUSED const char *arch, - G_GNUC_UNUSED void *cbdata, - GError **err) -{ - g_assert(pkg != NULL); - g_assert(*pkg == NULL); - g_assert(pkgId != NULL); - g_assert(!err || *err == NULL); - - - if (!g_strcmp0(name, "fake_bash")) { - return CRE_OK; - } - - *pkg = cr_package_new(); - return CR_CB_RET_OK; -} - -static int -newpkgcb_interrupt(cr_Package **pkg, - G_GNUC_UNUSED const char *pkgId, - G_GNUC_UNUSED const char *name, - G_GNUC_UNUSED const char *arch, - G_GNUC_UNUSED void *cbdata, - GError **err) -{ - g_assert(pkg != NULL); - g_assert(*pkg == NULL); - g_assert(pkgId != NULL); - g_assert(!err || *err == NULL); - - if (cbdata) *((int *)cbdata) += 1; - - return CR_CB_RET_ERR; -} - -static int -warningcb(G_GNUC_UNUSED cr_XmlParserWarningType type, - G_GNUC_UNUSED char *msg, - void *cbdata, - G_GNUC_UNUSED GError **err) -{ - g_assert(type < CR_XML_WARNING_SENTINEL); - g_assert(!err || *err == NULL); - - g_string_append((GString *) cbdata, msg); - g_string_append((GString *) cbdata, ";"); - - return CR_CB_RET_OK; -} - -static int -warningcb_interrupt(G_GNUC_UNUSED cr_XmlParserWarningType type, - G_GNUC_UNUSED char *msg, - G_GNUC_UNUSED void *cbdata, - G_GNUC_UNUSED GError **err) -{ - g_assert(type < CR_XML_WARNING_SENTINEL); - g_assert(!err || *err == NULL); - - if (cbdata) *((int *)cbdata) += 1; - - return CR_CB_RET_ERR; -} - -// Tests - -static void -test_cr_xml_parse_main_metadata_together_00(void) -{ - int parsed = 0; - GError *tmp_err = NULL; - int ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_REPO_02_FILELISTS, TEST_REPO_02_OTHER, - NULL, NULL, pkgcb, &parsed, NULL, NULL, TRUE, &tmp_err); - g_assert(tmp_err == NULL); - g_assert_cmpint(ret, ==, CRE_OK); - g_assert_cmpint(parsed, ==, 2); -} - -static void -test_cr_xml_parse_main_metadata_together_01_out_of_order_pkgs(void) -{ - int parsed = 0; - GError *tmp_err = NULL; - int ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, - TEST_DIFF_ORDER_FILELISTS, - TEST_REPO_02_OTHER, - NULL, NULL, pkgcb, &parsed, NULL, NULL, FALSE, &tmp_err); - g_assert(tmp_err != NULL); - g_assert_cmpint(ret, ==, CRE_XMLPARSER); - - g_clear_error(&tmp_err); - ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_DIFF_ORDER_FILELISTS, TEST_REPO_02_OTHER, - NULL, NULL, pkgcb, &parsed, NULL, NULL, TRUE, &tmp_err); - g_assert(tmp_err == NULL); - g_assert_cmpint(ret, ==, CRE_OK); - g_assert_cmpint(parsed, ==, 2); -} - -static void -test_cr_xml_parse_main_metadata_together_02_invalid_path(void) -{ - int parsed = 0; - GError *tmp_err = NULL; - int ret = cr_xml_parse_main_metadata_together("/non/existent/file", TEST_REPO_02_FILELISTS, TEST_REPO_02_OTHER, - NULL, NULL, pkgcb, &parsed, NULL, NULL, TRUE, &tmp_err); - g_assert(tmp_err != NULL); - g_assert_cmpint(ret, ==, CRE_NOFILE); -} - -static void -test_cr_xml_parse_main_metadata_together_03_newpkgcb_returns_null(void) -{ - int parsed = 0; - GError *tmp_err = NULL; - int ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_REPO_02_FILELISTS, TEST_REPO_02_OTHER, - newpkgcb_skip_fake_bash, NULL, pkgcb, &parsed, NULL, NULL, TRUE, - &tmp_err); - g_assert(tmp_err == NULL); - g_assert_cmpint(ret, ==, CRE_OK); - g_assert_cmpint(parsed, ==, 1); - - parsed = 0; - ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_DIFF_ORDER_FILELISTS, TEST_REPO_02_OTHER, - newpkgcb_skip_fake_bash, NULL, pkgcb, &parsed, NULL, NULL, TRUE, - &tmp_err); - g_assert(tmp_err == NULL); - g_assert_cmpint(ret, ==, CRE_OK); - g_assert_cmpint(parsed, ==, 1); - - parsed = 0; - ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_DIFF_ORDER_FILELISTS, TEST_REPO_02_OTHER, - newpkgcb_skip_fake_bash, NULL, pkgcb, &parsed, NULL, NULL, FALSE, - &tmp_err); - g_assert(tmp_err == NULL); - g_assert_cmpint(ret, ==, CRE_OK); - g_assert_cmpint(parsed, ==, 1); -} - -static void -test_cr_xml_parse_main_metadata_together_04_newpkgcb_interrupt(void) -{ - int parsed = 0; - GError *tmp_err = NULL; - int ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_REPO_02_FILELISTS, TEST_REPO_02_OTHER, - newpkgcb_interrupt, &parsed, NULL, NULL, NULL, NULL, TRUE, &tmp_err); - g_assert(tmp_err != NULL); - g_error_free(tmp_err); - g_assert_cmpint(ret, ==, CRE_CBINTERRUPTED); - g_assert_cmpint(parsed, ==, 1); -} - -static void -test_cr_xml_parse_main_metadata_together_05_pkgcb_interrupt(void) -{ - int parsed = 0; - GError *tmp_err = NULL; - int ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_REPO_02_FILELISTS, TEST_REPO_02_OTHER, - NULL, NULL, pkgcb_interrupt, &parsed, NULL, NULL, TRUE, &tmp_err); - g_assert(tmp_err != NULL); - g_error_free(tmp_err); - g_assert_cmpint(ret, ==, CRE_CBINTERRUPTED); - g_assert_cmpint(parsed, ==, 1); -} - -static void -test_cr_xml_parse_main_metadata_together_06_warnings_bad_file_type(void) -{ - int parsed = 0; - char *warnmsgs; - GError *tmp_err = NULL; - GString *warn_strings = g_string_new(0); - int ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_MRF_BAD_TYPE_FIL, TEST_REPO_02_OTHER, - NULL, NULL, pkgcb, &parsed, warningcb, warn_strings, TRUE, &tmp_err); - g_assert(tmp_err == NULL); - g_assert_cmpint(ret, ==, CRE_OK); - g_assert_cmpint(parsed, ==, 2); - warnmsgs = g_string_free(warn_strings, FALSE); - g_assert_cmpstr(warnmsgs, ==, "Unknown file type \"foo\";"); - g_free(warnmsgs); -} - -static void -test_cr_xml_parse_main_metadata_together_07_warningcb_interrupt(void) -{ - int numofwarnings = 0; - GError *tmp_err = NULL; - int ret = cr_xml_parse_main_metadata_together(TEST_REPO_02_PRIMARY, TEST_MRF_BAD_TYPE_FIL, TEST_REPO_02_OTHER, - NULL, NULL, pkgcb, NULL, warningcb_interrupt, &numofwarnings, - TRUE, &tmp_err); - g_assert(tmp_err != NULL); - g_error_free(tmp_err); - g_assert_cmpint(ret, ==, CRE_CBINTERRUPTED); - g_assert_cmpint(numofwarnings, ==, 1); -} - -static void -test_cr_xml_parse_main_metadata_together_08_long_primary(void) -{ - int parsed = 0; - GError *tmp_err = NULL; - int ret = cr_xml_parse_main_metadata_together(TEST_LONG_PRIMARY, TEST_REPO_02_FILELISTS, TEST_REPO_02_OTHER, - NULL, NULL, pkgcb, &parsed, NULL, NULL, TRUE, &tmp_err); - g_assert(tmp_err == NULL); - g_assert_cmpint(ret, ==, CRE_OK); - g_assert_cmpint(parsed, ==, 2); -} - -int -main(int argc, char *argv[]) -{ - g_test_init(&argc, &argv, NULL); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_00", - test_cr_xml_parse_main_metadata_together_00); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_01_out_of_order_pkgs", - test_cr_xml_parse_main_metadata_together_01_out_of_order_pkgs); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_02_invalid_path", - test_cr_xml_parse_main_metadata_together_02_invalid_path); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_03_newpkgcb_returns_null", - test_cr_xml_parse_main_metadata_together_03_newpkgcb_returns_null); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_04_newpkgcb_interrupt", - test_cr_xml_parse_main_metadata_together_04_newpkgcb_interrupt); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_05_pkgcb_interrupt", - test_cr_xml_parse_main_metadata_together_05_pkgcb_interrupt); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_06_warnings_bad_file_type", - test_cr_xml_parse_main_metadata_together_06_warnings_bad_file_type); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_07_warningcb_interrupt", - test_cr_xml_parse_main_metadata_together_07_warningcb_interrupt); - - g_test_add_func("/xml_parser_filelists/test_cr_xml_parse_main_metadata_together_08_long_primary", - test_cr_xml_parse_main_metadata_together_08_long_primary); - - return g_test_run(); -} diff --git a/tests/testdata/modified_repo_files/long_primary.xml b/tests/testdata/modified_repo_files/long_primary.xml deleted file mode 100644 index 41d8a89..0000000 --- a/tests/testdata/modified_repo_files/long_primary.xml +++ /dev/null @@ -1,1060 +0,0 @@ - - - - fake_bash - x86_64 - - 90f61e546938a11449b710160ad294618a5bd3062e46f8cf851fd0088af184b7 - Fake bash - Fake bash package - - http://fake_bash_shell.com/ - - - super_kernel - x86_64 - - 6d43a638af70ef899933b1fd86a866f18f65b0e0e17dcbf2e42bfd0cdd7c63c3 - Test package - This package has provides, requires, obsoletes, conflicts options. - - http://so_super_kernel.com/it_is_awesome/yep_it_really_is - - diff --git a/tests/testdata/modified_repo_files/repo_02_different_order_filelists.xml b/tests/testdata/modified_repo_files/repo_02_different_order_filelists.xml deleted file mode 100644 index 4953c95..0000000 --- a/tests/testdata/modified_repo_files/repo_02_different_order_filelists.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - /usr/bin/super_kernel - /usr/share/man/super_kernel.8.gz - - - - - - /usr/bin/fake_bash - - - -- 2.34.3