Modular advisories unit-test fixes

- Adds module requires to have more logical test data. - Removes redundant test. - Fixes wrong and outdated comments.
rpm-software-management · Jun 3, 2021 · 1ecfa6a · 1ecfa6a
1 parent 6c2ac67
commit 1ecfa6a
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 37 deletions.
diff --git a/data/tests/advisories/modules.yaml b/data/tests/advisories/modules.yaml
@@ -32,6 +32,9 @@ data:
   license:
     module:
     - MIT
+  dependencies:
+  - requires:
+      perl: ["5.23"]
   profiles:
     default:
       rpms: ["test-perl-DBI"]
@@ -52,6 +55,9 @@ data:
   license:
     module:
     - MIT
+  dependencies:
+  - requires:
+      perl: ["5.23"]
   profiles:
     default:
       rpms: ["test-perl-DBI"]

diff --git a/data/tests/advisories/repodata/modules.yaml.gz b/data/tests/advisories/repodata/modules.yaml.gz
diff --git a/data/tests/advisories/repodata/primary.xml.gz b/data/tests/advisories/repodata/primary.xml.gz
diff --git a/data/tests/advisories/repodata/repomd.xml b/data/tests/advisories/repodata/repomd.xml
@@ -1,43 +1,43 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
-  <revision>1612879414</revision>
+  <revision>1621268151</revision>
   <data type="primary">
-    <checksum type="sha256">b69e4467719314fdb155872cf9c8e895d5b169c0506c5180c512d693c48f0f4b</checksum>
-    <open-checksum type="sha256">8606d1f777859f167f7bd0bf8a1d532abedcb4db143b719e631e1040800fd1f0</open-checksum>
+    <checksum type="sha256">85618a80c1345a3010253df7257766980209f86697d979bfe18ea11707a6047d</checksum>
+    <open-checksum type="sha256">167f862cc208d46dd58b2702c86abad087383c03c3030ed714c7baeff2d00cca</open-checksum>
     <location href="repodata/primary.xml.gz"/>
-    <timestamp>1612879414</timestamp>
-    <size>743</size>
+    <timestamp>1621268151</timestamp>
+    <size>744</size>
     <open-size>2665</open-size>
   </data>
   <data type="filelists">
     <checksum type="sha256">efbf7f021163a3c7698a257351e327102c60bb39a7bdceee77c421f064205e99</checksum>
     <open-checksum type="sha256">ca5620e2734574d04d3c01ae5a72f865313369954698d71776076b9cbd831bbd</open-checksum>
     <location href="repodata/filelists.xml.gz"/>
-    <timestamp>1612879414</timestamp>
+    <timestamp>1621268151</timestamp>
     <size>311</size>
     <open-size>511</open-size>
   </data>
   <data type="other">
     <checksum type="sha256">6673953e1f28f55b9d4c3f38a9e3c0e0ff88ad06fb693b7f15eb241a81b80d71</checksum>
     <open-checksum type="sha256">0997c242bf1b96372d7a625a73de23dced68cae9375baff0c73215a07693b3f4</open-checksum>
     <location href="repodata/other.xml.gz"/>
-    <timestamp>1612879414</timestamp>
+    <timestamp>1621268151</timestamp>
     <size>310</size>
     <open-size>507</open-size>
   </data>
   <data type="modules">
-    <checksum type="sha256">a815d0669b15b97dd6260713405c79045eeda10aedb6460a0f742b86cc236cca</checksum>
-    <open-checksum type="sha256">0d1063b74e3a7cb4c7cdc3b2080b1901c347693140765534f8c5c3d8b964778a</open-checksum>
+    <checksum type="sha256">20062f5451a8da7a8951336f119f6a8f7411286849b53dc8a179c75270b73216</checksum>
+    <open-checksum type="sha256">6a10d0c26f84f5f74d9ecc379016dd9ed9b9d173a4db17f6dc90665d8563fdea</open-checksum>
     <location href="repodata/modules.yaml.gz"/>
-    <timestamp>1612879414</timestamp>
-    <size>300</size>
-    <open-size>1019</open-size>
+    <timestamp>1621268151</timestamp>
+    <size>331</size>
+    <open-size>1117</open-size>
   </data>
   <data type="updateinfo">
     <checksum type="sha256">9d791d16c2adc2d7d4c85b45f2a704edac62a926b09fc20df73207f4190acd49</checksum>
     <open-checksum type="sha256">3cf7df860860ac7a4a8e64a1a2d71c1ec43225dacbfe09a0cff80f28be3825da</open-checksum>
     <location href="repodata/updateinfo.xml.gz"/>
-    <timestamp>1612879414</timestamp>
+    <timestamp>1621268151</timestamp>
     <size>708</size>
     <open-size>2414</open-size>
   </data>

diff --git a/tests/libdnf/sack/AdvisoryTest.cpp b/tests/libdnf/sack/AdvisoryTest.cpp
@@ -91,19 +91,6 @@ void AdvisoryTest::testGetPackages()
     CPPUNIT_ASSERT(pkgsvector.size() == 4);
 }
 
