Merge branch 'master' into refactoring-for-unifying-the-coding-style-of-example

.travis.yml

@@ -6,7 +6,7 @@ go:
 sudo: false
 
 before_script:
-  - go get -u github.com/blendlabs/go-assert
+  - go get -u github.com/blend/go-sdk/assert
   - go get ./...
 
 script:

_examples/bar_chart/main.go

@@ -11,6 +11,13 @@ import (
 
 func drawChart(res http.ResponseWriter, req *http.Request) {
 	sbc := chart.BarChart{
+		Title:      "Test Bar Chart",
+		TitleStyle: chart.StyleShow(),
+		Background: chart.Style{
+			Padding: chart.Box{
+				Top: 40,
+			},
+		},
 		Height:   512,
 		BarWidth: 60,
 		XAxis:    chart.StyleShow(),

annotation_series_test.go

@@ -4,7 +4,8 @@ import (
 	"image/color"
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
+
 	"github.com/wcharczuk/go-chart/drawing"
 )
 

bar_chart.go

@@ -126,7 +126,7 @@ func (bc BarChart) Render(rp RendererProvider, w io.Writer) error {
 		canvasBox = bc.getAdjustedCanvasBox(r, canvasBox, yr, yt)
 		yr = bc.setRangeDomains(canvasBox, yr)
 	}
-
+	bc.drawCanvas(r, canvasBox)
 	bc.drawBars(r, canvasBox, yr)
 	bc.drawXAxis(r, canvasBox)
 	bc.drawYAxis(r, canvasBox, yr, yt)
@@ -139,6 +139,10 @@ func (bc BarChart) Render(rp RendererProvider, w io.Writer) error {
 	return r.Save(w)
 }
 
+func (bc BarChart) drawCanvas(r Renderer, canvasBox Box) {
+	Draw.Box(r, canvasBox, bc.getCanvasStyle())
+}
+
 func (bc BarChart) getRanges() Range {
 	var yrange Range
 	if bc.YAxis.Range != nil && !bc.YAxis.Range.IsZero() {
@@ -280,7 +284,32 @@ func (bc BarChart) drawYAxis(r Renderer, canvasBox Box, yr Range, ticks []Tick)
 
 func (bc BarChart) drawTitle(r Renderer) {
 	if len(bc.Title) > 0 && bc.TitleStyle.Show {
-		Draw.TextWithin(r, bc.Title, bc.box(), bc.styleDefaultsTitle())
+		r.SetFont(bc.TitleStyle.GetFont(bc.GetFont()))
+		r.SetFontColor(bc.TitleStyle.GetFontColor(bc.GetColorPalette().TextColor()))
+		titleFontSize := bc.TitleStyle.GetFontSize(bc.getTitleFontSize())
+		r.SetFontSize(titleFontSize)
+
+		textBox := r.MeasureText(bc.Title)
+
+		textWidth := textBox.Width()
+		textHeight := textBox.Height()
+
+		titleX := (bc.GetWidth() >> 1) - (textWidth >> 1)
+		titleY := bc.TitleStyle.Padding.GetTop(DefaultTitleTop) + textHeight
+
+		r.Text(bc.Title, titleX, titleY)
+	}
+}
+
+func (bc BarChart) getCanvasStyle() Style {
+	return bc.Canvas.InheritFrom(bc.styleDefaultsCanvas())
+}
+
+func (bc BarChart) styleDefaultsCanvas() Style {
+	return Style{
+		FillColor:   bc.GetColorPalette().CanvasColor(),
+		StrokeColor: bc.GetColorPalette().CanvasStrokeColor(),
+		StrokeWidth: DefaultCanvasStrokeWidth,
 	}
 }
 
@@ -397,8 +426,8 @@ func (bc BarChart) box() Box {
 	dpb := bc.Background.Padding.GetBottom(50)
 
 	return Box{
-		Top:    20,
-		Left:   20,
+		Top:    bc.Background.Padding.GetTop(20),
+		Left:   bc.Background.Padding.GetLeft(20),
 		Right:  bc.GetWidth() - dpr,
 		Bottom: bc.GetHeight() - dpb,
 	}

bar_chart_test.go

@@ -5,7 +5,7 @@ import (
 	"math"
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestBarChartRender(t *testing.T) {
@@ -242,7 +242,7 @@ func TestBarChartGetAxesTicks(t *testing.T) {
 
 	bc.YAxis.Style.Show = true
 	ticks = bc.getAxesTicks(r, yr, yf)
-	assert.Len(ticks, 2)
+	assert.Len(2, ticks)
 }
 
 func TestBarChartCalculateEffectiveBarSpacing(t *testing.T) {

bollinger_band_series_test.go

@@ -5,7 +5,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/seq"
 )
 

box_test.go

@@ -4,7 +4,7 @@ import (
 	"math"
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestBoxClone(t *testing.T) {

chart_test.go

@@ -8,7 +8,9 @@ import (
 	"testing"
 	"time"
 
-	assert "github.com/blendlabs/go-assert"
+
+	"github.com/blend/go-sdk/assert"
+
 	"github.com/wcharczuk/go-chart/drawing"
 	"github.com/wcharczuk/go-chart/seq"
 )

concat_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/seq"
 )
 

continuous_range_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/util"
 )
 

continuous_series_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/seq"
 )
 

drawing/color_test.go

@@ -5,7 +5,7 @@ import (
 
 	"image/color"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestColorFromHex(t *testing.T) {

drawing/curve_test.go

@@ -3,7 +3,7 @@ package drawing
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 type point struct {

ema_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/seq"
 )
 

grid_line_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestGenerateGridLines(t *testing.T) {
@@ -17,7 +17,7 @@ func TestGenerateGridLines(t *testing.T) {
 	}
 
 	gl := GenerateGridLines(ticks, Style{}, Style{})
-	assert.Len(gl, 2)
+	assert.Len(2, gl)
 
 	assert.Equal(2.0, gl[0].Value)
 	assert.Equal(3.0, gl[1].Value)

histogram_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/seq"
 )
 

legend_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestLegend(t *testing.T) {

linear_regression_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/seq"
 )
 

macd_series_test.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 var (

market_hours_range_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/util"
 )
 
@@ -67,7 +67,7 @@ func TestMarketHoursRangeGetTicks(t *testing.T) {
 
 	ticks := ra.GetTicks(r, defaults, TimeValueFormatter)
 	assert.NotEmpty(ticks)
-	assert.Len(ticks, 5)
+	assert.Len(5, ticks)
 	assert.NotEqual(util.Time.ToFloat64(ra.Min), ticks[0].Value)
 	assert.NotEmpty(ticks[0].Label)
 }

matrix/matrix_test.go

@@ -3,7 +3,7 @@ package matrix
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestNew(t *testing.T) {

matrix/regression_test.go

@@ -3,7 +3,7 @@ package matrix
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestPoly(t *testing.T) {
@@ -14,7 +14,7 @@ func TestPoly(t *testing.T) {
 
 	c, err := Poly(xGiven, yGiven, degree)
 	assert.Nil(err)
-	assert.Len(c, 3)
+	assert.Len(3, c)
 
 	assert.InDelta(c[0], 0.999999999, DefaultEpsilon)
 	assert.InDelta(c[1], 2, DefaultEpsilon)

pie_chart_test.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestPieChart(t *testing.T) {

polynomial_regression_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/matrix"
 )
 

raster_renderer.go

@@ -6,9 +6,9 @@ import (
 	"io"
 	"math"
 
-	util "github.com/blendlabs/go-util"
 	"github.com/golang/freetype/truetype"
 	"github.com/wcharczuk/go-chart/drawing"
+	"github.com/wcharczuk/go-chart/util"
 )
 
 // PNG returns a new png/raster renderer.

seq/buffer_test.go

@@ -3,7 +3,7 @@ package seq
 import (
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestBuffer(t *testing.T) {
@@ -132,7 +132,7 @@ func TestBufferArray(t *testing.T) {
 	buffer.Enqueue(5)
 
 	contents := buffer.Array()
-	assert.Len(contents, 5)
+	assert.Len(5, contents)
 	assert.Equal(1, contents[0])
 	assert.Equal(2, contents[1])
 	assert.Equal(3, contents[2])

seq/linear_test.go

@@ -3,14 +3,14 @@ package seq
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestRange(t *testing.T) {
 	assert := assert.New(t)
 
 	values := Range(1, 100)
-	assert.Len(values, 100)
+	assert.Len(100, values)
 	assert.Equal(1, values[0])
 	assert.Equal(100, values[99])
 }
@@ -20,7 +20,7 @@ func TestRangeWithStep(t *testing.T) {
 
 	values := RangeWithStep(0, 100, 5)
 	assert.Equal(100, values[20])
-	assert.Len(values, 21)
+	assert.Len(21, values)
 }
 
 func TestRangeReversed(t *testing.T) {
@@ -42,7 +42,7 @@ func TestValuesRegression(t *testing.T) {
 	assert.Equal(100, linearProvider.Len())
 
 	values := Seq{Provider: linearProvider}.Array()
-	assert.Len(values, 100)
+	assert.Len(100, values)
 	assert.Equal(1.0, values[0])
 	assert.Equal(100, values[99])
 }

seq/random.go

@@ -11,7 +11,7 @@ func RandomValues(count int) []float64 {
 	return Seq{NewRandom().WithLen(count)}.Array()
 }
 
-// RandomValuesWithAverage returns an array of random values with a given average.
+// RandomValuesWithMax returns an array of random values with a given average.
 func RandomValuesWithMax(count int, max float64) []float64 {
 	return Seq{NewRandom().WithMax(max).WithLen(count)}.Array()
 }

seq/random_test.go

@@ -3,7 +3,7 @@ package seq
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestRandomRegression(t *testing.T) {
@@ -15,6 +15,6 @@ func TestRandomRegression(t *testing.T) {
 
 	randomSequence := New(randomProvider)
 	randomValues := randomSequence.Array()
-	assert.Len(randomValues, 4096)
+	assert.Len(4096, randomValues)
 	assert.InDelta(128, randomSequence.Average(), 10.0)
 }

seq/sequence_test.go

@@ -3,7 +3,7 @@ package seq
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestSequenceEach(t *testing.T) {
@@ -88,7 +88,7 @@ func TestSequenceNormalize(t *testing.T) {
 	normalized := Values(1, 2, 3, 4, 5).Normalize().Array()
 
 	assert.NotEmpty(normalized)
-	assert.Len(normalized, 5)
+	assert.Len(5, normalized)
 	assert.Equal(0, normalized[0])
 	assert.Equal(0.25, normalized[1])
 	assert.Equal(1, normalized[4])

seq/time_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/util"
 )
 
@@ -13,7 +13,7 @@ func TestTimeMarketHours(t *testing.T) {
 
 	today := time.Date(2016, 07, 01, 12, 0, 0, 0, util.Date.Eastern())
 	mh := Time.MarketHours(today, today, util.NYSEOpen(), util.NYSEClose(), util.Date.IsNYSEHoliday)
-	assert.Len(mh, 8)
+	assert.Len(8, mh)
 	assert.Equal(util.Date.Eastern(), mh[0].Location())
 }
 
@@ -21,7 +21,7 @@ func TestTimeMarketHourQuarters(t *testing.T) {
 	assert := assert.New(t)
 	today := time.Date(2016, 07, 01, 12, 0, 0, 0, util.Date.Eastern())
 	mh := Time.MarketHourQuarters(today, today, util.NYSEOpen(), util.NYSEClose(), util.Date.IsNYSEHoliday)
-	assert.Len(mh, 4)
+	assert.Len(4, mh)
 	assert.Equal(9, mh[0].Hour())
 	assert.Equal(30, mh[0].Minute())
 	assert.Equal(util.Date.Eastern(), mh[0].Location())
@@ -42,7 +42,7 @@ func TestTimeHours(t *testing.T) {
 	seq := Time.Hours(today, 24)
 
 	end := Time.End(seq)
-	assert.Len(seq, 24)
+	assert.Len(24, seq)
 	assert.Equal(2016, end.Year())
 	assert.Equal(07, int(end.Month()))
 	assert.Equal(02, end.Day())
@@ -73,7 +73,8 @@ func TestSequenceHoursFill(t *testing.T) {
 	}
 
 	filledTimes, filledValues := Time.HoursFilled(xdata, ydata)
-	assert.Len(filledTimes, util.Date.DiffHours(Time.Start(xdata), Time.End(xdata))+1)
+	expected := util.Date.DiffHours(Time.Start(xdata), Time.End(xdata)) + 1
+	assert.Len(expected, filledTimes)
 	assert.Equal(len(filledValues), len(filledTimes))
 
 	assert.NotZero(filledValues[0])

sma_series_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/seq"
 	"github.com/wcharczuk/go-chart/util"
 )

style.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	util "github.com/blendlabs/go-util"
 	"github.com/golang/freetype/truetype"
 	"github.com/wcharczuk/go-chart/drawing"
+	"github.com/wcharczuk/go-chart/util"
 )
 
 const (

style_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 	"github.com/golang/freetype/truetype"
 	"github.com/wcharczuk/go-chart/drawing"
 )

text_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestTextWrapWord(t *testing.T) {
@@ -18,7 +18,7 @@ func TestTextWrapWord(t *testing.T) {
 
 	output := Text.WrapFitWord(r, "this is a test string", 100, basicTextStyle)
 	assert.NotEmpty(output)
-	assert.Len(output, 3)
+	assert.Len(3, output)
 
 	for _, line := range output {
 		basicTextStyle.WriteToRenderer(r)
@@ -30,16 +30,16 @@ func TestTextWrapWord(t *testing.T) {
 	assert.Equal("string", output[2])
 
 	output = Text.WrapFitWord(r, "foo", 100, basicTextStyle)
-	assert.Len(output, 1)
+	assert.Len(1, output)
 	assert.Equal("foo", output[0])
 
 	// test that it handles newlines.
 	output = Text.WrapFitWord(r, "this\nis\na\ntest\nstring", 100, basicTextStyle)
-	assert.Len(output, 5)
+	assert.Len(5, output)
 
 	// test that it handles newlines and long lines.
 	output = Text.WrapFitWord(r, "this\nis\na\ntest\nstring that is very long", 100, basicTextStyle)
-	assert.Len(output, 8)
+	assert.Len(8, output)
 }
 
 func TestTextWrapRune(t *testing.T) {
@@ -54,7 +54,7 @@ func TestTextWrapRune(t *testing.T) {
 
 	output := Text.WrapFitRune(r, "this is a test string", 150, basicTextStyle)
 	assert.NotEmpty(output)
-	assert.Len(output, 2)
+	assert.Len(2, output)
 	assert.Equal("this is a t", output[0])
 	assert.Equal("est string", output[1])
 }

tick_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestGenerateContinuousTicks(t *testing.T) {
@@ -26,7 +26,7 @@ func TestGenerateContinuousTicks(t *testing.T) {
 
 	ticks := GenerateContinuousTicks(r, ra, false, Style{}, vf)
 	assert.NotEmpty(ticks)
-	assert.Len(ticks, 11)
+	assert.Len(11, ticks)
 	assert.Equal(0.0, ticks[0].Value)
 	assert.Equal(10, ticks[len(ticks)-1].Value)
 }
@@ -52,7 +52,7 @@ func TestGenerateContinuousTicksDescending(t *testing.T) {
 
 	ticks := GenerateContinuousTicks(r, ra, false, Style{}, vf)
 	assert.NotEmpty(ticks)
-	assert.Len(ticks, 11)
+	assert.Len(11, ticks)
 	assert.Equal(10.0, ticks[0].Value)
 	assert.Equal(9.0, ticks[1].Value)
 	assert.Equal(1.0, ticks[len(ticks)-2].Value)

time_series_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestTimeSeriesGetValue(t *testing.T) {

util/date_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func parse(v string) time.Time {

util/math_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestMinAndMax(t *testing.T) {
@@ -99,7 +99,7 @@ func TestNormalize(t *testing.T) {
 
 	values := []float64{10, 9, 8, 7, 6}
 	normalized := Math.Normalize(values...)
-	assert.Len(normalized, 5)
+	assert.Len(5, normalized)
 	assert.Equal(0.25, normalized[0])
 	assert.Equal(0.1499, normalized[4])
 }

value.go

@@ -1,6 +1,6 @@
 package chart
 
-import util "github.com/blendlabs/go-util"
+import util "github.com/wcharczuk/go-chart/util"
 
 // Value is a chart value.
 type Value struct {

value_formatter_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/util"
 )
 

value_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	assert "github.com/blendlabs/go-assert"
+	assert "github.com/blend/go-sdk/assert"
 )
 
 func TestValuesValues(t *testing.T) {
@@ -20,7 +20,7 @@ func TestValuesValues(t *testing.T) {
 	}
 
 	values := Values(vs).Values()
-	assert.Len(values, 7)
+	assert.Len(7, values)
 	assert.Equal(10, values[0])
 	assert.Equal(9, values[1])
 	assert.Equal(8, values[2])
@@ -44,7 +44,7 @@ func TestValuesValuesNormalized(t *testing.T) {
 	}
 
 	values := Values(vs).ValuesNormalized()
-	assert.Len(values, 7)
+	assert.Len(7, values)
 	assert.Equal(0.2127, values[0])
 	assert.Equal(0.0425, values[6])
 }
@@ -63,7 +63,7 @@ func TestValuesNormalize(t *testing.T) {
 	}
 
 	values := Values(vs).Normalize()
-	assert.Len(values, 7)
+	assert.Len(7, values)
 	assert.Equal(0.2127, values[0].Value)
 	assert.Equal(0.0425, values[6].Value)
 }

vector_renderer.go

@@ -9,9 +9,9 @@ import (
 
 	"golang.org/x/image/font"
 
-	util "github.com/blendlabs/go-util"
 	"github.com/golang/freetype/truetype"
 	"github.com/wcharczuk/go-chart/drawing"
+	"github.com/wcharczuk/go-chart/util"
 )
 
 // SVG returns a new png/raster renderer.

vector_renderer_test.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 	"github.com/wcharczuk/go-chart/drawing"
 )
 

xaxis_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestXAxisGetTicks(t *testing.T) {
@@ -23,7 +23,7 @@ func TestXAxisGetTicks(t *testing.T) {
 	}
 	vf := FloatValueFormatter
 	ticks := xa.GetTicks(r, xr, styleDefaults, vf)
-	assert.Len(ticks, 16)
+	assert.Len(16, ticks)
 }
 
 func TestXAxisGetTicksWithUserDefaults(t *testing.T) {
@@ -45,7 +45,7 @@ func TestXAxisGetTicksWithUserDefaults(t *testing.T) {
 	}
 	vf := FloatValueFormatter
 	ticks := xa.GetTicks(r, xr, styleDefaults, vf)
-	assert.Len(ticks, 1)
+	assert.Len(1, ticks)
 }
 
 func TestXAxisMeasure(t *testing.T) {

yaxis_test.go

@@ -3,7 +3,7 @@ package chart
 import (
 	"testing"
 
-	"github.com/blendlabs/go-assert"
+	"github.com/blend/go-sdk/assert"
 )
 
 func TestYAxisGetTicks(t *testing.T) {
@@ -23,7 +23,7 @@ func TestYAxisGetTicks(t *testing.T) {
 	}
 	vf := FloatValueFormatter
 	ticks := ya.GetTicks(r, yr, styleDefaults, vf)
-	assert.Len(ticks, 32)
+	assert.Len(32, ticks)
 }
 
 func TestYAxisGetTicksWithUserDefaults(t *testing.T) {
@@ -45,7 +45,7 @@ func TestYAxisGetTicksWithUserDefaults(t *testing.T) {
 	}
 	vf := FloatValueFormatter
 	ticks := ya.GetTicks(r, yr, styleDefaults, vf)
-	assert.Len(ticks, 1)
+	assert.Len(1, ticks)
 }
 
 func TestYAxisMeasure(t *testing.T) {