travis: run on 1.5.4

- Move go1.8+ test code using t.Run() into separate file conditionally compiled
  on go1.8+. It's not a big deal to partially lose test coverage on <1.8 as long
  as the main code runs fine.
- Run coverage before race checker to help get results faster.
- Fix typo.
- No need to run travis on recent versions, they are handed by gohci workers and
  they are faster. :)
pull/1/head
Marc-Antoine Ruel 8 years ago
parent 6f8bd69f03
commit f7d0d4e3d5

@ -0,0 +1,154 @@
// Copyright 2017 The Periph Authors. All rights reserved.
// Use of this source code is governed under the Apache License, Version 2.0
// that can be found in the LICENSE file.
// +build go1.8
package cap1188
import (
"reflect"
"testing"
"periph.io/x/periph/conn/i2c"
"periph.io/x/periph/conn/i2c/i2ctest"
)
func TestDev_InputStatus(t *testing.T) {
tests := []struct {
name string
bus i2c.Bus
want [8]TouchStatus
}{
{name: "all off",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
// status
{Addr: 40, W: []byte{0x3}, R: []byte{0x0}},
// deltas
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
// thresholds
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus},
},
{name: "all pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0xff}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{PressedStatus, PressedStatus, PressedStatus, PressedStatus, PressedStatus, PressedStatus, PressedStatus, PressedStatus},
},
{name: "first pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x80}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus},
},
{name: "second pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x40}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{OffStatus, PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus},
},
{name: "third pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x20}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{OffStatus, OffStatus, PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus},
},
{name: "eighth pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x1}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, PressedStatus},
},
{name: "3 pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x91}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{PressedStatus, OffStatus, OffStatus, PressedStatus, OffStatus, OffStatus, OffStatus, PressedStatus},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d, err := NewI2C(tt.bus, &DefaultOpts)
if err != nil {
t.Fatal(err)
}
var got [8]TouchStatus
if err := d.InputStatus(got[:]); err != nil {
t.Fatalf("Dev.InputStatus() error = %v", err)
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("Dev.InputStatus() = %v, want %v", got, tt.want)
}
})
}
// test hold
t.Run("held touch sensors", func(t *testing.T) {
bus := &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x80}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
// repeat call to get status (still pressed)
{Addr: 40, W: []byte{0x3}, R: []byte{0x80}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
// finall call
{Addr: 40, W: []byte{0x3}, R: []byte{0x0}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
}
// Set the recorded response to have the retrigger option on.
bus.Ops[10] = i2ctest.IO{Addr: 40, W: []byte{0x28, 0xff}, R: nil}
opts := DefaultOpts
// Following option needs to be true so we can get the held status.
opts.RetriggerOnHold = true
d, err := NewI2C(bus, &opts)
if err != nil {
t.Fatal(err)
}
// first check
var got [8]TouchStatus
if err := d.InputStatus(got[:]); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(got, [8]TouchStatus{PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus}) {
t.Fatalf("expected to have the first sensor touched but instead got %v", got)
}
// 2nd check
if err = d.InputStatus(got[:]); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(got, [8]TouchStatus{HeldStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus}) {
t.Fatalf("expected to have the first sensor touched but instead got %v", got)
}
})
}

