mirrors
/
CC-Tweaked
mirror of https://github.com/SquidDev-CC/CC-Tweaked
1
0
Fork 0
Code Issues Releases Wiki Activity

Make rednet.run a little more strict 

Also add a test for rednet message sending. Hopefully gives some of the
modem and networking code a little bit of coverage (which is clearly the
same as being right :p).
This commit is contained in:
Jonathan Coates 2021-07-23 23:53:40 +01:00
parent 924b8ef30f
commit b31e66686d
No known key found for this signature in database
GPG Key ID: B9E431FF07C98D06
8 changed files with 600 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/data/computercraft/lua/rom/apis/rednet.lua
View File

@ -351,12 +351,12 @@ function run()
-- Got a modem message, process it and add it to the rednet event queue
local sModem, nChannel, nReplyChannel, tMessage = p1, p2, p3, p4
if isOpen(sModem) and (nChannel == os.getComputerID() or nChannel == CHANNEL_BROADCAST) then
if type(tMessage) == "table" and tMessage.nMessageID then
if not tReceivedMessages[tMessage.nMessageID] then
tReceivedMessages[tMessage.nMessageID] = true
tReceivedMessageTimeouts[os.startTimer(30)] = tMessage.nMessageID
os.queueEvent("rednet_message", nReplyChannel, tMessage.message, tMessage.sProtocol)
end
if type(tMessage) == "table" and type(tMessage.nMessageID) == "number"
and tMessage.nMessageID == tMessage.nMessageID and not tReceivedMessages[tMessage.nMessageID]
then
tReceivedMessages[tMessage.nMessageID] = true
tReceivedMessageTimeouts[os.startTimer(30)] = tMessage.nMessageID
os.queueEvent("rednet_message", nReplyChannel, tMessage.message, tMessage.sProtocol)
end
end

13
src/test/java/dan200/computercraft/ingame/CraftOsTest.kt Normal file
View File

@ -0,0 +1,13 @@
package dan200.computercraft.ingame
import dan200.computercraft.ingame.api.GameTest
import dan200.computercraft.ingame.api.TestContext
import dan200.computercraft.ingame.api.checkComputerOk
class CraftOsTest {
/**
* Sends a rednet message to another a computer and back again.
*/
@GameTest
suspend fun `Sends basic rednet messages`(context: TestContext) = context.checkComputerOk(13)
}

2
src/test/server-files/computers/computer/11/startup.lua
View File

@ -1,3 +1,5 @@
-- TurtleTest.`Use compostors`
test.eq(true, turtle.dropDown(), "Drop items into compostor")
test.ok()

2
src/test/server-files/computers/computer/12/startup.lua
View File

@ -1,3 +1,5 @@
-- TurtleTest.`Cleaned with cauldrons`
local old_details = turtle.getItemDetail(1, true)
test.assert(turtle.place(), "Dyed turtle")

14
src/test/server-files/computers/computer/13/startup.lua Normal file
View File

@ -0,0 +1,14 @@
-- CraftOsTest.`Sends basic rednet messages`
rednet.open("top")
rednet.send(14, "Test msg")
local id, msg
repeat
id, msg = rednet.receive()
print(id, msg)
until id == 14
test.eq("Test msg", msg)
test.ok()

7
src/test/server-files/computers/computer/14/startup.lua Normal file
View File

@ -0,0 +1,7 @@
-- CraftOsTest.`Sends basic rednet messages`
rednet.open("top")
while true do
local id, msg, protocol = rednet.receive()
rednet.send(id, msg, protocol)
end

2
src/test/server-files/computers/ids.json
View File

@ -1,3 +1,3 @@
{
"computer": 12
"computer": 14
}

555
src/test/server-files/structures/craft_os_test.sends_basic_rednet_messages.snbt Normal file
View File

