Merge pull request #8 from nmccrory/dev

profile and profile_test import statements for sc2 and wow packages.

Author: nmccrory

profile.go

@@ -1,18 +1,22 @@
 package bnet
 
+import (
+	"github.com/nmccrory/go-bnet/sc2"
+	"github.com/nmccrory/go-bnet/wow"
+)
 // ProfileService has OAuth Profile APIs. See Client.
 type ProfileService struct {
 	client *Client
 }
 
 // SC2Profile represents the profile information for a user's Starcraft 2 profile.
 type SC2Profile struct {
-	Characters []SC2Character `json:"characters"`
+	Characters []sc2.SC2Character `json:"characters"`
 }
 
 // WoWProfile is a collection of a user's World of Warcraft characters.
 type WoWProfile struct {
-	Characters []WoWCharacter `json:"characters"`
+	Characters []wow.WoWCharacter `json:"characters"`
 }
 
 // SC2() calls the /sc2/profile/user endpoint. This endpoint uses OAuth2

profile_test.go

@@ -5,6 +5,8 @@ import(
 	"net/http"
 	"testing"
 	"reflect"
+	"github.com/nmccrory/go-bnet/sc2"
+	"github.com/nmccrory/go-bnet/wow"
 )
 const sc2ProfileResp = `{ "characters":
 				[{
@@ -111,24 +113,24 @@ func TestProfileService_SC2(t *testing.T) {
 	if actual.Characters == nil {
 		t.Fatal("err: This user has no Starcraft 2 profile.")
 	}
-	want := SC2Character{ID: 1234567,
+	want := sc2.SC2Character{ID: 1234567,
 		Realm: 1,
 		DisplayName: "foobar",
 		ClanName: "foobar",
 		ClanTag: "foobar",
 		ProfilePath: "/profile/1234567/1/foobar/",
-		Portrait: CharacterImage{-10, -10, 10, 10, 10,
+		Portrait: sc2.CharacterImage{-10, -10, 10, 10, 10,
 			"http://media.blizzard.com/sc2/portraits/dummy.jpg"},
-		Career: Career{"PROTOSS", 0, 0, 0,
+		Career: sc2.Career{"PROTOSS", 0, 0, 0,
 			"DIAMOND", 0, 100},
-		SwarmLevels: SwarmLevels{10,
-			Level{1, 1000, 0},
-			Level{2, 1000, 0},
-			Level{3, 1000, 0}},
-		Season: Season{123, 1, 2017, 0},
-		Rewards: Rewards{[]int{12345678, 12345678}, []int{12345678, 12345678}},
-		Achievements: Achievements{Points{1234},
-			[]Achievement{Achievement{123456789, 123456789}}},
+		SwarmLevels: sc2.SwarmLevels{10,
+			sc2.Level{1, 1000, 0},
+			sc2.Level{2, 1000, 0},
+			sc2.Level{3, 1000, 0}},
+		Season: sc2.Season{123, 1, 2017, 0},
+		Rewards: sc2.Rewards{[]int{12345678, 12345678}, []int{12345678, 12345678}},
+		Achievements: sc2.Achievements{sc2.Points{1234},
+			[]sc2.Achievement{sc2.Achievement{123456789, 123456789}}},
 	}
 	if !reflect.DeepEqual(actual.Characters[0], want) {
 		t.Fatalf("returned %+v, want %+v", actual.Characters[0], want)
@@ -149,7 +151,7 @@ func TestProfileService_WoW(t *testing.T) {
 	if actual.Characters == nil {
 		t.Fatal("err: This user has no World of Warcraft characters.")
 	}
-	want := WoWCharacter{
+	want := wow.WoWCharacter{
 		Name: "foobar",
 		Realm: "foobar",
 		BattleGroup: "Foo",
@@ -159,7 +161,7 @@ func TestProfileService_WoW(t *testing.T) {
 		Level: 99,
 		AchievementPoints: 1234,
 		Thumbnail: "foobar/123/avatar.jpg",
-		Spec: Spec{"foobar", "foobar", "foo-bar", "foo_bar",
+		Spec: wow.Spec{"foobar", "foobar", "foo-bar", "foo_bar",
 		"Quick brown fox jumps over the lazy dog.", 1},
 		Guild: "Foo",
 		GuildRealm: "foobar",