@ -8,11 +8,9 @@ import (
"flag" "flag"
"io/ioutil" "io/ioutil"
"log" "log"
"reflect"
"testing" "testing"
"time" "time"
"periph.io/x/periph/conn/i2c"
"periph.io/x/periph/conn/i2c/i2ctest" "periph.io/x/periph/conn/i2c/i2ctest"
) )
@ -59,145 +57,6 @@ func TestNewI2C(t *testing.T) {
} }
} }
func TestDev_InputStatus(t *testing.T) {
tests := []struct {
name string
bus i2c.Bus
want [8]TouchStatus
}{
{name: "all off",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
// status
{Addr: 40, W: []byte{0x3}, R: []byte{0x0}},
// deltas
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
// thresholds
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus},
},
{name: "all pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0xff}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{PressedStatus, PressedStatus, PressedStatus, PressedStatus, PressedStatus, PressedStatus, PressedStatus, PressedStatus},
},
{name: "first pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x80}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus},
},
{name: "second pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x40}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{OffStatus, PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus},
},
{name: "third pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x20}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{OffStatus, OffStatus, PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus},
},
{name: "eighth pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x1}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, PressedStatus},
},
{name: "3 pressed",
bus: &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x91}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
},
want: [8]TouchStatus{PressedStatus, OffStatus, OffStatus, PressedStatus, OffStatus, OffStatus, OffStatus, PressedStatus},
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
d, err := NewI2C(tt.bus, &DefaultOpts)
if err != nil {
t.Fatal(err)
}
var got [8]TouchStatus
if err := d.InputStatus(got[:]); err != nil {
t.Fatalf("Dev.InputStatus() error = %v", err)
}
if !reflect.DeepEqual(got, tt.want) {
t.Errorf("Dev.InputStatus() = %v, want %v", got, tt.want)
}
})
}
// test hold
t.Run("held touch sensors", func(t *testing.T) {
bus := &i2ctest.Playback{
Ops: append(setupPlaybackIO(), []i2ctest.IO{
{Addr: 40, W: []byte{0x3}, R: []byte{0x80}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
// repeat call to get status (still pressed)
{Addr: 40, W: []byte{0x3}, R: []byte{0x80}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
// finall call
{Addr: 40, W: []byte{0x3}, R: []byte{0x0}},
//{Addr: 40, W: []byte{0x10}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
//{Addr: 40, W: []byte{0x30}, R: []byte{0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}},
}...),
}
// Set the recorded response to have the retrigger option on.
bus.Ops[10] = i2ctest.IO{Addr: 40, W: []byte{0x28, 0xff}, R: nil}
opts := DefaultOpts
// Following option needs to be true so we can get the held status.
opts.RetriggerOnHold = true
d, err := NewI2C(bus, &opts)
if err != nil {
t.Fatal(err)
}
// first check
var got [8]TouchStatus
if err := d.InputStatus(got[:]); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(got, [8]TouchStatus{PressedStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus}) {
t.Fatalf("expected to have the first sensor touched but instead got %v", got)
}
// 2nd check
if err = d.InputStatus(got[:]); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(got, [8]TouchStatus{HeldStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus, OffStatus}) {
t.Fatalf("expected to have the first sensor touched but instead got %v", got)
}
})
}
func setupPlaybackIO() []i2ctest.IO { func setupPlaybackIO() []i2ctest.IO {
return []i2ctest.IO{ return []i2ctest.IO{
// chip ID // chip ID

@ -0,0 +1,39 @@
// Copyright 2017 The Periph Authors. All rights reserved.
// Use of this source code is governed under the Apache License, Version 2.0
// that can be found in the LICENSE file.
// +build go1.8
package nrzled
import (
"strconv"
"testing"
)
func TestNRZ(t *testing.T) {
data := []struct {
in byte
expected uint32
}{
{0x00, 0x924924},
{0x01, 0x924926},
{0x02, 0x924934},
{0x04, 0x9249A4},
{0x08, 0x924D24},
{0x10, 0x926924},
{0x20, 0x934924},
{0x40, 0x9A4924},
{0x80, 0xD24924},
{0xFD, 0xDB6DA6},
{0xFE, 0xDB6DB4},
{0xFF, 0xDB6DB6},
}
for i, line := range data {
t.Run(strconv.Itoa(i), func(t *testing.T) {
if actual := NRZ(line.in); line.expected != actual {
t.Fatalf("NRZ(%X): 0x%X != 0x%X", line.in, line.expected, actual)
}
})
}
}

@ -8,7 +8,6 @@ import (
"bytes" "bytes"
"image" "image"
"image/color" "image/color"
"strconv"
"testing" "testing"
"periph.io/x/periph/conn/gpio/gpiostream" "periph.io/x/periph/conn/gpio/gpiostream"
@ -16,33 +15,6 @@ import (
"periph.io/x/periph/conn/physic" "periph.io/x/periph/conn/physic"
) )
func TestNRZ(t *testing.T) {
data := []struct {
in byte
expected uint32
}{
{0x00, 0x924924},
{0x01, 0x924926},
{0x02, 0x924934},
{0x04, 0x9249A4},
{0x08, 0x924D24},
{0x10, 0x926924},
{0x20, 0x934924},
{0x40, 0x9A4924},
{0x80, 0xD24924},
{0xFD, 0xDB6DA6},
{0xFE, 0xDB6DB4},
{0xFF, 0xDB6DB6},
}
for i, line := range data {
t.Run(strconv.Itoa(i), func(t *testing.T) {
if actual := NRZ(line.in); line.expected != actual {
t.Fatalf("NRZ(%X): 0x%X != 0x%X", line.in, line.expected, actual)
}
})
}
}
func TestNew_3(t *testing.T) { func TestNew_3(t *testing.T) {
g := gpiostreamtest.PinOutPlayback{ g := gpiostreamtest.PinOutPlayback{
N: "Yo", N: "Yo",

Loading…
Cancel
Save