Fixed duplicates in U.EXE, added simple test (#26)

old-games · May 14, 2024 · 4842bc7 · 4842bc7
1 parent 3a86f67
commit 4842bc7
Show file tree

Hide file tree

Showing 14 changed files with 112 additions and 61 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,3 @@
+.dockerignore
+Dockerfile
+docker-compose.yml
diff --git a/Dockerfile b/Dockerfile
@@ -12,9 +12,10 @@ RUN python3 -m tools.build
 RUN unzip UltimaVI-ru.zip 
 RUN rm UltimaVI-ru.zip
 RUN mv UltimaVI-ru/* .
-RUN rm -rf UltimaVI-ru
+RUN rmdir UltimaVI-ru
 
 COPY tools/RK.COM .
+COPY tools/RK211.COM .
 COPY tools/RUSSIAN.RK .
 COPY tools/8X16.RK .
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,6 +8,7 @@ services:
 
   test:
     build: .
+    pull_policy: build
     environment:
     - DISPLAY
     volumes:

diff --git a/patches/bad-references.json b/patches/bad-references.json
@@ -14,6 +14,30 @@
             38281
         ]
     },
+    {
+        "source": "U.EXE",
+        "offset": 92153,
+        "bad-references": [
+            109972
+        ]
+    },
+    {
+        "source": "U.EXE",
+        "offset": 92158,
+        "bad-references": [
+            109976,
+            109980,
+            109984
+        ]
+    },
+    {
+        "source": "U.EXE",
+        "offset": 92318,
+        "bad-references": [
+            73438,
+            73440
+        ]
+    },
     {
         "source": "U.EXE",
         "offset": 94748,

diff --git a/screenshots/U/exit.png b/screenshots/U/exit.png
diff --git a/screenshots/U/menu.png b/screenshots/U/menu.png
diff --git a/testbox b/testbox
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -1,6 +1,10 @@
 import os
+import shutil
+import time
 import unittest
 
+import testbox
+
 
 class TestCase(unittest.TestCase):
     def __init__(self, *args, **kwargs):
@@ -10,3 +14,44 @@ def __init__(self, *args, **kwargs):
     @property
     def script_path(self):
         return self.__script_path
+
+
+class InstalledTestCase(unittest.TestCase):
+    def setUp(self):
+        configuration = {
+            'cpu': {
+                'cycles': 'max',
+            },
+            'render': {
+                'scaler': 'normal2x forced',
+            },
+        }
+
+        with testbox.TestBox(
+            [
+                '-c', 'MOUNT C: .',
+                '-c', 'C:',
+                'INSTALL.EXE',
+            ],
+            configuration,
+            timeout_error=AssertionError,
+        ) as box:
+            for keys in (
+                'H', # Hard disk.
+                'C', # Drive C:.
+                '5', # VGA.
+                'Y', # Mouse.
+                '1', # Adlib.
+                '\r', # Default port.
+                'Y', # Everything is correct.
+            ):
+                box.send_keys(keys)
+                time.sleep(0.1)
+
+            box.wait_image('screenshots/INSTALL/install.png', bbox=(0, 16, 640, 400), timeout=1)
+            self.assertTrue(os.path.isfile('CONFIG.U6'))
+
+    def tearDown(self):
+        os.remove('MAP')
+        os.remove('CONFIG.U6')
+        shutil.rmtree('SAVEGAME')
diff --git a/tests/test_end.py b/tests/test_end.py
@@ -7,9 +7,6 @@
 
 class TestEnd(tests.TestCase):
     def testEnd(self):
-        with open('CONFIG.U6', 'wb') as f:
-            f.write(b'\x76\x6d\x61\x33\x38\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-
         configuration = {
             'cpu': {
                 'cycles': 'max',
@@ -66,10 +63,7 @@ def testEnd(self):
             box.send_keys(' ')
             box.wait_image('screenshots/END/clear.png', timeout=1)
 
-    def testEndNoArguments(self):
-        with open('CONFIG.U6', 'wb') as f:
-            f.write(b'\x76\x6d\x61\x33\x38\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-
+    def testNoArguments(self):
         configuration = {
             'cpu': {
                 'cycles': 'max',
@@ -83,8 +77,8 @@ def testEndNoArguments(self):
             [
                 '-c', 'MOUNT C: .',
                 '-c', 'C:',
-                '-c', 'DEBUG END.EXE',
-                '-c', 'CLS',
+                '-c', 'END.EXE',
+                '-c', 'CLS'
             ],
             configuration,
             timeout_error=AssertionError,

diff --git a/tests/test_game.py b/tests/test_game.py
@@ -5,12 +5,9 @@
 import tests
 
 
-class TestGame(tests.TestCase):
+class TestGame(tests.InstalledTestCase):
     @unittest.skip('TBD')
     def testGame(self):
-        with open('CONFIG.U6', 'wb') as f:
-            f.write(b'\x76\x6d\x61\x33\x38\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-
         # FIXME игре нужен созданный персонаж
 
         configuration = {

diff --git a/tests/test_install.py b/tests/test_install.py
@@ -1,44 +1,7 @@
-import time
-
-import testbox
 import tests
 
 
-class TestInstall(tests.TestCase):
+class TestInstall(tests.InstalledTestCase):
     def testInstall(self):
-        configuration = {
-            'cpu': {
-                'cycles': 'max',
-            },
-            'render': {
-                'scaler': 'normal2x forced',
-            },
-        }
-
-        with testbox.TestBox(
-            [
-                '-c', 'MOUNT C: .',
-                '-c', 'C:',
-                '-c', 'RK.COM /L:RUSSIAN.RK /F:8X16.RK',
-                'INSTALL.EXE',
-            ],
-            configuration,
-            timeout_error=AssertionError,
-        ) as box:
-            for keys in (
-                'H', # Hard disk.
-                'C', # Drive C:.
-                '5', # VGA.
-                'Y', # Mouse.
-                '1', # Adlib.
-                '\r', # Default port.
-                'Y', # Everything is correct.
-                '2', # Don't create character.
-            ):
-                # FIXME save screenshots and pack as artifacts.
-                box.send_keys(keys)
-                time.sleep(0.1)
-            box.wait_image('screenshots/INSTALL/install.png', bbox=(0, 16, 640, 400), timeout=1)
-
-            with open('CONFIG.U6', 'rb') as f:
-                self.assertEqual(f.read(), b'\x76\x6d\x61\x33\x38\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
+        with open('CONFIG.U6', 'rb') as f:
+            self.assertEqual(f.read(), b'\x76\x6d\x61\x33\x38\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
diff --git a/tests/test_u.py b/tests/test_u.py
@@ -1,16 +1,39 @@
+import os
 import time
 import unittest
 
 import testbox
 import tests
 
 
-class TestU(tests.TestCase):
+class TestU(tests.InstalledTestCase):
+    def testExitWithDriver(self):
+        configuration = {
+            'cpu': {
+                'cycles': 'max',
+            },
+            'render': {
+                'scaler': 'normal5x',
+            },
+        }
+
+        with testbox.TestBox(
+            [
+                '-c', 'MOUNT C: .',
+                '-c', 'C:',
+                '-c', 'RK211.COM /L:RUSSIAN.RK /F:8X16.RK', # FIXME `RK.COM`
+                'U.EXE',
+            ],
+            configuration,
+            timeout_error=AssertionError,
+        ) as box:
+            box.send_keys('\x1b') # Esc.
+            box.wait_image('screenshots/U/menu.png', timeout=6)
+            box.send_keys('\x11') # Ctrl+Q.
+            box.wait_image('screenshots/U/exit.png', timeout=1)
+
     @unittest.skip('TBD')
     def testU(self):
-        with open('CONFIG.U6', 'wb') as f:
-            f.write(b'\x76\x6d\x61\x33\x38\x38\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00')
-
         configuration = {
             'cpu': {
                 'cycles': 'max',
@@ -25,7 +48,7 @@ def testU(self):
                 '-c', 'MOUNT C: .',
                 '-c', 'C:',
                 '-c', 'RK.COM /L:RUSSIAN.RK /F:8X16.RK',
-    #            'U.EXE',
+                'U.EXE',
             ],
             configuration,
             timeout_error=AssertionError,

diff --git a/tools/RK211.COM b/tools/RK211.COM
diff --git a/tools/duplicates.py b/tools/duplicates.py
@@ -19,4 +19,4 @@
 
 for k, v in references.items():
     if len(v) > 1:
-        print('WARNING', k[0], k[1], len(v), 'references')
+        print('WARNING', k[0], hex(k[1]), len(v), 'references:', ', '.join((hex(x['origin']) for x in v)))