Skip to content

Testing #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 40 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: Busted


on: [push, pull_request]


jobs:
test:
runs-on: ubuntu-latest

steps:
- name: checkout
uses: actions/checkout@v2
with:
submodules: true

- name: get lua
uses: leafo/gh-actions-lua@v10
with:
luaVersion: "5.1"

- name: get luarocks
uses: leafo/gh-actions-luarocks@v4
with:
luaVersion: "5.1"

- name: get busted and luasocket
run: |
luarocks install busted
luarocks install luasocket
luarocks install luasec

- name: fetch dependencies
run: |
chmod +x ./fetch-deps.sh
./fetch-deps.sh

- name: test
run: |
busted tests
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/libs
7 changes: 7 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"Lua.diagnostics.globals": [
"describe",
"before_each",
"it"
]
}
56 changes: 56 additions & 0 deletions fetch-deps.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#!/bin/bash

# ---- Whats happening ---- #

# This fetches the dependencies listed in the "libs" variable and saves them in the targetFolder

set -e

libs=(
"TestSuite-lib"
"TurtleEmulator-lib"
"scanner-lib"
"turtleController-lib"
"ccClass-lib"
"miningClient-lib"
"helperFunctions-lib"
"eventHandler-lib"
"turtleResourceManager-lib"
"config-lib"
)

# Basic setup variables
repo="mc-cc-scripts"
branch="master"
targetFolderName=libs


# fetch files.txt and save each file into the targetFolder
fetch() {
files_txt=$(curl -fsSL "https://github.com/$repo/$1/$branch/files.txt")
if [ -z "$files_txt" ]; then
echo "Could not load files.txt for $1"
exit 1
fi
while IFS= read -r FILE; do
url="https://github.com/$repo/$1/$branch/$FILE"

mkdir -p "$(dirname "$targetFolderName/$FILE")" # create the folder (and subfolders specified in the files.txt)
rm -f $targetFolderName/$FILE.lua # rm existing file
if ! curl -s -o "$targetFolderName/$FILE" "$url"; then
echo "could not get / write the file $i: '$FILE' to the folder '$targetFolderName'"
exit 1
fi
# echo "saved $1: '$FILE' in '$targetFolderName'"
done < <(echo "$files_txt")
}

if [[ $# -eq 0 ]]; then
# No arguments given, fetch all
for i in "${libs[@]}"; do
fetch "$i"
done
else
# Argument given, fetch arguemt
fetch "$1"
fi
1 change: 0 additions & 1 deletion libs/miningClient-lib
Submodule miningClient-lib deleted from e7268f
8 changes: 1 addition & 7 deletions miningClientSmall.lua
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
--Requirements
local pretty = require "cc.pretty"

---@class scm
local scm = require("./scm")
---@class SettingManager
local sM = scm:load("settingsManager")
---@class HelperFunctions
local helper = scm:load("helperFunctions")
---@class miningLib
Expand Down Expand Up @@ -53,7 +48,6 @@ local function config()
};
miningSettings = sM.setget('MiningSettings', miningSettings, miningSettings);
end
pretty.pretty_print(miningSettings)
end

---main script Function
Expand Down Expand Up @@ -87,4 +81,4 @@ local function main()
miningLib:main(points);
end

main()
main()
260 changes: 260 additions & 0 deletions scanResultMock.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
return {
{
y = 0,
x = -1,
name = "minecraft:deepslate_iron_ore",
z = -2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 1,
x = -1,
name = "minecraft:deepslate_iron_ore",
z = -2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = -1,
name = "minecraft:deepslate_iron_ore",
z = -2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = -1,
name = "minecraft:deepslate_iron_ore",
z = -1,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = -1,
name = "minecraft:deepslate_iron_ore",
z = 0,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = -1,
name = "minecraft:deepslate_iron_ore",
z = 1,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = -1,
name = "minecraft:deepslate_iron_ore",
z = 2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 0,
x = 0,
name = "minecraft:deepslate_iron_ore",
z = -2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 0,
x = 0,
name = "computercraft:turtle_advanced",
z = 0,
tags = {
"minecraft:block/computercraft:turtle",
"minecraft:block/minecraft:mineable/pickaxe",
},
},
{
y = 1,
x = 0,
name = "minecraft:deepslate_iron_ore",
z = -2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = 0,
name = "minecraft:deepslate_iron_ore",
z = 2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 1,
x = 1,
name = "minecraft:deepslate_iron_ore",
z = -2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = 1,
name = "minecraft:deepslate_iron_ore",
z = -2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = 1,
name = "minecraft:deepslate_iron_ore",
z = 2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = 2,
name = "minecraft:deepslate_iron_ore",
z = -2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 2,
x = 2,
name = "minecraft:deepslate_iron_ore",
z = 2,
tags = {
"minecraft:block/minecraft:mineable/pickaxe",
"minecraft:block/forge:ores/iron",
"minecraft:block/minecraft:needs_stone_tool",
"minecraft:block/minecraft:overworld_carver_replaceables",
"minecraft:block/forge:ore_rates/singular",
"minecraft:block/forge:ores_in_ground/deepslate",
"minecraft:block/forge:ores",
"minecraft:block/minecraft:iron_ores",
},
},
{
y = 0,
x = 1,
name = "minecraft:dirt",
z = -3,
tags = {
},
},
}
Loading
Loading