@ -0,0 +1,555 @@
{
size: [5, 5, 5],
entities: [],
blocks: [
{
pos: [0, 0, 0],
state: 0
},
{
pos: [1, 0, 0],
state: 0
},
{
pos: [2, 0, 0],
state: 0
},
{
pos: [3, 0, 0],
state: 0
},
{
pos: [4, 0, 0],
state: 0
},
{
pos: [0, 0, 1],
state: 0
},
{
pos: [1, 0, 1],
state: 0
},
{
pos: [2, 0, 1],
state: 0
},
{
pos: [3, 0, 1],
state: 0
},
{
pos: [4, 0, 1],
state: 0
},
{
pos: [0, 0, 2],
state: 0
},
{
pos: [1, 0, 2],
state: 0
},
{
pos: [2, 0, 2],
state: 0
},
{
pos: [3, 0, 2],
state: 0
},
{
pos: [4, 0, 2],
state: 0
},
{
pos: [0, 0, 3],
state: 0
},
{
pos: [1, 0, 3],
state: 0
},
{
pos: [2, 0, 3],
state: 0
},
{
pos: [3, 0, 3],
state: 0
},
{
pos: [4, 0, 3],
state: 0
},
{
pos: [0, 0, 4],
state: 0
},
{
pos: [1, 0, 4],
state: 0
},
{
pos: [2, 0, 4],
state: 0
},
{
pos: [3, 0, 4],
state: 0
},
{
pos: [4, 0, 4],
state: 0
},
{
nbt: {
Label: "Echo",
id: "computercraft:computer_advanced",
ComputerId: 14,
On: 1b
},
pos: [1, 1, 2],
state: 1
},
{
nbt: {
Label: "Main",
id: "computercraft:computer_advanced",
ComputerId: 13,
On: 1b
},
pos: [3, 1, 2],
state: 2
},
{
nbt: {
id: "computercraft:wireless_modem_normal"
},
pos: [1, 2, 2],
state: 3
},
{
nbt: {
id: "computercraft:wireless_modem_normal"
},
pos: [3, 2, 2],
state: 3
},
{
pos: [0, 1, 0],
state: 4
},
{
pos: [1, 1, 0],
state: 4
},
{
pos: [2, 1, 0],
state: 4
},
{
pos: [3, 1, 0],
state: 4
},
{
pos: [4, 1, 0],
state: 4
},
{
pos: [0, 2, 0],
state: 4
},
{
pos: [1, 2, 0],
state: 4
},
{
pos: [2, 2, 0],
state: 4
},
{
pos: [3, 2, 0],
state: 4
},
{
pos: [4, 2, 0],
state: 4
},
{
pos: [0, 3, 0],
state: 4
},
{
pos: [1, 3, 0],
state: 4
},
{
pos: [2, 3, 0],
state: 4
},
{
pos: [3, 3, 0],
state: 4
},
{
pos: [4, 3, 0],
state: 4
},
{
pos: [0, 4, 0],
state: 4
},
{
pos: [1, 4, 0],
state: 4
},
{
pos: [2, 4, 0],
state: 4
},
{
pos: [3, 4, 0],
state: 4
},
{
pos: [4, 4, 0],
state: 4
},
{
pos: [0, 1, 1],
state: 4
},
{
pos: [1, 1, 1],
state: 4
},
{
pos: [2, 1, 1],
state: 4
},
{
pos: [3, 1, 1],
state: 4
},
{
pos: [4, 1, 1],
state: 4
},
{
pos: [0, 2, 1],
state: 4
},
{
pos: [1, 2, 1],
state: 4
},
{
pos: [2, 2, 1],
state: 4
},
{
pos: [3, 2, 1],
state: 4
},
{
pos: [4, 2, 1],
state: 4
},
{
pos: [0, 3, 1],
state: 4
},
{
pos: [1, 3, 1],
state: 4
},
{
pos: [2, 3, 1],
state: 4
},
{
pos: [3, 3, 1],
state: 4
},
{
pos: [4, 3, 1],
state: 4
},
{
pos: [0, 4, 1],
state: 4
},
{
pos: [1, 4, 1],
state: 4
},
{
pos: [2, 4, 1],
state: 4
},
{
pos: [3, 4, 1],
state: 4
},
{
pos: [4, 4, 1],
state: 4
},
{
pos: [0, 1, 2],
state: 4
},
{
pos: [2, 1, 2],
state: 4
},
{
pos: [4, 1, 2],
state: 4
},
{
pos: [0, 2, 2],
state: 4
},
{
pos: [2, 2, 2],
state: 4
},
{
pos: [4, 2, 2],
state: 4
},
{
pos: [0, 3, 2],
state: 4
},
{
pos: [1, 3, 2],
state: 4
},
{
pos: [2, 3, 2],
state: 4
},
{
pos: [3, 3, 2],
state: 4
},
{
pos: [4, 3, 2],
state: 4
},
{
pos: [0, 4, 2],
state: 4
},
{
pos: [1, 4, 2],
state: 4
},
{
pos: [2, 4, 2],
state: 4
},
{
pos: [3, 4, 2],
state: 4
},
{
pos: [4, 4, 2],
state: 4
},
{
pos: [0, 1, 3],
state: 4
},
{
pos: [1, 1, 3],
state: 4
},
{
pos: [2, 1, 3],
state: 4
},
{
pos: [3, 1, 3],
state: 4
},
{
pos: [4, 1, 3],
state: 4
},
{
pos: [0, 2, 3],
state: 4
},
{
pos: [1, 2, 3],
state: 4
},
{
pos: [2, 2, 3],
state: 4
},
{
pos: [3, 2, 3],
state: 4
},
{
pos: [4, 2, 3],
state: 4
},
{
pos: [0, 3, 3],
state: 4
},
{
pos: [1, 3, 3],
state: 4
},
{
pos: [2, 3, 3],
state: 4
},
{
pos: [3, 3, 3],
state: 4
},
{
pos: [4, 3, 3],
state: 4
},
{
pos: [0, 4, 3],
state: 4
},
{
pos: [1, 4, 3],
state: 4
},
{
pos: [2, 4, 3],
state: 4
},
{
pos: [3, 4, 3],
state: 4
},
{
pos: [4, 4, 3],
state: 4
},
{
pos: [0, 1, 4],
state: 4
},
{
pos: [1, 1, 4],
state: 4
},
{
pos: [2, 1, 4],
state: 4
},
{
pos: [3, 1, 4],
state: 4
},
{
pos: [4, 1, 4],
state: 4
},
{
pos: [0, 2, 4],
state: 4
},
{
pos: [1, 2, 4],
state: 4
},
{
pos: [2, 2, 4],
state: 4
},
{
pos: [3, 2, 4],
state: 4
},
{
pos: [4, 2, 4],
state: 4
},
{
pos: [0, 3, 4],
state: 4
},
{
pos: [1, 3, 4],
state: 4
},
{
pos: [2, 3, 4],
state: 4
},
{
pos: [3, 3, 4],
state: 4
},
{
pos: [4, 3, 4],
state: 4
},
{
pos: [0, 4, 4],
state: 4
},
{
pos: [1, 4, 4],
state: 4
},
{
pos: [2, 4, 4],
state: 4
},
{
pos: [3, 4, 4],
state: 4
},
{
pos: [4, 4, 4],
state: 4
}
],
palette: [
{
Name: "minecraft:polished_andesite"
},
{
Properties: {
facing: "north",
state: "on"
},
Name: "computercraft:computer_advanced"
},
{
Properties: {
facing: "north",
state: "blinking"
},
Name: "computercraft:computer_advanced"
},
{
Properties: {
waterlogged: "false",
facing: "down",
on: "true"
},
Name: "computercraft:wireless_modem_normal"
},
{
Name: "minecraft:air"
}
],
DataVersion: 2230
}