projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6b29b49
)
Clean up some imports
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 24 May 2017 18:28:31 +0000
(20:28 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Wed, 24 May 2017 18:28:31 +0000
(20:28 +0200)
49 files changed:
src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
patch
|
blob
|
history
src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/AboutPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/TrustPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/UnlikePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
patch
|
blob
|
history
src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt
patch
|
blob
|
history
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt
index
7809817
..
3a93679
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/AboutPage.kt
@@
-3,7
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.main.SonePlugin.PluginHomepage
import net.pterodactylus.sone.main.SonePlugin.PluginVersion
import net.pterodactylus.sone.main.SonePlugin.PluginYear
import net.pterodactylus.sone.main.SonePlugin.PluginHomepage
import net.pterodactylus.sone.main.SonePlugin.PluginVersion
import net.pterodactylus.sone.main.SonePlugin.PluginYear
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt
index
f1e8ac2
..
519d49e
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarkPage.kt
@@
-1,7
+1,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
index
82278f5
..
e4b3d28
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/BookmarksPage.kt
@@
-2,7
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.utils.Pagination
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.utils.Pagination
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
index
3a628dd
..
d14ba3a
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPage.kt
@@
-3,7
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
import net.pterodactylus.sone.text.TextFilter
import net.pterodactylus.sone.utils.isPOST
import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
import net.pterodactylus.sone.text.TextFilter
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt
index
6e39d49
..
fe7027c
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/CreatePostPage.kt
@@
-2,7
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.text.TextFilter
import net.pterodactylus.sone.utils.isPOST
import net.pterodactylus.sone.text.TextFilter
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt
index
2283fee
..
a83128b
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPage.kt
@@
-2,7
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.text.TextFilter
import net.pterodactylus.sone.utils.isPOST
import net.pterodactylus.sone.text.TextFilter
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
index
f864b73
..
6007346
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/CreateSonePage.kt
@@
-3,7
+3,6
@@
package net.pterodactylus.sone.web.pages
import freenet.clients.http.ToadletContext
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.utils.isPOST
import freenet.clients.http.ToadletContext
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
index
8009c72
..
66f989a
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPage.kt
@@
-1,7
+1,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt
index
dc272be
..
de118be
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePage.kt
@@
-1,7
+1,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt
index
c7931cf
..
eab54a7
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeletePostPage.kt
@@
-1,7
+1,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
index
5c1abdf
..
63cf17f
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPage.kt
@@
-1,7
+1,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
index
0b922b0
..
e9d536b
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPage.kt
@@
-1,7
+1,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt
index
299fb80
..
7868484
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePage.kt
@@
-1,7
+1,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt
index
6e8a3d2
..
4c2472a
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPage.kt
@@
-1,6
+1,5
@@
package net.pterodactylus.sone.web.pages
package net.pterodactylus.sone.web.pages
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt
index
bb70ecc
..
d23d0e7
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/DistrustPage.kt
@@
-1,7
+1,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
index
1e45744
..
119d271
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPage.kt
@@
-2,7
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
import net.pterodactylus.sone.utils.isPOST
import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
b/src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
index
560c607
..
442aa7b
100644
(file)
--- a/
src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
+++ b/
src/main/kotlin/net/pterodactylus/sone/web/pages/LoginPage.kt
@@
-4,7
+4,6
@@
import freenet.clients.http.ToadletContext
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.utils.emptyToNull
import net.pterodactylus.sone.utils.isPOST
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.utils.emptyToNull
import net.pterodactylus.sone.utils.isPOST
-import net.pterodactylus.sone.web.pages.SoneTemplatePage
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
import net.pterodactylus.sone.web.WebInterface
import net.pterodactylus.sone.web.page.FreenetRequest
import net.pterodactylus.util.template.Template
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/AboutPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/AboutPageTest.kt
index
93672a1
..
c692960
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/AboutPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/AboutPageTest.kt
@@
-3,8
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.main.SonePlugin.PluginHomepage
import net.pterodactylus.sone.main.SonePlugin.PluginVersion
import net.pterodactylus.sone.main.SonePlugin.PluginYear
import net.pterodactylus.sone.main.SonePlugin.PluginHomepage
import net.pterodactylus.sone.main.SonePlugin.PluginVersion
import net.pterodactylus.sone.main.SonePlugin.PluginYear
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.AboutPage
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Test
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Test
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
index
9300085
..
0fe428e
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarkPageTest.kt
@@
-2,8
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.BookmarkPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt
index
327c3be
..
f0a9d49
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/BookmarksPageTest.kt
@@
-4,8
+4,6
@@
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.utils.Pagination
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.utils.Pagination
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.BookmarksPage
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import org.hamcrest.Matchers.equalTo
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt
index
c7bdce3
..
7c4f07b
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateAlbumPageTest.kt
@@
-6,8
+6,6
@@
import net.pterodactylus.sone.data.Album.Modifier.AlbumTitleMustNotBeEmpty
import net.pterodactylus.sone.test.deepMock
import net.pterodactylus.sone.test.selfMock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.deepMock
import net.pterodactylus.sone.test.selfMock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.CreateAlbumPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
index
e337973
..
657c0ce
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/CreatePostPageTest.kt
@@
-4,8
+4,6
@@
import com.google.common.base.Optional.absent
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.asOptional
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.asOptional
import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.CreatePostPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt
index
7a545c5
..
b7df1d1
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateReplyPageTest.kt
@@
-3,8
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.CreateReplyPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt
index
a01a6a7
..
d57b1d0
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/CreateSonePageTest.kt
@@
-5,8
+5,6
@@
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.freenet.wot.OwnIdentity
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.freenet.wot.OwnIdentity
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.CreateSonePage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
index
a32e513
..
c618400
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteAlbumPageTest.kt
@@
-4,8
+4,6
@@
import net.pterodactylus.sone.data.Album
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteAlbumPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
index
c773976
..
4a67c66
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteImagePageTest.kt
@@
-5,8
+5,6
@@
import net.pterodactylus.sone.data.Image
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteImagePage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
index
0dbcc43
..
25a4728
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeletePostPageTest.kt
@@
-4,8
+4,6
@@
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeletePostPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
index
56bdfe1
..
df91d74
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteProfileFieldPageTest.kt
@@
-2,8
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteProfileFieldPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt
index
eb2d184
..
c03afc8
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteReplyPageTest.kt
@@
-4,8
+4,6
@@
import net.pterodactylus.sone.data.PostReply
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteReplyPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePageTest.kt
index
0ca5149
..
92c682d
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DeleteSonePageTest.kt
@@
-1,14
+1,10
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.test.whenever
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DeleteSonePage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Test
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.junit.Test
-import org.mockito.ArgumentMatchers
-import org.mockito.ArgumentMatchers.any
import org.mockito.Mockito.any
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.Mockito.any
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt
index
570780c
..
5ce0dcb
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DismissNotificationPageTest.kt
@@
-2,10
+2,7
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DismissNotificationPage
import net.pterodactylus.util.notify.Notification
import net.pterodactylus.util.notify.Notification
-import net.pterodactylus.util.web.Method.GET
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
index
d5279f1
..
5e6aee5
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/DistrustPageTest.kt
@@
-3,8
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.DistrustPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
index
06a2508
..
b04ea8d
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditAlbumPageTest.kt
@@
-7,8
+7,6
@@
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mockBuilder
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mockBuilder
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.EditAlbumPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt
index
350dc7e
..
0d46f6c
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfileFieldPageTest.kt
@@
-2,8
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.EditProfileFieldPage
-import net.pterodactylus.sone.web.pages.WebPageTest
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
index
fd03d0a
..
579d158
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/EditProfilePageTest.kt
@@
-4,8
+4,6
@@
import net.pterodactylus.sone.data.Image
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.EditProfilePage
-import net.pterodactylus.sone.web.pages.WebPageTest
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
index
c4049f7
..
274bdbf
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/LoginPageTest.kt
@@
-6,8
+6,6
@@
import net.pterodactylus.sone.freenet.wot.OwnIdentity
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.thenReturnMock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.thenReturnMock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.WebPageTest
-import net.pterodactylus.sone.web.pages.LoginPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
index
6c31ea8
..
7146f2e
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/OptionsPageTest.kt
@@
-3,12
+3,10
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions
import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent.FOLLOWED
import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent.TRUSTED
import net.pterodactylus.sone.data.SoneOptions.DefaultSoneOptions
import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent.FOLLOWED
import net.pterodactylus.sone.data.SoneOptions.LoadExternalContent.TRUSTED
-import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.ALWAYS
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.NO
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.ALWAYS
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.NO
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired.WRITING
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.OptionsPage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
index
274dba8
..
6dbcdc0
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/ReloadingPageTest.kt
@@
-1,6
+1,5
@@
package net.pterodactylus.sone.web.pages
package net.pterodactylus.sone.web.pages
-import net.pterodactylus.sone.web.pages.ReloadingPage
import net.pterodactylus.sone.web.page.FreenetRequest
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.sone.web.page.FreenetRequest
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
index
ad162bf
..
547c580
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/RescuePageTest.kt
@@
-3,7
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.core.SoneRescuer
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.core.SoneRescuer
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.RescuePage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
index
65b65a9
..
8790283
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/SearchPageTest.kt
@@
-10,7
+10,6
@@
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.asOptional
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.asOptional
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.SearchPage
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import org.junit.Test
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import org.junit.Test
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/TrustPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/TrustPageTest.kt
index
c5e34ea
..
cc4b1dc
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/TrustPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/TrustPageTest.kt
@@
-2,7
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.pages.TrustPage
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.ArgumentMatchers.any
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.ArgumentMatchers.any
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt
index
4be4a79
..
c6c37a5
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/UnbookmarkPageTest.kt
@@
-3,7
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.UnbookmarkPage
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.Mockito.any
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.Mockito.any
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePageTest.kt
index
03fec7f
..
ad5216e
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/UnfollowSonePageTest.kt
@@
-1,6
+1,5
@@
package net.pterodactylus.sone.web.pages
package net.pterodactylus.sone.web.pages
-import net.pterodactylus.sone.web.pages.UnfollowSonePage
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.Mockito.verify
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.Mockito.verify
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/UnlikePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/UnlikePageTest.kt
index
3cd7d99
..
f1050d2
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/UnlikePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/UnlikePageTest.kt
@@
-1,12
+1,8
@@
package net.pterodactylus.sone.web.pages
package net.pterodactylus.sone.web.pages
-import net.pterodactylus.sone.web.pages.UnlikePage
-import net.pterodactylus.util.web.Method
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
-import org.mockito.ArgumentMatchers
import org.mockito.ArgumentMatchers.any
import org.mockito.ArgumentMatchers.any
-import org.mockito.Mockito
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePageTest.kt
index
5e32d84
..
70756e1
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/UnlockSonePageTest.kt
@@
-3,7
+3,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.UnlockSonePage
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.ArgumentMatchers.any
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.ArgumentMatchers.any
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt
index
b20bbdf
..
f83190f
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/UntrustPageTest.kt
@@
-2,7
+2,6
@@
package net.pterodactylus.sone.web.pages
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.mock
-import net.pterodactylus.sone.web.pages.UntrustPage
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.ArgumentMatchers.any
import net.pterodactylus.util.web.Method.POST
import org.junit.Test
import org.mockito.ArgumentMatchers.any
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
index
1f7a0c1
..
8bea89e
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/UploadImagePageTest.kt
@@
-8,7
+8,6
@@
import net.pterodactylus.sone.data.TemporaryImage
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mockBuilder
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.mockBuilder
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.UploadImagePage
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import net.pterodactylus.util.web.Method.POST
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
index
bbc03bf
..
1b20bfc
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/ViewPostPageTest.kt
@@
-4,7
+4,6
@@
import net.pterodactylus.sone.data.Post
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.data.Profile
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.ViewPostPage
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.hamcrest.Matchers.nullValue
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.equalTo
import org.hamcrest.Matchers.nullValue
diff --git
a/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt
b/src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt
index
641e73e
..
335d839
100644
(file)
--- a/
src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt
+++ b/
src/test/kotlin/net/pterodactylus/sone/web/pages/ViewSonePageTest.kt
@@
-7,7
+7,6
@@
import net.pterodactylus.sone.data.Sone
import net.pterodactylus.sone.test.asOptional
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
import net.pterodactylus.sone.test.asOptional
import net.pterodactylus.sone.test.mock
import net.pterodactylus.sone.test.whenever
-import net.pterodactylus.sone.web.pages.ViewSonePage
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import org.hamcrest.Matchers.equalTo
import org.hamcrest.MatcherAssert.assertThat
import org.hamcrest.Matchers.contains
import org.hamcrest.Matchers.equalTo