GOMODULES
/
goose
mirror of https://github.com/pressly/goose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in ghthor/goose/test-fix (pull request #7: Fixed the existing test's that verify the sorting order)

pull/2/head
Liam Staskawicz 2013-01-16 23:02:27 -08:00
parent e2d100db55 71801fa6bf
commit b959795376
2 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
migrate.go
View File

@ -160,7 +160,7 @@ func (mm *MigrationMap) Sort(direction bool) {
prev = mm.Migrations[i-1].Version prev = mm.Migrations[i-1].Version
mm.Migrations[i-1].Next = m.Version mm.Migrations[i-1].Next = m.Version
} }
m.Previous = prev mm.Migrations[i].Previous = prev
} }
} }

40
migrate_test.go
View File

@ -6,9 +6,7 @@ import (
func TestMigrationMapSortUp(t *testing.T) { func TestMigrationMapSortUp(t *testing.T) {
mm := &MigrationMap{ mm := &MigrationMap{}
Migrations: make(map[int]Migration),
}
// insert in any order // insert in any order
mm.Append(20120000, "test") mm.Append(20120000, "test")
@ -18,16 +16,14 @@ func TestMigrationMapSortUp(t *testing.T) {
mm.Sort(true) // sort Upwards mm.Sort(true) // sort Upwards
sorted := []int{20120000, 20127000, 20128000, 20129000} sorted := []int64{20120000, 20127000, 20128000, 20129000}
validateMigrationMapIsSorted(t, mm, sorted) validateMigrationMapIsSorted(t, mm, sorted)
} }
func TestMigrationMapSortDown(t *testing.T) { func TestMigrationMapSortDown(t *testing.T) {
mm := &MigrationMap{ mm := &MigrationMap{}
Migrations: make(map[int]Migration),
}
// insert in any order // insert in any order
mm.Append(20120000, "test") mm.Append(20120000, "test")
@ -37,37 +33,39 @@ func TestMigrationMapSortDown(t *testing.T) {
mm.Sort(false) // sort Downwards mm.Sort(false) // sort Downwards
sorted := []int{20129000, 20128000, 20127000, 20120000} sorted := []int64{20129000, 20128000, 20127000, 20120000}
validateMigrationMapIsSorted(t, mm, sorted) validateMigrationMapIsSorted(t, mm, sorted)
} }
func validateMigrationMapIsSorted(t *testing.T, mm *MigrationMap, sorted []int) { func validateMigrationMapIsSorted(t *testing.T, mm *MigrationMap, sorted []int64) {
for i, v := range mm.Versions { for i, m := range mm.Migrations {
if sorted[i] != v { if sorted[i] != m.Version {
t.Error("incorrect sorted version") t.Error("incorrect sorted version")
} }
var next, prev int var next, prev int64
if i == 0 { if i == 0 {
prev = -1 prev = -1
next = mm.Versions[i+1] next = mm.Migrations[i+1].Version
} else if i == len(mm.Versions)-1 { } else if i == len(mm.Migrations)-1 {
prev = mm.Versions[i-1] prev = mm.Migrations[i-1].Version
next = -1 next = -1
} else { } else {
prev = mm.Versions[i-1] prev = mm.Migrations[i-1].Version
next = mm.Versions[i+1] next = mm.Migrations[i+1].Version
} }
if mm.Migrations[v].Next != next { if m.Next != next {
t.Errorf("mismatched Next. v: %v, got %v, wanted %v\n", v, mm.Migrations[v].Next, next) t.Errorf("mismatched Next. v: %v, got %v, wanted %v\n", m, m.Next, next)
} }
if mm.Migrations[v].Previous != prev { if m.Previous != prev {
t.Errorf("mismatched Previous v: %v, got %v, wanted %v\n", v, mm.Migrations[v].Previous, prev) t.Errorf("mismatched Previous v: %v, got %v, wanted %v\n", m, m.Previous, prev)
} }
} }
t.Log(mm.Migrations)
} }