-void AdvisoryTest::testGetApplicablePackagesModulesNotSetup()
-{
-    std::vector<libdnf::AdvisoryPkg> pkgsvector;
-
-    // When modules are not setup all advisory collections are applicable and we get all packages
-    advisory->getApplicablePackages(pkgsvector);
-    CPPUNIT_ASSERT(pkgsvector.size() == 4);
-    CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[0].getNameString(), "test-perl-DBI"));
-    CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[1].getNameString(), "test-perl-DBI-new-collection-override"));
-    CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[2].getNameString(), "test-perl-DBI"));
-    CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[3].getNameString(), "not-present"));
-}
-
 void AdvisoryTest::testGetApplicablePackagesModulesSetupNoneEnabled()
 {
     std::vector<libdnf::AdvisoryPkg> pkgsvector;
@@ -122,16 +109,14 @@ void AdvisoryTest::testGetApplicablePackagesOneApplicableCollection()
 {
     std::vector<libdnf::AdvisoryPkg> pkgsvector;
 
-    // When I keep enabled only perl-DBI module I get packages from all collections that contain that module
+    // When I keep enabled only perl module I get packages from all collections that contain that module
     libdnf::ModulePackageContainer * modules = dnf_sack_get_module_container(sack);
-    modules->reset("perl");
+    modules->reset("perl-DBI");
     dnf_sack_filter_modules_v2(sack, modules, nullptr, tmpdir, nullptr, true, false, false);
 
     advisory->getApplicablePackages(pkgsvector);
-    CPPUNIT_ASSERT(pkgsvector.size() == 3);
-    CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[0].getNameString(), "test-perl-DBI"));
-    CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[1].getNameString(), "test-perl-DBI-new-collection-override"));
-    CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[2].getNameString(), "test-perl-DBI"));
+    CPPUNIT_ASSERT(pkgsvector.size() == 1);
+    CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[0].getNameString(), "not-present"));
 }
 
 void AdvisoryTest::testGetApplicablePackagesMultipleApplicableCollections()

diff --git a/tests/libdnf/sack/AdvisoryTest.hpp b/tests/libdnf/sack/AdvisoryTest.hpp
@@ -19,7 +19,6 @@ class AdvisoryTest : public CppUnit::TestCase
         CPPUNIT_TEST(testGetSeverity);
         CPPUNIT_TEST(testGetTitle);
         CPPUNIT_TEST(testGetPackages);
-        CPPUNIT_TEST(testGetApplicablePackagesModulesNotSetup);
         CPPUNIT_TEST(testGetApplicablePackagesModulesSetupNoneEnabled);
         CPPUNIT_TEST(testGetApplicablePackagesOneApplicableCollection);
         CPPUNIT_TEST(testGetApplicablePackagesMultipleApplicableCollections);
@@ -38,7 +37,6 @@ class AdvisoryTest : public CppUnit::TestCase
     void testGetSeverity();
     void testGetTitle();
     void testGetPackages();
-    void testGetApplicablePackagesModulesNotSetup();
     void testGetApplicablePackagesModulesSetupNoneEnabled();
     void testGetApplicablePackagesOneApplicableCollection();
     void testGetApplicablePackagesMultipleApplicableCollections();

diff --git a/tests/libdnf/sack/QueryTest.cpp b/tests/libdnf/sack/QueryTest.cpp
@@ -59,7 +59,7 @@ void QueryTest::testQueryGetAdvisoryPkgs()
     HyQuery query = new libdnf::Query(sack);
     std::vector<libdnf::AdvisoryPkg> advisoryPkgs;
 
-    // When modules are not setup all advisory collections are applicable
+    // Starting with perl and perl-DBI enabled
     query->getAdvisoryPkgs(HY_EQ, advisoryPkgs);
     CPPUNIT_ASSERT(advisoryPkgs.size() == 2);
     // We get test-perl-DBI twice because its in two collections
@@ -84,7 +84,7 @@ void QueryTest::testQueryGetAdvisoryPkgs()
     query->getAdvisoryPkgs(HY_EQ, advisoryPkgs);
     CPPUNIT_ASSERT(advisoryPkgs.size() == 0);
 
-    // When I enable a module from multiple collections that contain a present package I get them
+    // When I enable a module with multiple collections I will receave advisory packages only for active context
     CPPUNIT_ASSERT(modules->enable("perl-DBI", "master", false));
     dnf_sack_filter_modules_v2(sack, modules, nullptr, tmpdir, nullptr, true, false, false);
 
@@ -99,7 +99,7 @@ void QueryTest::testQueryGetAdvisoryPkgs()
 
 void QueryTest::testQueryFilterAdvisory()
 {
-    // When modules are not setup all advisory collections are applicable and there is no modular filtering
+    // Starting with perl and perl-DBI enabled
     HyQuery query = new libdnf::Query(sack);
     query->addFilter(HY_PKG_ADVISORY_TYPE, HY_EQ, "enhancement");
     CPPUNIT_ASSERT(query->size() == 2);