From f86a559d7687d6e4decbf9ee56948c4a2d0afa2f Mon Sep 17 00:00:00 2001 From: Vartan Benohanian Date: Thu, 20 Aug 2020 14:37:59 -0400 Subject: [PATCH] Move everything to new reddit/ folder Signed-off-by: Vartan Benohanian --- README.md | 2 +- examples/client-on-request-completed/main.go | 2 +- examples/get-subreddit/main.go | 2 +- examples/get-top-posts/main.go | 2 +- examples/submit-post/main.go | 2 +- account.go => reddit/account.go | 0 account_test.go => reddit/account_test.go | 18 +++--- collection.go => reddit/collection.go | 0 .../collection_test.go | 6 +- comment.go => reddit/comment.go | 0 comment_test.go => reddit/comment_test.go | 6 +- emoji.go => reddit/emoji.go | 0 emoji_test.go => reddit/emoji_test.go | 4 +- errors.go => reddit/errors.go | 0 flair.go => reddit/flair.go | 0 flair_test.go => reddit/flair_test.go | 6 +- listings.go => reddit/listings.go | 0 listings_test.go => reddit/listings_test.go | 4 +- message.go => reddit/message.go | 0 message_test.go => reddit/message_test.go | 6 +- moderation.go => reddit/moderation.go | 0 .../moderation_test.go | 6 +- multi.go => reddit/multi.go | 0 multi_test.go => reddit/multi_test.go | 16 ++--- .../post-and-comment.go | 0 post.go => reddit/post.go | 0 post_test.go => reddit/post_test.go | 18 +++--- reddit-oauth.go => reddit/reddit-oauth.go | 0 reddit-options.go => reddit/reddit-options.go | 0 .../reddit-options_test.go | 0 reddit.go => reddit/reddit.go | 0 reddit_test.go => reddit/reddit_test.go | 0 subreddit.go => reddit/subreddit.go | 0 subreddit_test.go => reddit/subreddit_test.go | 56 ++++++++--------- things.go => reddit/things.go | 0 timestamp.go => reddit/timestamp.go | 0 timestamp_test.go => reddit/timestamp_test.go | 0 user.go => reddit/user.go | 0 user_test.go => reddit/user_test.go | 60 +++++++++---------- 39 files changed, 108 insertions(+), 108 deletions(-) rename account.go => reddit/account.go (100%) rename account_test.go => reddit/account_test.go (94%) rename collection.go => reddit/collection.go (100%) rename collection_test.go => reddit/collection_test.go (97%) rename comment.go => reddit/comment.go (100%) rename comment_test.go => reddit/comment_test.go (97%) rename emoji.go => reddit/emoji.go (100%) rename emoji_test.go => reddit/emoji_test.go (98%) rename errors.go => reddit/errors.go (100%) rename flair.go => reddit/flair.go (100%) rename flair_test.go => reddit/flair_test.go (91%) rename listings.go => reddit/listings.go (100%) rename listings_test.go => reddit/listings_test.go (96%) rename message.go => reddit/message.go (100%) rename message_test.go => reddit/message_test.go (97%) rename moderation.go => reddit/moderation.go (100%) rename moderation_test.go => reddit/moderation_test.go (96%) rename multi.go => reddit/multi.go (100%) rename multi_test.go => reddit/multi_test.go (93%) rename post-and-comment.go => reddit/post-and-comment.go (100%) rename post.go => reddit/post.go (100%) rename post_test.go => reddit/post_test.go (98%) rename reddit-oauth.go => reddit/reddit-oauth.go (100%) rename reddit-options.go => reddit/reddit-options.go (100%) rename reddit-options_test.go => reddit/reddit-options_test.go (100%) rename reddit.go => reddit/reddit.go (100%) rename reddit_test.go => reddit/reddit_test.go (100%) rename subreddit.go => reddit/subreddit.go (100%) rename subreddit_test.go => reddit/subreddit_test.go (92%) rename things.go => reddit/things.go (100%) rename timestamp.go => reddit/timestamp.go (100%) rename timestamp_test.go => reddit/timestamp_test.go (100%) rename user.go => reddit/user.go (100%) rename user_test.go => reddit/user_test.go (92%) diff --git a/README.md b/README.md index b0fe6ef..8da7bac 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Make sure to have a Reddit app with a valid client id and secret. [Here](https:/ ```go package main -import "github.com/vartanbeno/go-reddit" +import "github.com/vartanbeno/go-reddit/reddit" func main() { withCredentials := reddit.WithCredentials("id", "secret", "username", "password") diff --git a/examples/client-on-request-completed/main.go b/examples/client-on-request-completed/main.go index 7f814cf..bba2610 100644 --- a/examples/client-on-request-completed/main.go +++ b/examples/client-on-request-completed/main.go @@ -6,7 +6,7 @@ import ( "log" "net/http" - "github.com/vartanbeno/go-reddit" + "github.com/vartanbeno/go-reddit/reddit" ) var ctx = context.Background() diff --git a/examples/get-subreddit/main.go b/examples/get-subreddit/main.go index d481de6..60a11b5 100644 --- a/examples/get-subreddit/main.go +++ b/examples/get-subreddit/main.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/vartanbeno/go-reddit" + "github.com/vartanbeno/go-reddit/reddit" ) var ctx = context.Background() diff --git a/examples/get-top-posts/main.go b/examples/get-top-posts/main.go index e11a017..23ee0c0 100644 --- a/examples/get-top-posts/main.go +++ b/examples/get-top-posts/main.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/vartanbeno/go-reddit" + "github.com/vartanbeno/go-reddit/reddit" ) var ctx = context.Background() diff --git a/examples/submit-post/main.go b/examples/submit-post/main.go index 630b1c4..bfb3a8d 100644 --- a/examples/submit-post/main.go +++ b/examples/submit-post/main.go @@ -5,7 +5,7 @@ import ( "fmt" "log" - "github.com/vartanbeno/go-reddit" + "github.com/vartanbeno/go-reddit/reddit" ) var ctx = context.Background() diff --git a/account.go b/reddit/account.go similarity index 100% rename from account.go rename to reddit/account.go diff --git a/account_test.go b/reddit/account_test.go similarity index 94% rename from account_test.go rename to reddit/account_test.go index 6ccc41e..b69713d 100644 --- a/account_test.go +++ b/reddit/account_test.go @@ -126,7 +126,7 @@ func TestAccountService_Info(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/info.json") + blob, err := readFileContents("../testdata/account/info.json") require.NoError(t, err) mux.HandleFunc("/api/v1/me", func(w http.ResponseWriter, r *http.Request) { @@ -143,7 +143,7 @@ func TestAccountService_Karma(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/karma.json") + blob, err := readFileContents("../testdata/account/karma.json") require.NoError(t, err) mux.HandleFunc("/api/v1/me/karma", func(w http.ResponseWriter, r *http.Request) { @@ -160,7 +160,7 @@ func TestAccountService_Settings(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/settings.json") + blob, err := readFileContents("../testdata/account/settings.json") require.NoError(t, err) mux.HandleFunc("/api/v1/me/prefs", func(w http.ResponseWriter, r *http.Request) { @@ -177,7 +177,7 @@ func TestAccountService_UpdateSettings(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/settings.json") + blob, err := readFileContents("../testdata/account/settings.json") require.NoError(t, err) expectedSettingsBody := &Settings{NumberOfPosts: Int(10), MinimumCommentScore: Int(5), Compress: Bool(true)} @@ -202,7 +202,7 @@ func TestAccountService_Trophies(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/trophies.json") + blob, err := readFileContents("../testdata/account/trophies.json") require.NoError(t, err) mux.HandleFunc("/api/v1/me/trophies", func(w http.ResponseWriter, r *http.Request) { @@ -219,7 +219,7 @@ func TestAccountService_Friends(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/friends.json") + blob, err := readFileContents("../testdata/account/friends.json") require.NoError(t, err) mux.HandleFunc("/prefs/friends", func(w http.ResponseWriter, r *http.Request) { @@ -236,7 +236,7 @@ func TestAccountService_Blocked(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/blocked.json") + blob, err := readFileContents("../testdata/account/blocked.json") require.NoError(t, err) mux.HandleFunc("/prefs/blocked", func(w http.ResponseWriter, r *http.Request) { @@ -253,7 +253,7 @@ func TestAccountService_Messaging(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/messaging.json") + blob, err := readFileContents("../testdata/account/messaging.json") require.NoError(t, err) mux.HandleFunc("/prefs/messaging", func(w http.ResponseWriter, r *http.Request) { @@ -271,7 +271,7 @@ func TestAccountService_Trusted(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/account/trusted.json") + blob, err := readFileContents("../testdata/account/trusted.json") require.NoError(t, err) mux.HandleFunc("/prefs/trusted", func(w http.ResponseWriter, r *http.Request) { diff --git a/collection.go b/reddit/collection.go similarity index 100% rename from collection.go rename to reddit/collection.go diff --git a/collection_test.go b/reddit/collection_test.go similarity index 97% rename from collection_test.go rename to reddit/collection_test.go index a022937..14a1c25 100644 --- a/collection_test.go +++ b/reddit/collection_test.go @@ -74,7 +74,7 @@ func TestCollectionService_Get(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("./testdata/collection/collection.json") + blob, err := readFileContents("../testdata/collection/collection.json") require.NoError(t, err) mux.HandleFunc("/api/v1/collections/collection", func(w http.ResponseWriter, r *http.Request) { @@ -100,7 +100,7 @@ func TestCollectionService_FromSubreddit(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("./testdata/collection/collections.json") + blob, err := readFileContents("../testdata/collection/collections.json") require.NoError(t, err) mux.HandleFunc("/api/v1/collections/subreddit_collections", func(w http.ResponseWriter, r *http.Request) { @@ -125,7 +125,7 @@ func TestCollectionService_Create(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("./testdata/collection/collection.json") + blob, err := readFileContents("../testdata/collection/collection.json") require.NoError(t, err) mux.HandleFunc("/api/v1/collections/create_collection", func(w http.ResponseWriter, r *http.Request) { diff --git a/comment.go b/reddit/comment.go similarity index 100% rename from comment.go rename to reddit/comment.go diff --git a/comment_test.go b/reddit/comment_test.go similarity index 97% rename from comment_test.go rename to reddit/comment_test.go index 17daa2f..0205096 100644 --- a/comment_test.go +++ b/reddit/comment_test.go @@ -42,7 +42,7 @@ func TestCommentService_Submit(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/comment/submit-or-edit.json") + blob, err := readFileContents("../testdata/comment/submit-or-edit.json") require.NoError(t, err) mux.HandleFunc("/api/comment", func(w http.ResponseWriter, r *http.Request) { @@ -70,7 +70,7 @@ func TestCommentService_Edit(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/comment/submit-or-edit.json") + blob, err := readFileContents("../testdata/comment/submit-or-edit.json") require.NoError(t, err) mux.HandleFunc("/api/editusertext", func(w http.ResponseWriter, r *http.Request) { @@ -306,7 +306,7 @@ func TestCommentService_LoadMoreReplies(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/comment/more.json") + blob, err := readFileContents("../testdata/comment/more.json") require.NoError(t, err) mux.HandleFunc("/api/morechildren", func(w http.ResponseWriter, r *http.Request) { diff --git a/emoji.go b/reddit/emoji.go similarity index 100% rename from emoji.go rename to reddit/emoji.go diff --git a/emoji_test.go b/reddit/emoji_test.go similarity index 98% rename from emoji_test.go rename to reddit/emoji_test.go index 603e0fa..be9a06f 100644 --- a/emoji_test.go +++ b/reddit/emoji_test.go @@ -47,7 +47,7 @@ func TestEmojiService_Get(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/emoji/emojis.json") + blob, err := readFileContents("../testdata/emoji/emojis.json") require.NoError(t, err) mux.HandleFunc("/api/v1/test/emojis/all", func(w http.ResponseWriter, r *http.Request) { @@ -122,7 +122,7 @@ func TestEmojiService_Upload(t *testing.T) { uploadURL := u.Host + "/api/emoji_upload" - blob, err := readFileContents("testdata/emoji/lease.json") + blob, err := readFileContents("../testdata/emoji/lease.json") require.NoError(t, err) blob = fmt.Sprintf(blob, uploadURL) diff --git a/errors.go b/reddit/errors.go similarity index 100% rename from errors.go rename to reddit/errors.go diff --git a/flair.go b/reddit/flair.go similarity index 100% rename from flair.go rename to reddit/flair.go diff --git a/flair_test.go b/reddit/flair_test.go similarity index 91% rename from flair_test.go rename to reddit/flair_test.go index e097ae2..965172e 100644 --- a/flair_test.go +++ b/reddit/flair_test.go @@ -65,7 +65,7 @@ func TestFlairService_GetUserFlairs(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/flair/user-flairs.json") + blob, err := readFileContents("../testdata/flair/user-flairs.json") require.NoError(t, err) mux.HandleFunc("/r/testsubreddit/api/user_flair_v2", func(w http.ResponseWriter, r *http.Request) { @@ -82,7 +82,7 @@ func TestFlairService_GetPostFlairs(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/flair/post-flairs.json") + blob, err := readFileContents("../testdata/flair/post-flairs.json") require.NoError(t, err) mux.HandleFunc("/r/testsubreddit/api/link_flair_v2", func(w http.ResponseWriter, r *http.Request) { @@ -99,7 +99,7 @@ func TestFlairService_ListUserFlairs(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/flair/list-user-flairs.json") + blob, err := readFileContents("../testdata/flair/list-user-flairs.json") require.NoError(t, err) mux.HandleFunc("/r/testsubreddit/api/flairlist", func(w http.ResponseWriter, r *http.Request) { diff --git a/listings.go b/reddit/listings.go similarity index 100% rename from listings.go rename to reddit/listings.go diff --git a/listings_test.go b/reddit/listings_test.go similarity index 96% rename from listings_test.go rename to reddit/listings_test.go index b5a96ca..7069ba0 100644 --- a/listings_test.go +++ b/reddit/listings_test.go @@ -141,7 +141,7 @@ func TestListingsService_Get(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/listings/posts-comments-subreddits.json") + blob, err := readFileContents("../testdata/listings/posts-comments-subreddits.json") require.NoError(t, err) mux.HandleFunc("/api/info", func(w http.ResponseWriter, r *http.Request) { @@ -168,7 +168,7 @@ func TestListingsService_GetPosts(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/listings/posts.json") + blob, err := readFileContents("../testdata/listings/posts.json") require.NoError(t, err) mux.HandleFunc("/by_id/t3_i2gvg4,t3_i2gwgz", func(w http.ResponseWriter, r *http.Request) { diff --git a/message.go b/reddit/message.go similarity index 100% rename from message.go rename to reddit/message.go diff --git a/message_test.go b/reddit/message_test.go similarity index 97% rename from message_test.go rename to reddit/message_test.go index cb70a0b..191b4b1 100644 --- a/message_test.go +++ b/reddit/message_test.go @@ -227,7 +227,7 @@ func TestMessageService_Inbox(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/message/inbox.json") + blob, err := readFileContents("../testdata/message/inbox.json") require.NoError(t, err) mux.HandleFunc("/message/inbox", func(w http.ResponseWriter, r *http.Request) { @@ -245,7 +245,7 @@ func TestMessageService_InboxUnread(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/message/inbox.json") + blob, err := readFileContents("../testdata/message/inbox.json") require.NoError(t, err) mux.HandleFunc("/message/unread", func(w http.ResponseWriter, r *http.Request) { @@ -263,7 +263,7 @@ func TestMessageService_Sent(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/message/inbox.json") + blob, err := readFileContents("../testdata/message/inbox.json") require.NoError(t, err) mux.HandleFunc("/message/sent", func(w http.ResponseWriter, r *http.Request) { diff --git a/moderation.go b/reddit/moderation.go similarity index 100% rename from moderation.go rename to reddit/moderation.go diff --git a/moderation_test.go b/reddit/moderation_test.go similarity index 96% rename from moderation_test.go rename to reddit/moderation_test.go index 41b9bec..3fdfde7 100644 --- a/moderation_test.go +++ b/reddit/moderation_test.go @@ -53,7 +53,7 @@ func TestModerationService_GetActions(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/moderation/actions.json") + blob, err := readFileContents("../testdata/moderation/actions.json") require.NoError(t, err) mux.HandleFunc("/r/testsubreddit/about/log", func(w http.ResponseWriter, r *http.Request) { @@ -79,7 +79,7 @@ func TestModerationService_AcceptInvite(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/moderation/actions.json") + blob, err := readFileContents("../testdata/moderation/actions.json") require.NoError(t, err) mux.HandleFunc("/r/testsubreddit/api/accept_moderator_invite", func(w http.ResponseWriter, r *http.Request) { @@ -201,7 +201,7 @@ func TestModerationService_Edited(t *testing.T) { defer teardown() // contains posts and comments - blob, err := readFileContents("testdata/user/overview.json") + blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) mux.HandleFunc("/r/testsubreddit/about/edited", func(w http.ResponseWriter, r *http.Request) { diff --git a/multi.go b/reddit/multi.go similarity index 100% rename from multi.go rename to reddit/multi.go diff --git a/multi_test.go b/reddit/multi_test.go similarity index 93% rename from multi_test.go rename to reddit/multi_test.go index 136f614..4c3e7a7 100644 --- a/multi_test.go +++ b/reddit/multi_test.go @@ -47,7 +47,7 @@ func TestMultiService_Get(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/multi/multi.json") + blob, err := readFileContents("../testdata/multi/multi.json") require.NoError(t, err) mux.HandleFunc("/api/multi/user/testuser/m/testmulti", func(w http.ResponseWriter, r *http.Request) { @@ -64,7 +64,7 @@ func TestMultiService_Mine(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/multi/multis.json") + blob, err := readFileContents("../testdata/multi/multis.json") require.NoError(t, err) mux.HandleFunc("/api/multi/mine", func(w http.ResponseWriter, r *http.Request) { @@ -81,7 +81,7 @@ func TestMultiService_Of(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/multi/multis.json") + blob, err := readFileContents("../testdata/multi/multis.json") require.NoError(t, err) mux.HandleFunc("/api/multi/user/test", func(w http.ResponseWriter, r *http.Request) { @@ -98,7 +98,7 @@ func TestMultiService_Copy(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/multi/multi.json") + blob, err := readFileContents("../testdata/multi/multi.json") require.NoError(t, err) mux.HandleFunc("/api/multi/copy", func(w http.ResponseWriter, r *http.Request) { @@ -134,7 +134,7 @@ func TestMultiService_Create(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/multi/multi.json") + blob, err := readFileContents("../testdata/multi/multi.json") require.NoError(t, err) createRequest := &MultiCreateOrUpdateRequest{ @@ -172,7 +172,7 @@ func TestMultiService_Update(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/multi/multi.json") + blob, err := readFileContents("../testdata/multi/multi.json") require.NoError(t, err) updateRequest := &MultiCreateOrUpdateRequest{ @@ -221,7 +221,7 @@ func TestMultiService_GetDescription(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/multi/description.json") + blob, err := readFileContents("../testdata/multi/description.json") require.NoError(t, err) mux.HandleFunc("/api/multi/user/testuser/m/testmulti/description", func(w http.ResponseWriter, r *http.Request) { @@ -238,7 +238,7 @@ func TestMultiService_UpdateDescription(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/multi/description.json") + blob, err := readFileContents("../testdata/multi/description.json") require.NoError(t, err) mux.HandleFunc("/api/multi/user/testuser/m/testmulti/description", func(w http.ResponseWriter, r *http.Request) { diff --git a/post-and-comment.go b/reddit/post-and-comment.go similarity index 100% rename from post-and-comment.go rename to reddit/post-and-comment.go diff --git a/post.go b/reddit/post.go similarity index 100% rename from post.go rename to reddit/post.go diff --git a/post_test.go b/reddit/post_test.go similarity index 98% rename from post_test.go rename to reddit/post_test.go index 1918d2d..eb2ba04 100644 --- a/post_test.go +++ b/reddit/post_test.go @@ -214,7 +214,7 @@ func TestPostService_Get(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/post.json") + blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) mux.HandleFunc("/comments/abc123", func(w http.ResponseWriter, r *http.Request) { @@ -231,7 +231,7 @@ func TestPostService_Duplicates(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/duplicates.json") + blob, err := readFileContents("../testdata/post/duplicates.json") require.NoError(t, err) mux.HandleFunc("/duplicates/abc123", func(w http.ResponseWriter, r *http.Request) { @@ -263,7 +263,7 @@ func TestPostService_SubmitText(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/submit.json") + blob, err := readFileContents("../testdata/post/submit.json") require.NoError(t, err) mux.HandleFunc("/api/submit", func(w http.ResponseWriter, r *http.Request) { @@ -298,7 +298,7 @@ func TestPostService_SubmitLink(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/submit.json") + blob, err := readFileContents("../testdata/post/submit.json") require.NoError(t, err) mux.HandleFunc("/api/submit", func(w http.ResponseWriter, r *http.Request) { @@ -337,7 +337,7 @@ func TestPostService_Edit(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/edit.json") + blob, err := readFileContents("../testdata/post/edit.json") require.NoError(t, err) mux.HandleFunc("/api/editusertext", func(w http.ResponseWriter, r *http.Request) { @@ -824,7 +824,7 @@ func TestPostService_LoadMoreReplies(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/more.json") + blob, err := readFileContents("../testdata/post/more.json") require.NoError(t, err) mux.HandleFunc("/api/morechildren", func(w http.ResponseWriter, r *http.Request) { @@ -876,7 +876,7 @@ func TestPostService_RandomFromSubreddits(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/post.json") + blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) mux.HandleFunc("/r/test/random", func(w http.ResponseWriter, r *http.Request) { @@ -893,7 +893,7 @@ func TestPostService_Random(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/post.json") + blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) mux.HandleFunc("/r/all/random", func(w http.ResponseWriter, r *http.Request) { @@ -910,7 +910,7 @@ func TestPostService_RandomFromSubscriptions(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/post.json") + blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) mux.HandleFunc("/random", func(w http.ResponseWriter, r *http.Request) { diff --git a/reddit-oauth.go b/reddit/reddit-oauth.go similarity index 100% rename from reddit-oauth.go rename to reddit/reddit-oauth.go diff --git a/reddit-options.go b/reddit/reddit-options.go similarity index 100% rename from reddit-options.go rename to reddit/reddit-options.go diff --git a/reddit-options_test.go b/reddit/reddit-options_test.go similarity index 100% rename from reddit-options_test.go rename to reddit/reddit-options_test.go diff --git a/reddit.go b/reddit/reddit.go similarity index 100% rename from reddit.go rename to reddit/reddit.go diff --git a/reddit_test.go b/reddit/reddit_test.go similarity index 100% rename from reddit_test.go rename to reddit/reddit_test.go diff --git a/subreddit.go b/reddit/subreddit.go similarity index 100% rename from subreddit.go rename to reddit/subreddit.go diff --git a/subreddit_test.go b/reddit/subreddit_test.go similarity index 92% rename from subreddit_test.go rename to reddit/subreddit_test.go index 88b15e7..16b1c9e 100644 --- a/subreddit_test.go +++ b/reddit/subreddit_test.go @@ -293,7 +293,7 @@ func TestSubredditService_HotPosts(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/posts.json") + blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) mux.HandleFunc("/r/test/hot", func(w http.ResponseWriter, r *http.Request) { @@ -310,7 +310,7 @@ func TestSubredditService_NewPosts(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/posts.json") + blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) mux.HandleFunc("/r/test/new", func(w http.ResponseWriter, r *http.Request) { @@ -327,7 +327,7 @@ func TestSubredditService_RisingPosts(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/posts.json") + blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) mux.HandleFunc("/r/test/rising", func(w http.ResponseWriter, r *http.Request) { @@ -344,7 +344,7 @@ func TestSubredditService_ControversialPosts(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/posts.json") + blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) mux.HandleFunc("/r/test/controversial", func(w http.ResponseWriter, r *http.Request) { @@ -361,7 +361,7 @@ func TestSubredditService_TopPosts(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/posts.json") + blob, err := readFileContents("../testdata/subreddit/posts.json") require.NoError(t, err) mux.HandleFunc("/r/test/top", func(w http.ResponseWriter, r *http.Request) { @@ -378,7 +378,7 @@ func TestSubredditService_Get(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/about.json") + blob, err := readFileContents("../testdata/subreddit/about.json") require.NoError(t, err) mux.HandleFunc("/r/golang/about", func(w http.ResponseWriter, r *http.Request) { @@ -398,7 +398,7 @@ func TestSubredditService_Popular(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/list.json") + blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) mux.HandleFunc("/subreddits/popular", func(w http.ResponseWriter, r *http.Request) { @@ -415,7 +415,7 @@ func TestSubredditService_New(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/list.json") + blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) mux.HandleFunc("/subreddits/new", func(w http.ResponseWriter, r *http.Request) { @@ -432,7 +432,7 @@ func TestSubredditService_Gold(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/list.json") + blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) mux.HandleFunc("/subreddits/gold", func(w http.ResponseWriter, r *http.Request) { @@ -449,7 +449,7 @@ func TestSubredditService_Default(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/list.json") + blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) mux.HandleFunc("/subreddits/default", func(w http.ResponseWriter, r *http.Request) { @@ -466,7 +466,7 @@ func TestSubredditService_Subscribed(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/list.json") + blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) mux.HandleFunc("/subreddits/mine/subscriber", func(w http.ResponseWriter, r *http.Request) { @@ -483,7 +483,7 @@ func TestSubredditService_Approved(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/list.json") + blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) mux.HandleFunc("/subreddits/mine/contributor", func(w http.ResponseWriter, r *http.Request) { @@ -500,7 +500,7 @@ func TestSubredditService_Moderated(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/list.json") + blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) mux.HandleFunc("/subreddits/mine/moderator", func(w http.ResponseWriter, r *http.Request) { @@ -517,7 +517,7 @@ func TestSubredditService_GetSticky1(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/post.json") + blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) mux.HandleFunc("/r/test/about/sticky", func(w http.ResponseWriter, r *http.Request) { @@ -539,7 +539,7 @@ func TestSubredditService_GetSticky2(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/post/post.json") + blob, err := readFileContents("../testdata/post/post.json") require.NoError(t, err) mux.HandleFunc("/r/test/about/sticky", func(w http.ResponseWriter, r *http.Request) { @@ -683,7 +683,7 @@ func TestSubredditService_Search(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/list.json") + blob, err := readFileContents("../testdata/subreddit/list.json") require.NoError(t, err) mux.HandleFunc("/subreddits/search", func(w http.ResponseWriter, r *http.Request) { @@ -715,7 +715,7 @@ func TestSubredditService_SearchNames(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/search-names.json") + blob, err := readFileContents("../testdata/subreddit/search-names.json") require.NoError(t, err) mux.HandleFunc("/api/search_reddit_names", func(w http.ResponseWriter, r *http.Request) { @@ -740,7 +740,7 @@ func TestSubredditService_SearchPosts(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/search-posts.json") + blob, err := readFileContents("../testdata/subreddit/search-posts.json") require.NoError(t, err) mux.HandleFunc("/r/all/search", func(w http.ResponseWriter, r *http.Request) { @@ -765,7 +765,7 @@ func TestSubredditService_SearchPosts_InSubreddit(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/search-posts.json") + blob, err := readFileContents("../testdata/subreddit/search-posts.json") require.NoError(t, err) mux.HandleFunc("/r/test/search", func(w http.ResponseWriter, r *http.Request) { @@ -791,7 +791,7 @@ func TestSubredditService_SearchPosts_InSubreddits(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/search-posts.json") + blob, err := readFileContents("../testdata/subreddit/search-posts.json") require.NoError(t, err) mux.HandleFunc("/r/test+golang+nba/search", func(w http.ResponseWriter, r *http.Request) { @@ -817,7 +817,7 @@ func TestSubredditService_Random(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/random.json") + blob, err := readFileContents("../testdata/subreddit/random.json") require.NoError(t, err) mux.HandleFunc("/r/random", func(w http.ResponseWriter, r *http.Request) { @@ -840,7 +840,7 @@ func TestSubredditService_RandomNSFW(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/random.json") + blob, err := readFileContents("../testdata/subreddit/random.json") require.NoError(t, err) mux.HandleFunc("/r/randnsfw", func(w http.ResponseWriter, r *http.Request) { @@ -880,7 +880,7 @@ func TestSubredditService_Banned(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/banned-users.json") + blob, err := readFileContents("../testdata/subreddit/banned-users.json") require.NoError(t, err) mux.HandleFunc("/r/test/about/banned", func(w http.ResponseWriter, r *http.Request) { @@ -906,7 +906,7 @@ func TestSubredditService_Muted(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/relationships.json") + blob, err := readFileContents("../testdata/subreddit/relationships.json") require.NoError(t, err) mux.HandleFunc("/r/test/about/muted", func(w http.ResponseWriter, r *http.Request) { @@ -932,7 +932,7 @@ func TestSubredditService_WikiBanned(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/banned-users.json") + blob, err := readFileContents("../testdata/subreddit/banned-users.json") require.NoError(t, err) mux.HandleFunc("/r/test/about/wikibanned", func(w http.ResponseWriter, r *http.Request) { @@ -958,7 +958,7 @@ func TestSubredditService_Contributors(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/relationships.json") + blob, err := readFileContents("../testdata/subreddit/relationships.json") require.NoError(t, err) mux.HandleFunc("/r/test/about/contributors", func(w http.ResponseWriter, r *http.Request) { @@ -983,7 +983,7 @@ func TestSubredditService_WikiContributors(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/relationships.json") + blob, err := readFileContents("../testdata/subreddit/relationships.json") require.NoError(t, err) mux.HandleFunc("/r/test/about/wikicontributors", func(w http.ResponseWriter, r *http.Request) { @@ -1008,7 +1008,7 @@ func TestSubredditService_Moderators(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/subreddit/moderators.json") + blob, err := readFileContents("../testdata/subreddit/moderators.json") require.NoError(t, err) mux.HandleFunc("/r/test/about/moderators", func(w http.ResponseWriter, r *http.Request) { diff --git a/things.go b/reddit/things.go similarity index 100% rename from things.go rename to reddit/things.go diff --git a/timestamp.go b/reddit/timestamp.go similarity index 100% rename from timestamp.go rename to reddit/timestamp.go diff --git a/timestamp_test.go b/reddit/timestamp_test.go similarity index 100% rename from timestamp_test.go rename to reddit/timestamp_test.go diff --git a/user.go b/reddit/user.go similarity index 100% rename from user.go rename to reddit/user.go diff --git a/user_test.go b/reddit/user_test.go similarity index 92% rename from user_test.go rename to reddit/user_test.go index 7f65ab2..3ab62c3 100644 --- a/user_test.go +++ b/reddit/user_test.go @@ -190,7 +190,7 @@ func TestUserService_Get(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/get.json") + blob, err := readFileContents("../testdata/user/get.json") require.NoError(t, err) mux.HandleFunc("/user/Test_User/about", func(w http.ResponseWriter, r *http.Request) { @@ -207,7 +207,7 @@ func TestUserService_GetMultipleByID(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/get-multiple-by-id.json") + blob, err := readFileContents("../testdata/user/get-multiple-by-id.json") require.NoError(t, err) mux.HandleFunc("/api/user_data_by_account_ids", func(w http.ResponseWriter, r *http.Request) { @@ -255,7 +255,7 @@ func TestUserService_Overview(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/overview.json") + blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) mux.HandleFunc("/user/user1/overview", func(w http.ResponseWriter, r *http.Request) { @@ -281,7 +281,7 @@ func TestUserService_OverviewOf(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/overview.json") + blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) mux.HandleFunc("/user/user2/overview", func(w http.ResponseWriter, r *http.Request) { @@ -307,7 +307,7 @@ func TestUserService_Overview_Options(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/overview.json") + blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) mux.HandleFunc("/user/user1/overview", func(w http.ResponseWriter, r *http.Request) { @@ -339,7 +339,7 @@ func TestUserService_Posts(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user1/submitted", func(w http.ResponseWriter, r *http.Request) { @@ -360,7 +360,7 @@ func TestUserService_PostsOf(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user2/submitted", func(w http.ResponseWriter, r *http.Request) { @@ -381,7 +381,7 @@ func TestUserService_Posts_Options(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user1/submitted", func(w http.ResponseWriter, r *http.Request) { @@ -411,7 +411,7 @@ func TestUserService_Comments(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/comments.json") + blob, err := readFileContents("../testdata/user/comments.json") require.NoError(t, err) mux.HandleFunc("/user/user1/comments", func(w http.ResponseWriter, r *http.Request) { @@ -432,7 +432,7 @@ func TestUserService_CommentsOf(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/comments.json") + blob, err := readFileContents("../testdata/user/comments.json") require.NoError(t, err) mux.HandleFunc("/user/user2/comments", func(w http.ResponseWriter, r *http.Request) { @@ -453,7 +453,7 @@ func TestUserService_Comments_Options(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/comments.json") + blob, err := readFileContents("../testdata/user/comments.json") require.NoError(t, err) mux.HandleFunc("/user/user1/comments", func(w http.ResponseWriter, r *http.Request) { @@ -484,7 +484,7 @@ func TestUserService_Saved(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/overview.json") + blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) mux.HandleFunc("/user/user1/saved", func(w http.ResponseWriter, r *http.Request) { @@ -511,7 +511,7 @@ func TestUserService_Saved_Options(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/overview.json") + blob, err := readFileContents("../testdata/user/overview.json") require.NoError(t, err) mux.HandleFunc("/user/user1/saved", func(w http.ResponseWriter, r *http.Request) { @@ -541,7 +541,7 @@ func TestUserService_Upvoted(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user1/upvoted", func(w http.ResponseWriter, r *http.Request) { @@ -563,7 +563,7 @@ func TestUserService_Upvoted_Options(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user1/upvoted", func(w http.ResponseWriter, r *http.Request) { @@ -594,7 +594,7 @@ func TestUserService_UpvotedOf(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user2/upvoted", func(w http.ResponseWriter, r *http.Request) { @@ -616,7 +616,7 @@ func TestUserService_Downvoted(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user1/downvoted", func(w http.ResponseWriter, r *http.Request) { @@ -638,7 +638,7 @@ func TestUserService_Downvoted_Options(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user1/downvoted", func(w http.ResponseWriter, r *http.Request) { @@ -669,7 +669,7 @@ func TestUserService_DownvotedOf(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user2/downvoted", func(w http.ResponseWriter, r *http.Request) { @@ -691,7 +691,7 @@ func TestUserService_Hidden(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user1/hidden", func(w http.ResponseWriter, r *http.Request) { @@ -713,7 +713,7 @@ func TestUserService_Gilded(t *testing.T) { defer teardown() // we'll use this, similar payloads - blob, err := readFileContents("testdata/user/submitted.json") + blob, err := readFileContents("../testdata/user/submitted.json") require.NoError(t, err) mux.HandleFunc("/user/user1/gilded", func(w http.ResponseWriter, r *http.Request) { @@ -734,7 +734,7 @@ func TestUserService_GetFriendship(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/friend.json") + blob, err := readFileContents("../testdata/user/friend.json") require.NoError(t, err) mux.HandleFunc("/api/v1/me/friends/test123", func(w http.ResponseWriter, r *http.Request) { @@ -751,7 +751,7 @@ func TestUserService_Friend(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/friend.json") + blob, err := readFileContents("../testdata/user/friend.json") require.NoError(t, err) mux.HandleFunc("/api/v1/me/friends/test123", func(w http.ResponseWriter, r *http.Request) { @@ -792,7 +792,7 @@ func TestUserService_Block(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/block.json") + blob, err := readFileContents("../testdata/user/block.json") require.NoError(t, err) mux.HandleFunc("/api/block_user", func(w http.ResponseWriter, r *http.Request) { @@ -817,7 +817,7 @@ func TestUserService_BlockByID(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/block.json") + blob, err := readFileContents("../testdata/user/block.json") require.NoError(t, err) mux.HandleFunc("/api/block_user", func(w http.ResponseWriter, r *http.Request) { @@ -888,7 +888,7 @@ func TestUserService_Trophies(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/trophies.json") + blob, err := readFileContents("../testdata/user/trophies.json") require.NoError(t, err) mux.HandleFunc("/api/v1/user/user1/trophies", func(w http.ResponseWriter, r *http.Request) { @@ -905,7 +905,7 @@ func TestUserService_TrophiesOf(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/trophies.json") + blob, err := readFileContents("../testdata/user/trophies.json") require.NoError(t, err) mux.HandleFunc("/api/v1/user/test123/trophies", func(w http.ResponseWriter, r *http.Request) { @@ -922,7 +922,7 @@ func TestUserService_Popular(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/user-subreddits.json") + blob, err := readFileContents("../testdata/user/user-subreddits.json") require.NoError(t, err) mux.HandleFunc("/users/popular", func(w http.ResponseWriter, r *http.Request) { @@ -939,7 +939,7 @@ func TestUserService_New(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/user-subreddits.json") + blob, err := readFileContents("../testdata/user/user-subreddits.json") require.NoError(t, err) mux.HandleFunc("/users/new", func(w http.ResponseWriter, r *http.Request) { @@ -956,7 +956,7 @@ func TestUserService_Search(t *testing.T) { setup() defer teardown() - blob, err := readFileContents("testdata/user/list.json") + blob, err := readFileContents("../testdata/user/list.json") require.NoError(t, err) mux.HandleFunc("/users/search", func(w http.ResponseWriter, r *http.Request) {