Skip to content

Commit

Permalink
Use gocheck.* syntax in all tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@mattheath
mattheath committed Mar 30, 2014
1 parent 4edc81b commit 62e8fff
Show file tree
Hide file tree
Showing 20 changed files with 1,578 additions and 1,578 deletions.
38 changes: 19 additions & 19 deletions aws/attempt_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package aws_test

import (
"github.com/goamz/goamz/aws"
. "github.com/motain/gocheck"
"github.com/motain/gocheck"
"time"
)

func (S) TestAttemptTiming(c *C) {
func (S) TestAttemptTiming(c *gocheck.C) {
testAttempt := aws.AttemptStrategy{
Total: 0.25e9,
Delay: 0.1e9,
Expand All @@ -18,7 +18,7 @@ func (S) TestAttemptTiming(c *C) {
got = append(got, time.Now().Sub(t0))
}
got = append(got, time.Now().Sub(t0))
c.Assert(got, HasLen, len(want))
c.Assert(got, gocheck.HasLen, len(want))
const margin = 0.01e9
for i, got := range want {
lo := want[i] - margin
Expand All @@ -29,29 +29,29 @@ func (S) TestAttemptTiming(c *C) {
}
}

func (S) TestAttemptNextHasNext(c *C) {
func (S) TestAttemptNextHasNext(c *gocheck.C) {
a := aws.AttemptStrategy{}.Start()
c.Assert(a.Next(), Equals, true)
c.Assert(a.Next(), Equals, false)
c.Assert(a.Next(), gocheck.Equals, true)
c.Assert(a.Next(), gocheck.Equals, false)

a = aws.AttemptStrategy{}.Start()
c.Assert(a.Next(), Equals, true)
c.Assert(a.HasNext(), Equals, false)
c.Assert(a.Next(), Equals, false)
c.Assert(a.Next(), gocheck.Equals, true)
c.Assert(a.HasNext(), gocheck.Equals, false)
c.Assert(a.Next(), gocheck.Equals, false)

a = aws.AttemptStrategy{Total: 2e8}.Start()
c.Assert(a.Next(), Equals, true)
c.Assert(a.HasNext(), Equals, true)
c.Assert(a.Next(), gocheck.Equals, true)
c.Assert(a.HasNext(), gocheck.Equals, true)
time.Sleep(2e8)
c.Assert(a.HasNext(), Equals, true)
c.Assert(a.Next(), Equals, true)
c.Assert(a.Next(), Equals, false)
c.Assert(a.HasNext(), gocheck.Equals, true)
c.Assert(a.Next(), gocheck.Equals, true)
c.Assert(a.Next(), gocheck.Equals, false)

a = aws.AttemptStrategy{Total: 1e8, Min: 2}.Start()
time.Sleep(1e8)
c.Assert(a.Next(), Equals, true)
c.Assert(a.HasNext(), Equals, true)
c.Assert(a.Next(), Equals, true)
c.Assert(a.HasNext(), Equals, false)
c.Assert(a.Next(), Equals, false)
c.Assert(a.Next(), gocheck.Equals, true)
c.Assert(a.HasNext(), gocheck.Equals, true)
c.Assert(a.Next(), gocheck.Equals, true)
c.Assert(a.HasNext(), gocheck.Equals, false)
c.Assert(a.Next(), gocheck.Equals, false)
}
52 changes: 26 additions & 26 deletions aws/aws_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,87 +2,87 @@ package aws_test

import (
"github.com/goamz/goamz/aws"
. "github.com/motain/gocheck"
"github.com/motain/gocheck"
"os"
"strings"
"testing"
)

func Test(t *testing.T) {
TestingT(t)
gocheck.TestingT(t)
}

var _ = Suite(&S{})
var _ = gocheck.Suite(&S{})

type S struct {
environ []string
}

func (s *S) SetUpSuite(c *C) {
func (s *S) SetUpSuite(c *gocheck.C) {
s.environ = os.Environ()
}

func (s *S) TearDownTest(c *C) {
func (s *S) TearDownTest(c *gocheck.C) {
os.Clearenv()
for _, kv := range s.environ {
l := strings.SplitN(kv, "=", 2)
os.Setenv(l[0], l[1])
}
}

func (s *S) TestEnvAuthNoSecret(c *C) {
func (s *S) TestEnvAuthNoSecret(c *gocheck.C) {
os.Clearenv()
_, err := aws.EnvAuth()
c.Assert(err, ErrorMatches, "AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment")
c.Assert(err, gocheck.ErrorMatches, "AWS_SECRET_ACCESS_KEY or AWS_SECRET_KEY not found in environment")
}

func (s *S) TestEnvAuthNoAccess(c *C) {
func (s *S) TestEnvAuthNoAccess(c *gocheck.C) {
os.Clearenv()
os.Setenv("AWS_SECRET_ACCESS_KEY", "foo")
_, err := aws.EnvAuth()
c.Assert(err, ErrorMatches, "AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment")
c.Assert(err, gocheck.ErrorMatches, "AWS_ACCESS_KEY_ID or AWS_ACCESS_KEY not found in environment")
}

func (s *S) TestEnvAuth(c *C) {
func (s *S) TestEnvAuth(c *gocheck.C) {
os.Clearenv()
os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
os.Setenv("AWS_ACCESS_KEY_ID", "access")
auth, err := aws.EnvAuth()
c.Assert(err, IsNil)
c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
c.Assert(err, gocheck.IsNil)
c.Assert(auth, gocheck.Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
}

func (s *S) TestEnvAuthAlt(c *C) {
func (s *S) TestEnvAuthAlt(c *gocheck.C) {
os.Clearenv()
os.Setenv("AWS_SECRET_KEY", "secret")
os.Setenv("AWS_ACCESS_KEY", "access")
auth, err := aws.EnvAuth()
c.Assert(err, IsNil)
c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
c.Assert(err, gocheck.IsNil)
c.Assert(auth, gocheck.Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
}

func (s *S) TestGetAuthStatic(c *C) {
func (s *S) TestGetAuthStatic(c *gocheck.C) {
auth, err := aws.GetAuth("access", "secret")
c.Assert(err, IsNil)
c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
c.Assert(err, gocheck.IsNil)
c.Assert(auth, gocheck.Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
}

func (s *S) TestGetAuthEnv(c *C) {
func (s *S) TestGetAuthEnv(c *gocheck.C) {
os.Clearenv()
os.Setenv("AWS_SECRET_ACCESS_KEY", "secret")
os.Setenv("AWS_ACCESS_KEY_ID", "access")
auth, err := aws.GetAuth("", "")
c.Assert(err, IsNil)
c.Assert(auth, Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
c.Assert(err, gocheck.IsNil)
c.Assert(auth, gocheck.Equals, aws.Auth{SecretKey: "secret", AccessKey: "access"})
}

func (s *S) TestEncode(c *C) {
c.Assert(aws.Encode("foo"), Equals, "foo")
c.Assert(aws.Encode("/"), Equals, "%2F")
func (s *S) TestEncode(c *gocheck.C) {
c.Assert(aws.Encode("foo"), gocheck.Equals, "foo")
c.Assert(aws.Encode("/"), gocheck.Equals, "%2F")
}

func (s *S) TestRegionsAreNamed(c *C) {
func (s *S) TestRegionsAreNamed(c *gocheck.C) {
for n, r := range aws.Regions {
c.Assert(n, Equals, r.Name)
c.Assert(n, gocheck.Equals, r.Name)
}
}
Loading

0 comments on commit 62e8fff

Please sign in to comment.