u-next
diff --git a/‎Gopkg.lock‎
Lines changed: 53 additions & 4 deletions b/‎Gopkg.lock‎
Lines changed: 53 additions & 4 deletions
diff --git a/‎Gopkg.toml‎
Lines changed: 4 additions & 0 deletions b/‎Gopkg.toml‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎database/cassandra/cassandra_test.go‎
Lines changed: 38 additions & 25 deletions b/‎database/cassandra/cassandra_test.go‎
Lines changed: 38 additions & 25 deletions
@@ -100,3 +100,7 @@
 [prune]
   go-tests = true
   unused-packages = true
+
+[[constraint]]
+  name = "github.com/dhui/dktest"
+  version = "0.2.2"
@@ -4,27 +4,39 @@ import (
 	"fmt"
 	"strconv"
 	"testing"
+)
 
+import (
+	"github.com/dhui/dktest"
 	"github.com/gocql/gocql"
+)
 
+import (
 	dt "github.com/golang-migrate/migrate/v4/database/testing"
-	mt "github.com/golang-migrate/migrate/v4/testing"
+	"github.com/golang-migrate/migrate/v4/dktesting"
 )
 
-var versions = []mt.Version{
-	{Image: "cassandra:3.0.10"},
-	{Image: "cassandra:3.0"},
-}
+var (
+	opts  = dktest.Options{PortRequired: true, ReadyFunc: isReady}
+	specs = []dktesting.ContainerSpec{
+		{ImageName: "cassandra:3.0.10", Options: opts},
+		{ImageName: "cassandra:3.0", Options: opts},
+	}
+)
 
-func isReady(i mt.Instance) bool {
+func isReady(c dktest.ContainerInfo) bool {
 	// Cassandra exposes 5 ports (7000, 7001, 7199, 9042 & 9160)
-	// We only need the port bound to 9042, but we can only access to the first one
-	// through 'i.Port()' (which calls DockerContainer.firstPortMapping())
-	// So we need to get port mapping to retrieve correct port number bound to 9042
-	portMap := i.NetworkSettings().Ports
-	port, _ := strconv.Atoi(portMap["9042/tcp"][0].HostPort)
+	// We only need the port bound to 9042
+	ip, portStr, err := c.Port(9042)
+	if err != nil {
+		return false
+	}
+	port, err := strconv.Atoi(portStr)
+	if err != nil {
+		return false
+	}
 
-	cluster := gocql.NewCluster(i.Host())
+	cluster := gocql.NewCluster(ip)
 	cluster.Port = port
 	cluster.Consistency = gocql.All
 	p, err := cluster.CreateSession()
@@ -40,17 +52,18 @@ func isReady(i mt.Instance) bool {
 }
 
 func Test(t *testing.T) {
-	mt.ParallelTest(t, versions, isReady,
-		func(t *testing.T, i mt.Instance) {
-			p := &Cassandra{}
-			portMap := i.NetworkSettings().Ports
-			port, _ := strconv.Atoi(portMap["9042/tcp"][0].HostPort)
-			addr := fmt.Sprintf("cassandra://%v:%v/testks", i.Host(), port)
-			d, err := p.Open(addr)
-			if err != nil {
-				t.Fatalf("%v", err)
-			}
-			defer d.Close()
-			dt.Test(t, d, []byte("SELECT table_name from system_schema.tables"))
-		})
+	dktesting.ParallelTest(t, specs, func(t *testing.T, c dktest.ContainerInfo) {
+		ip, port, err := c.Port(9042)
+		if err != nil {
+			t.Fatal("Unable to get mapped port:", err)
+		}
+		addr := fmt.Sprintf("cassandra://%v:%v/testks", ip, port)
+		p := &Cassandra{}
+		d, err := p.Open(addr)
+		if err != nil {
+			t.Fatalf("%v", err)
+		}
+		defer d.Close()
+		dt.Test(t, d, []byte("SELECT table_name from system_schema.tables"))
+	})
 }