Add tests for CC:T 1.119

Author: neumond

tests/TDESC_CC.md

@@ -1,9 +1,13 @@
 `wget http://127.0.0.1:8000 py`
 
-# helloworld
+# helloworld.txt
 
 `py helloworld.py 42 abc`
 
-# term
+# shutdown.txt
 
-`py term.py`
+`py shutdown.py`
+
+# shutdown_reboot.txt
+
+`py shutdown.py reboot`

tests/cc_programs/commands.py

@@ -28,12 +28,14 @@ def __eq__(self, other):
         'x': xyz[0],
         'y': xyz[1],
         'z': xyz[2],
-        'ForgeCaps': {},
         'ComputerId': AnyInstanceOf(int),
         'id': 'computercraft:computer_command',
         'On': 1,
     },
-    'tags': {'computercraft:computer': True},
+    'tags': {
+        'computercraft:computer': True,
+        'minecraft:wither_immune': True,
+    },
 }
 
 assert commands.getBlockInfo(*xyz) == expected_binfo

tests/cc_programs/disk.py

@@ -43,7 +43,7 @@ def assert_raises(etype, message=None):
 assert disk.getLabel(s) is None
 assert disk.getID(s) is None
 assert disk.hasAudio(s) is False
-assert disk.getAudioTitle(s) is None
+assert disk.getAudioTitle(s) is False
 assert disk.playAudio(s) is None
 assert disk.stopAudio(s) is None
 assert disk.eject(s) is None

tests/cc_programs/fs.py

@@ -65,7 +65,7 @@ def __eq__(self, other):
 assert fs.isDriveRoot('rom') is True
 assert fs.isDriveRoot('tdir') is False
 assert fs.isDriveRoot('tfile') is False
-assert fs.isDriveRoot('doesnotexist') is True  # wtf?
+assert fs.isDriveRoot('doesnotexist') is False
 
 assert fs.getName('a/b/c/d') == 'd'
 assert fs.getName('a/b/c/') == 'c'
@@ -86,8 +86,8 @@ def __eq__(self, other):
 assert fs.getDir('/') == '..'
 assert fs.getDir('///') == '..'
 assert fs.getDir('.') == '..'
-assert fs.getDir('..') == ''
-assert fs.getDir('../../..') == '../..'
+assert fs.getDir('..') == '../..'
+assert fs.getDir('../../..') == '../../../..'
 
 assert fs.combine('a', 'b') == 'a/b'
 assert fs.combine('a/', 'b') == 'a/b'
@@ -175,8 +175,8 @@ def __eq__(self, other):
     assert f.readLine() == 'line'
     assert f.read(1) is None
     assert f.readLine() is None
-    assert f.readAll() is None
-    assert f.readAll() is None
+    assert f.readAll() == ''
+    assert f.readAll() == ''
 assert fs.getSize('tdir/banana') == 9
 with fs.open('tdir/banana', 'a') as f:
     assert f.write('x') is None

tests/cc_programs/peripheral_commandblock.py

@@ -4,6 +4,8 @@
 
 side = 'left'
 
+print('This test requires server config:')
+print('peripheral.command_block_enabled=true')
 _lib.step(f'Attach command block at {side} side of computer')
 
 m = peripheral.wrap(side)

tests/cc_programs/peripheral_disk.py

@@ -16,7 +16,7 @@
 assert d.getDiskLabel() is None
 assert d.getDiskID() is None
 assert d.hasAudio() is False
-assert d.getAudioTitle() is None
+assert d.getAudioTitle() is False
 assert d.playAudio() is None
 assert d.stopAudio() is None
 assert d.ejectDisk() is None

tests/cc_programs/peripheral_modem.py

@@ -44,13 +44,13 @@ def _recv():
     f'Attach wired modem to {side} side\n'
     f'Place another computer with wired modem on {side} side\n'
     'Connect modems\n'
-    'On another computer start py modem_server.py'
+    'On another computer start peripheral_modem_server.lua'
 )
 do_test()
 _lib.step(
     'Disconnect and remove wired modems\n'
     'Attach wireless modems\n'
-    'Restart modem_server.py on another computer'
+    'Restart peripheral_modem_server.lua on another computer'
 )
 do_test()
 print('Test finished successfully')

tests/cc_programs/peripheral_modem_server.lua

@@ -0,0 +1,14 @@
+side = 'back'
+m = peripheral.wrap(side)
+channel = 5
+m.close(channel)
+m.open(channel)
+while true do
+    local event, evside, evchannel, reply, msg, dist = os.pullEvent('modem_message')
+    if eside == side or evchannel == channel then
+        print('reply:', reply, 'msg:', msg, 'dist:', dist)
+        if msg == 'stop' then break end
+        m.transmit(reply, channel, msg)
+    end
+end
+m.close(channel)

tests/cc_programs/window.py

@@ -30,4 +30,8 @@
 win.reposition(21, 5)
 win.reposition(27, 5)
 
+os.sleep(1)
+
+term.clear()
+print()
 print('Test finished successfully')

tests/proto/m_1.20.1/cc_1.119.0/colors.txt

@@ -0,0 +1,48 @@
+R637:0[5]{:[1]<9>colors.py:[0]<2>py}<9>colors.py<589>from cc import colors
+
+cs = colors.combine(
+    colors.orange,
+    colors.cyan,
+    colors.pink,
+    colors.brown,
+)
+assert isinstance(cs, int)
+cs = colors.subtract(cs, colors.brown, colors.green)
+assert isinstance(cs, int)
+assert cs == colors.combine(
+    colors.orange,
+    colors.cyan,
+    colors.pink,
+)
+assert colors.test(cs, colors.red) is False
+assert colors.test(cs, colors.cyan) is True
+
+assert colors.packRGB(0.7, 0.2, 0.6) == 0xb23399
+r, g, b = colors.unpackRGB(0xb23399)
+assert 0.68 < r < 0.72
+assert 0.18 < g < 0.22
+assert 0.58 < b < 0.62
+
+print('Test finished successfully')
+
+S63:T<1>1<18>G:colors:M:combine{:[1][2]:[2][512]:[3][64]:[4][4096]}
+R26:T<1>1<17>{:[1]T:[2][4674]}
+S60:T<1>1<19>G:colors:M:subtract{:[1][4674]:[2][4096]:[3][8192]}
+R25:T<1>1<16>{:[1]T:[2][578]}
+S53:T<1>1<18>G:colors:M:combine{:[1][2]:[2][512]:[3][64]}
+R25:T<1>1<16>{:[1]T:[2][578]}
+S46:T<1>1<15>G:colors:M:test{:[1][578]:[2][16384]}
+R21:T<1>1<12>{:[1]T:[2]F}
+S44:T<1>1<15>G:colors:M:test{:[1][578]:[2][512]}
+R21:T<1>1<12>{:[1]T:[2]T}
+S56:T<1>1<18>G:colors:M:packRGB{:[1][0.7]:[2][0.2]:[3][0.6]}
+R30:T<1>1<21>{:[1]T:[2][11678617]}
+S45:T<1>1<20>G:colors:M:unpackRGB{:[1][11678617]}
+R59:T<1>1<50>{:[1]T:[2][0.69803921568627447]:[3][0.2]:[4][0.6]}
+S58:T<1>1<13>io.write(...){:[1]<26>Test finished successfully}
+R15:T<1>1<7>{:[1]T}
+S32:T<1>1<13>io.write(...){:[1]<1>
+}
+R15:T<1>1<7>{:[1]T}
+S2:CN
+R1:D