6502
/
i6502
mirror of https://github.com/ariejan/i6502.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update testify assert methods 

`assert.Equal` now tests for type equality as well, which means
256 != 0xff. The alternative is to use `assert.EqualValues`
This commit is contained in:
Ariejan de Vroom 2015-04-09 09:20:02 +02:00
parent 343f99deeb
commit 8bf1e629e6
5 changed files with 481 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
acia6551_test.go
View File

@ -17,7 +17,7 @@ func TestNewAcia6551(t *testing.T) {
acia, err := NewAcia6551(output) acia, err := NewAcia6551(output)
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 0x4, acia.Size()) assert.EqualValues(t, 0x4, acia.Size())
} }
func TestAciaAsMemory(t *testing.T) { func TestAciaAsMemory(t *testing.T) {
@ -29,17 +29,17 @@ func TestAciaReset(t *testing.T) {
a.Reset() a.Reset()
assert.Equal(t, a.tx, 0) assert.EqualValues(t, a.tx, 0)
assert.True(t, a.txEmpty) assert.True(t, a.txEmpty)
assert.Equal(t, a.rx, 0) assert.EqualValues(t, a.rx, 0)
assert.False(t, a.rxFull) assert.False(t, a.rxFull)
assert.False(t, a.txIrqEnabled) assert.False(t, a.txIrqEnabled)
assert.False(t, a.rxIrqEnabled) assert.False(t, a.rxIrqEnabled)
assert.False(t, a.overrun) assert.False(t, a.overrun)
assert.Equal(t, 0, a.controlData) assert.EqualValues(t, 0, a.controlData)
} }
func TestAciaReaderWithTxEmpty(t *testing.T) { func TestAciaReaderWithTxEmpty(t *testing.T) {
@ -51,7 +51,7 @@ func TestAciaReaderWithTxEmpty(t *testing.T) {
value := make([]byte, 1) value := make([]byte, 1)
bytesRead, _ := a.Read(value) bytesRead, _ := a.Read(value)
assert.Equal(t, 0, bytesRead) assert.EqualValues(t, 0, bytesRead)
} }
func TestAciaWriteByteAndReader(t *testing.T) { func TestAciaWriteByteAndReader(t *testing.T) {
@ -70,7 +70,7 @@ func TestAciaWriteByteAndReader(t *testing.T) {
<-done <-done
assert.Equal(t, 0x42, value[0]) assert.EqualValues(t, 0x42, value[0])
} }
func TestAciaWriterAndReadByte(t *testing.T) { func TestAciaWriterAndReadByte(t *testing.T) {
@ -79,15 +79,15 @@ func TestAciaWriterAndReadByte(t *testing.T) {
// System writes a single byte // System writes a single byte
bytesWritten, _ := a.Write([]byte{0x42}) bytesWritten, _ := a.Write([]byte{0x42})
if assert.Equal(t, 1, bytesWritten) { if assert.EqualValues(t, 1, bytesWritten) {
assert.Equal(t, 0x42, a.ReadByte(aciaData)) assert.EqualValues(t, 0x42, a.ReadByte(aciaData))
} }
// System writes multiple bytes // System writes multiple bytes
bytesWritten, _ = a.Write([]byte{0x42, 0x32, 0xAB}) bytesWritten, _ = a.Write([]byte{0x42, 0x32, 0xAB})
if assert.Equal(t, 3, bytesWritten) { if assert.EqualValues(t, 3, bytesWritten) {
assert.Equal(t, 0xAB, a.ReadByte(aciaData)) assert.EqualValues(t, 0xAB, a.ReadByte(aciaData))
} }
} }
@ -108,14 +108,14 @@ func TestAciaCommandRegister(t *testing.T) {
assert.True(t, a.rxIrqEnabled) assert.True(t, a.rxIrqEnabled)
assert.True(t, a.txIrqEnabled) assert.True(t, a.txIrqEnabled)
assert.Equal(t, 0x06, a.ReadByte(aciaCommand)) assert.EqualValues(t, 0x06, a.ReadByte(aciaCommand))
} }
func TestAciaControlRegister(t *testing.T) { func TestAciaControlRegister(t *testing.T) {
a, _ := AciaSubject() a, _ := AciaSubject()
a.WriteByte(aciaControl, 0xB8) a.WriteByte(aciaControl, 0xB8)
assert.Equal(t, 0xB8, a.ReadByte(aciaControl)) assert.EqualValues(t, 0xB8, a.ReadByte(aciaControl))
} }
func TestAciaStatusRegister(t *testing.T) { func TestAciaStatusRegister(t *testing.T) {
@ -124,22 +124,22 @@ func TestAciaStatusRegister(t *testing.T) {
a.rxFull = false a.rxFull = false
a.txEmpty = false a.txEmpty = false
a.overrun = false a.overrun = false
assert.Equal(t, 0x00, a.ReadByte(aciaStatus)) assert.EqualValues(t, 0x00, a.ReadByte(aciaStatus))
a.rxFull = true a.rxFull = true
a.txEmpty = false a.txEmpty = false
a.overrun = false a.overrun = false
assert.Equal(t, 0x08, a.ReadByte(aciaStatus)) assert.EqualValues(t, 0x08, a.ReadByte(aciaStatus))
a.rxFull = false a.rxFull = false
a.txEmpty = true a.txEmpty = true
a.overrun = false a.overrun = false
assert.Equal(t, 0x10, a.ReadByte(aciaStatus)) assert.EqualValues(t, 0x10, a.ReadByte(aciaStatus))
a.rxFull = false a.rxFull = false
a.txEmpty = false a.txEmpty = false
a.overrun = true a.overrun = true
assert.Equal(t, 0x04, a.ReadByte(aciaStatus)) assert.EqualValues(t, 0x04, a.ReadByte(aciaStatus))
} }
func TestAciaIntegration(t *testing.T) { func TestAciaIntegration(t *testing.T) {
@ -183,6 +183,6 @@ func TestAciaIntegration(t *testing.T) {
// value := make([]byte, 1) // value := make([]byte, 1)
// bytesRead, _ := acia.Read(value) // bytesRead, _ := acia.Read(value)
assert.Equal(t, 0x42, value[0]) assert.EqualValues(t, 0x42, value[0])
assert.Equal(t, 0xAB, cpu.A) assert.EqualValues(t, 0xAB, cpu.A)
} }

18
address_bus_test.go
View File

@ -14,7 +14,7 @@ func TestEmptyAddressBus(t *testing.T) {
assert.Nil(err) assert.Nil(err)
if assert.NotNil(bus) { if assert.NotNil(bus) {
assert.Equal(0, len(bus.addressables)) assert.EqualValues(0, len(bus.addressables))
} }
} }
@ -25,7 +25,7 @@ func TestAttachToAddressBus(t *testing.T) {
ram, _ := NewRam(0x10000) ram, _ := NewRam(0x10000)
bus.Attach(ram, 0x0000) bus.Attach(ram, 0x0000)
assert.Equal(1, len(bus.addressables)) assert.EqualValues(1, len(bus.addressables))
} }
func TestBusReadWrite(t *testing.T) { func TestBusReadWrite(t *testing.T) {
@ -39,28 +39,28 @@ func TestBusReadWrite(t *testing.T) {
// 8-bit Writing // 8-bit Writing
bus.WriteByte(0x1234, 0xFA) bus.WriteByte(0x1234, 0xFA)
assert.Equal(0xFA, ram.ReadByte(0x1234)) assert.EqualValues(0xFA, ram.ReadByte(0x1234))
// 16-bit Writing // 16-bit Writing
bus.Write16(0x1000, 0xAB42) bus.Write16(0x1000, 0xAB42)
assert.Equal(0x42, ram.ReadByte(0x1000)) assert.EqualValues(0x42, ram.ReadByte(0x1000))
assert.Equal(0xAB, ram.ReadByte(0x1001)) assert.EqualValues(0xAB, ram.ReadByte(0x1001))
// 8-bit Reading // 8-bit Reading
ram.WriteByte(0x5522, 0xDA) ram.WriteByte(0x5522, 0xDA)
assert.Equal(0xDA, bus.ReadByte(0x5522)) assert.EqualValues(0xDA, bus.ReadByte(0x5522))
// 16-bit Reading // 16-bit Reading
ram.WriteByte(0x4440, 0x7F) ram.WriteByte(0x4440, 0x7F)
ram.WriteByte(0x4441, 0x56) ram.WriteByte(0x4441, 0x56)
assert.Equal(0x567F, bus.Read16(0x4440)) assert.EqualValues(0x567F, bus.Read16(0x4440))
//// Test addressing memory not mounted at 0x0000 //// Test addressing memory not mounted at 0x0000
// Read from relative addressable Ram2: $C123 // Read from relative addressable Ram2: $C123
ram2.WriteByte(0x4123, 0xEF) ram2.WriteByte(0x4123, 0xEF)
assert.Equal(0xEF, bus.ReadByte(0xC123)) assert.EqualValues(0xEF, bus.ReadByte(0xC123))
bus.WriteByte(0x8001, 0x12) bus.WriteByte(0x8001, 0x12)
assert.Equal(0x12, ram2.ReadByte(0x0001)) assert.EqualValues(0x12, ram2.ReadByte(0x0001))
} }

890
cpu_test.go
View File

File diff suppressed because it is too large Load Diff

6
ram_test.go
View File

@ -12,7 +12,7 @@ func TestRamAsMemory(t *testing.T) {
func TestRamSize(t *testing.T) { func TestRamSize(t *testing.T) {
ram, _ := NewRam(0x8000) // 32 kB ram, _ := NewRam(0x8000) // 32 kB
assert.Equal(t, 0x8000, ram.Size()) assert.EqualValues(t, 0x8000, ram.Size())
} }
func TestRamReadWrite(t *testing.T) { func TestRamReadWrite(t *testing.T) {
@ -20,9 +20,9 @@ func TestRamReadWrite(t *testing.T) {
// Ram zeroed out initially // Ram zeroed out initially
for i := 0; i < 0x8000; i++ { for i := 0; i < 0x8000; i++ {
assert.Equal(t, 0x00, ram.data[i]) assert.EqualValues(t, 0x00, ram.data[i])
} }
ram.WriteByte(0x1000, 0x42) ram.WriteByte(0x1000, 0x42)
assert.Equal(t, 0x42, ram.ReadByte(0x1000)) assert.EqualValues(t, 0x42, ram.ReadByte(0x1000))
} }

12
rom_test.go
View File

@ -14,9 +14,9 @@ func Test8kRoms(t *testing.T) {
rom, err := NewRom("test/8kb.rom") rom, err := NewRom("test/8kb.rom")
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 0x2000, rom.Size()) assert.EqualValues(t, 0x2000, rom.Size())
assert.Equal(t, 0x01, rom.ReadByte(0x0000)) assert.EqualValues(t, 0x01, rom.ReadByte(0x0000))
assert.Equal(t, 0xFF, rom.ReadByte(0x2000-1)) assert.EqualValues(t, 0xFF, rom.ReadByte(0x2000-1))
} }
func TestRomWritePanic(t *testing.T) { func TestRomWritePanic(t *testing.T) {
@ -32,9 +32,9 @@ func Test16kRom(t *testing.T) {
rom, err := NewRom("test/16kb.rom") rom, err := NewRom("test/16kb.rom")
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, 0x4000, rom.Size()) assert.EqualValues(t, 0x4000, rom.Size())
assert.Equal(t, 0x01, rom.ReadByte(0x0000)) assert.EqualValues(t, 0x01, rom.ReadByte(0x0000))
assert.Equal(t, 0xFF, rom.ReadByte(0x4000-1)) assert.EqualValues(t, 0xFF, rom.ReadByte(0x4000-1))
} }
func TestRomNotFound(t *testing.T) { func TestRomNotFound(t *testing.T) {