Apple-2-Tools/AppleCommander
1
0
Fork 0
mirror of https://github.com/AppleCommander/AppleCommander.git synced 2026-01-22 17:16:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #200 from AppleCommander/feature/command-line-testing

Browse Source 
Feature/command line testing
This commit is contained in:
A2 Geek
2025-10-08 20:12:36 -05:00
committed by GitHub
parent db68bf0ec9 d629d45214
commit ec2ff6fbed
5 changed files with 117 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/cli-acx/src/main/java/io/github/applecommander/acx/command/ExportCommand.java
View File

@@ -168,7 +168,7 @@ public class ExportCommand extends ReadOnlyDiskImageCommandOptions {
public void setAppleSingleExtraction(boolean flag) {
selectExportMethod(ExportMethod.APPLESINGLE);
}
@Option(names = { "--disassembly" }, description = "Dissassembly file.")
@Option(names = { "--disassemble", "--assembly", "--disassembly" }, description = "Disassemble file.")
public void setDisassemblyExtraction(boolean flag) {
selectExportMethod(ExportMethod.DISASSEMBLY);
}

39
app/cli-tests/src/test/resources/ac-config.yml
View File

@@ -48,3 +48,42 @@ tests:
- command: ac -d $disk TESTFILE
- command: ac -pt $disk TESTFILE
stdin: $txtfile
- name: big exercise
variables:
flag: ["-dos140", "-pro140"]
volname: ["", "TEST"]
disk: ["$testdisk.dsk", "$testdisk.po"]
format: ["Disk Format: DOS 3.3", "Disk Format: ProDOS"]
steps:
# Create our image
- command: ac $flag $disk $volname
- command: ac -pt $disk TEXTFILE
stdin: $txtfile
- command: ac -bas $disk BASFILE
stdin: $basfile
- command: ac -p $disk BINFILE BIN 0x300
stdin: $binfile
# List image
- command: ac -i $disk
match: contains
stdout: $format
- command: ac -l $disk
match: contains
stdout: TEXTFILE
# Verify contents of files
- command: ac -e $disk TEXTFILE
stdout: $txtfile
- command: ac -e $disk BASFILE
match: trim
stdout: |
10 TEXT : HOME
20 PRINT "HELLO, WORLD"
30 END
# 'ac' doesn't disassemble
- command: ac -e $disk BINFILE
stdout: |
Offset Hex Data Characters
======= ================================================ =================
$000300 20 2F FB 20 58 FC A0 0B B9 14 03 20 ED FD 88 D0 /{ X| . 9.. m}.P
$000310 F7 20 8E FD 60 C4 CC D2 CF D7 A0 CF CC CC C5 C8 w .}`DLR OW OLLEH
** END **

67
app/cli-tests/src/test/resources/acx-config.yml
View File

@@ -25,6 +25,40 @@ files:
content: |
20 2f fb 20 58 fc a0 0b b9 14 03 20 ed fd 88 d0
f7 20 8e fd 60 c4 cc d2 cf d7 a0 cf cc cc c5 c8
disassemblyDOS: # 6502
type: text
content: |
0300- 20 2F FB JSR INIT
0303- 20 58 FC JSR HOME
0306- A0 0B LDY #$0B
0308- B9 14 03 L0308 LDA L0314,Y
030B- 20 ED FD JSR COUT
030E- 88 DEY
030F- D0 F7 BNE L0308
0311- 20 8E FD JSR CROUT
0314- 60 L0314 RTS
0315- C4 CC CPY $CC
0317- D2 ???
0318- CF D7 A0 ??? $A0D7
031B- CF CC CC ??? $CCCC
031E- C5 C8 CMP $C8
disassemblyPRODOS: # 65C02
type: text
content: |
0300- 20 2F FB JSR INIT
0303- 20 58 FC JSR HOME
0306- A0 0B LDY #$0B
0308- B9 14 03 L0308 LDA L0314,Y
030B- 20 ED FD JSR COUT
030E- 88 DEY
030F- D0 F7 BNE L0308
0311- 20 8E FD JSR CROUT
0314- 60 L0314 RTS
0315- C4 CC CPY $CC
0317- D2 CF CMP ($CF)
0319- D7 A0 ??? $A0
031B- CF CC ??? $02E9
031D- CC C5 C8 CPY $C8C5
testdisk.dsk:
type: temporary
prefix: testdisk
@@ -45,3 +79,36 @@ tests:
- command: acx import -d $disk $txtfile --name TESTFILE
- command: acx rm -d $disk TESTFILE
- command: acx import -d $disk $txtfile --name TESTFILE
- name: big exercise
variables:
flag: ["--dos", "--prodos"]
volname: ["", "TEST"]
disk: ["$testdisk.dsk", "$testdisk.po"]
format: ["Disk Format: DOS 3.3", "Disk Format: ProDOS"]
# Note that DOS assumes 6502 while ProDOS assumes 65C02...
disassembly: ["$disassemblyDOS", "$disassemblyPRODOS"]
steps:
# Create our image
- command: acx mkdisk -d $disk $flag
- command: acx import -d $disk --name TEXTFILE --text-high $txtfile
- command: acx import -d $disk --name BASFILE --basic $basfile
- command: acx import -d $disk --name BINFILE --binary --addr=0x300 $binfile
# List image
- command: acx info -d $disk
match: contains
stdout: $format
- command: acx list -d $disk
match: contains
stdout: TEXTFILE
# Verify contents of files
- command: acx get -d $disk TEXTFILE
stdout: $txtfile
- command: acx get -d $disk BASFILE
match: trim
stdout: |
10 TEXT : HOME
20 PRINT "HELLO, WORLD"
30 END
- command: acx get -d $disk BINFILE --assembly
match: trim
stdout: $disassembly

2
build.gradle
View File

@@ -17,5 +17,5 @@ ext {
springBoot = "2.7.18"
acdasmVersion = "6.0"
graalvmBuildVersion = "0.10.6"
clthVersion = "1.1"
clthVersion = "1.3"
}

10
scripts/run-clth-tests.sh
View File

@@ -9,7 +9,15 @@ fi
CLTH="${DIR}/clth.jar"
if [ ! -f ${CLTH} ]
then
curl -o ${CLTH} -L https://github.com/a2geek/command-line-test-harness/releases/download/1.1/clth-1.1.jar
eval $(cat build.gradle | grep clthVersion | tr -d ' ')
if [ -z "${clthVersion}" ]
then
echo "clthVersion was not found"
return 1
fi
URL="https://github.com/a2geek/command-line-test-harness/releases/download/${clthVersion}/clth-${clthVersion}.jar"
curl -o ${CLTH} -L ${URL}
fi
java -jar ${CLTH} app/cli-tests/src/test/resources/{ac,acx}-config.yml