[gentoo-commits] proj/javatoolkit:master commit in: src/test/, src/javatoolkit/

[gentoo-commits] proj/javatoolkit:master commit in: src/test/, src/javatoolkit/

[Arthur Zamarin]

commit:     22b743fe64398a78be8a3624a35898a9e2273570
Author:     Andrei Horodniceanu <a.horodniceanu <AT> proton <DOT> me>
AuthorDate: Tue Mar  4 09:41:44 2025 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  8 11:32:11 2025 +0000
URL:        https://gitweb.gentoo.org/proj/javatoolkit.git/commit/?id=22b743fe

cvv.py: Drop ClassFile information from SkippedModuleInfo

If a file should be skipped there's no reason to analyze it.

Signed-off-by: Andrei Horodniceanu <a.horodniceanu <AT> proton.me>
Closes: https://github.com/gentoo/javatoolkit/pull/3
Approved-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 src/javatoolkit/cvv.py | 12 ++++++------
 src/test/test_cvv.py   |  5 +----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/src/javatoolkit/cvv.py b/src/javatoolkit/cvv.py
index ac92163..0ca8023 100644
--- a/src/javatoolkit/cvv.py
+++ b/src/javatoolkit/cvv.py
@@ -46,7 +46,8 @@ class SkippedVersionDir:
 
 
 @dataclass
-class SkippedModuleInfo(ClassFile):
+class SkippedModuleInfo:
+    loc: Loc
     reason: str = 'A module-info requires java release >= 9'
 
 
@@ -70,16 +71,15 @@ class CVVMagic:
         if target_version is None:
             target_version = self.target
 
+        if CVVMagic.__is_module_info(loc) and target_version < 9:
+            self.__on_skipped(SkippedModuleInfo(loc))
+            return
+
         cf = ClassFile(
             loc,
             encoded_version=self.__format_version(version),
             expected_version=self.__format_version(target_version))
 
-        if CVVMagic.__is_module_info(loc) and target_version < 9:
-            self.__on_skipped(SkippedModuleInfo(
-                cf.loc, cf.encoded_version, cf.expected_version))
-            return
-
         if version <= target_version:
             self.__on_good(cf)
         else:

diff --git a/src/test/test_cvv.py b/src/test/test_cvv.py
index 616cb8c..e872161 100644
--- a/src/test/test_cvv.py
+++ b/src/test/test_cvv.py
@@ -88,9 +88,6 @@ class SimpleTest(TestCase):
                 loc=jar_loc(path)
             )
 
-        def make_skip(path: str, ver: str) -> cvv.SkippedModuleInfo:
-            return cvv.SkippedModuleInfo(jar_loc(path), ver, '1.8')
-
         self.assertListEqual(my_sort(m.good), [
             make_class('Main.class', '1.8'),
         ])
@@ -98,7 +95,7 @@ class SimpleTest(TestCase):
             make_class('my/deep/module/Foo.class', '10'),
         ])
         self.assertListEqual(my_sort(m.skipped), [
-            make_skip('module-info.class', '9'),
+            cvv.SkippedModuleInfo(jar_loc('module-info.class')),
         ])
 
     def test_multirelease_jar(self) -> None: