Skip to content

Commit

Permalink
#1: use new import path and package name for check package (used to b…
Browse files Browse the repository at this point in the history
…e go check)
  • Loading branch information
jjeffery committed Apr 6, 2014
1 parent 9a02122 commit 1d04a4b
Show file tree
Hide file tree
Showing 24 changed files with 29 additions and 30 deletions.
2 changes: 1 addition & 1 deletion conn_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package stomp

import (
"fmt"
. "gopkg.in/check.v1"
"gopkg.in/stomp.v1/frame"
"gopkg.in/stomp.v1/testutil"
"io"
. "launchpad.net/gocheck"
"time"
)

Expand Down
2 changes: 1 addition & 1 deletion encode_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package stomp

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
)

type EncodeSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion frame/frame_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package frame

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
"testing"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion frame_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package stomp

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
)

type FrameSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion header_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package stomp

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
)

func (s *StompSuite) TestHeaderGetSetAddDel(c *C) {
Expand Down
2 changes: 1 addition & 1 deletion id_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package stomp

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
"runtime"
)

Expand Down
2 changes: 1 addition & 1 deletion reader_test.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package stomp

import (
. "gopkg.in/check.v1"
"io"
. "launchpad.net/gocheck"
"strings"
"testing/iotest"
)
Expand Down
2 changes: 1 addition & 1 deletion server/client/channel_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
)

// Test suite for testing that channels work the way I expect.
Expand Down
4 changes: 2 additions & 2 deletions server/client/client_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package client

import (
"launchpad.net/gocheck"
"gopkg.in/check.v1"
"testing"
)

// Runs all gocheck tests in this package.
// See other *_test.go files for gocheck tests.
func TestClient(t *testing.T) {
gocheck.TestingT(t)
check.TestingT(t)
}
3 changes: 1 addition & 2 deletions server/client/frame_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
package client

import (
. "gopkg.in/check.v1"
"gopkg.in/stomp.v1"
"gopkg.in/stomp.v1/frame"
. "launchpad.net/gocheck"
_ "strconv"
)

type FrameSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion server/client/subscription_list_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
)

type SubscriptionListSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion server/client/tx_store_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package client

import (
. "gopkg.in/check.v1"
"gopkg.in/stomp.v1"
"gopkg.in/stomp.v1/frame"
. "launchpad.net/gocheck"
)

type TxStoreSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion server/client/util_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package client

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
"math"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion server/queue/manager_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package queue

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
)

type ManagerSuite struct{}
Expand Down
2 changes: 1 addition & 1 deletion server/queue/memory_queue_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package queue

import (
. "gopkg.in/check.v1"
"gopkg.in/stomp.v1"
"gopkg.in/stomp.v1/frame"
. "launchpad.net/gocheck"
)

type MemoryQueueSuite struct{}
Expand Down
4 changes: 2 additions & 2 deletions server/queue/queue_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package queue

import (
"launchpad.net/gocheck"
"gopkg.in/check.v1"
"testing"
)

// Runs all gocheck tests in this package.
// See other *_test.go files for gocheck tests.
func TestQueue(t *testing.T) {
gocheck.TestingT(t)
check.TestingT(t)
}
2 changes: 1 addition & 1 deletion server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package server

import (
"fmt"
. "gopkg.in/check.v1"
"gopkg.in/stomp.v1"
. "launchpad.net/gocheck"
_ "log"
"net"
"runtime"
Expand Down
2 changes: 1 addition & 1 deletion server/topic/manager_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package topic

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
)

type ManagerSuite struct{}
Expand Down
4 changes: 2 additions & 2 deletions server/topic/testing_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package topic

import (
"launchpad.net/gocheck"
"gopkg.in/check.v1"
"testing"
)

// Runs all gocheck tests in this package.
// See other *_test.go files for gocheck tests.
func Test(t *testing.T) {
gocheck.TestingT(t)
check.TestingT(t)
}
2 changes: 1 addition & 1 deletion server/topic/topic_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package topic

import (
. "gopkg.in/check.v1"
"gopkg.in/stomp.v1"
"gopkg.in/stomp.v1/frame"
. "launchpad.net/gocheck"
)

type TopicSuite struct{}
Expand Down
6 changes: 3 additions & 3 deletions stomp_test.go
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package stomp

import (
"launchpad.net/gocheck"
"gopkg.in/check.v1"
"testing"
)

// Runs all gocheck tests in this package.
// See other *_test.go files for gocheck tests.
func TestStomp(t *testing.T) {
gocheck.TestingT(t)
check.TestingT(t)
}

type StompSuite struct{}

var _ = gocheck.Suite(&StompSuite{})
var _ = check.Suite(&StompSuite{})
2 changes: 1 addition & 1 deletion testutil/fake_conn.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package testutil

import (
"errors"
. "gopkg.in/check.v1"
"io"
. "launchpad.net/gocheck"
"net"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion testutil/fake_conn_test.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package testutil

import (
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
"testing"
)

Expand Down
2 changes: 1 addition & 1 deletion writer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package stomp

import (
"bytes"
. "launchpad.net/gocheck"
. "gopkg.in/check.v1"
"strings"
)

Expand Down

0 comments on commit 1d04a4b

Please sign in to comment.