aboutsummaryrefslogtreecommitdiff
path: root/src/test/java/com/juick
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2020-03-07 13:20:45 +0300
committerGravatar Vitaly Takmazov2020-03-07 13:20:45 +0300
commitc9d67837cbcaae84a03b7bd14e508ca62880f87f (patch)
tree0f66e38f5b6aa48c66fae7d10c0b8b5ad6f7e7e2 /src/test/java/com/juick
parentad50d1090b303d3a71c354dd2922a982fda6a289 (diff)
Reorganize project layout
Diffstat (limited to 'src/test/java/com/juick')
-rw-r--r--src/test/java/com/juick/MessageTest.java1
-rw-r--r--src/test/java/com/juick/UserTest.java1
-rw-r--r--src/test/java/com/juick/server/tests/ServerTests.java10
-rw-r--r--src/test/java/com/juick/test/util/MockUtils.java4
4 files changed, 7 insertions, 9 deletions
diff --git a/src/test/java/com/juick/MessageTest.java b/src/test/java/com/juick/MessageTest.java
index 52b2b4a9..9de3163b 100644
--- a/src/test/java/com/juick/MessageTest.java
+++ b/src/test/java/com/juick/MessageTest.java
@@ -18,6 +18,7 @@
package com.juick;
import com.juick.model.Entity;
+import com.juick.model.Message;
import com.juick.test.util.MockUtils;
import com.juick.util.MessageUtils;
import com.overzealous.remark.Options;
diff --git a/src/test/java/com/juick/UserTest.java b/src/test/java/com/juick/UserTest.java
index a95f7bd9..1ae24e6d 100644
--- a/src/test/java/com/juick/UserTest.java
+++ b/src/test/java/com/juick/UserTest.java
@@ -18,6 +18,7 @@
package com.juick;
import com.fasterxml.jackson.databind.ObjectMapper;
+import com.juick.model.User;
import com.juick.test.util.MockUtils;
import org.junit.Assert;
import org.junit.Test;
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index f540fd01..6b5a60a4 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -29,12 +29,8 @@ import com.gargoylesoftware.htmlunit.html.DomElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.github.scribejava.apis.AppleClientSecretGenerator;
import com.jayway.jsonpath.JsonPath;
-import com.juick.*;
import com.juick.formatters.PlainTextFormatter;
-import com.juick.model.AnonymousUser;
-import com.juick.model.CommandResult;
-import com.juick.model.PrivateChats;
-import com.juick.model.TagStats;
+import com.juick.model.*;
import com.juick.server.*;
import com.juick.server.api.SystemActivity;
import com.juick.server.api.Users;
@@ -1095,7 +1091,7 @@ public class ServerTests {
@Test
public void tagsShouldBeDeserializedFromXml() throws JAXBException {
XmppSessionConfiguration configuration = XmppSessionConfiguration.builder()
- .extensions(Extension.of(com.juick.Message.class))
+ .extensions(Extension.of(Message.class))
.build();
XmppSession xmpp = new XmppSession("juick.com", configuration) {
@Override
@@ -1993,7 +1989,7 @@ public class ServerTests {
.param("username", "testuser")
.param("password", "demopassword")
.param("verificationCode", "123456")).andExpect(status().isOk()).andReturn();
- com.juick.User testuser = jsonMapper.readValue(result.getResponse().getContentAsString(), User.class);
+ User testuser = jsonMapper.readValue(result.getResponse().getContentAsString(), User.class);
assertThat(testuser.getName(), is("testuser"));
}
diff --git a/src/test/java/com/juick/test/util/MockUtils.java b/src/test/java/com/juick/test/util/MockUtils.java
index e7bda8a1..ad926e10 100644
--- a/src/test/java/com/juick/test/util/MockUtils.java
+++ b/src/test/java/com/juick/test/util/MockUtils.java
@@ -17,8 +17,8 @@
package com.juick.test.util;
-import com.juick.Message;
-import com.juick.User;
+import com.juick.model.Message;
+import com.juick.model.User;
import org.apache.commons.text.RandomStringGenerator;
import java.time.Instant;