Skip to content

Commit 8240cc6

Browse files
committed
Added RandomUserAgent class, updated Readme file, completed tests, minor changes.
1 parent 64d961b commit 8240cc6

File tree

11 files changed

+1723
-72
lines changed

11 files changed

+1723
-72
lines changed

src/main/java/reverso/Main.java

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/main/java/reverso/Reverso.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
package reverso;
22

33
import com.google.gson.Gson;
4-
import com.google.gson.GsonBuilder;
54
import org.jsoup.Connection;
65
import org.jsoup.Jsoup;
76
import org.jsoup.nodes.Document;
87
import reverso.data.parser.HtmlParser;
8+
import reverso.data.request.RandomUserAgent;
99
import reverso.data.request.SpellCheckRequest;
1010
import reverso.data.response.impl.*;
11-
import reverso.supportedLanguages.Language;
12-
import reverso.supportedLanguages.Voice;
11+
import reverso.language.Language;
12+
import reverso.language.Voice;
1313
import java.io.IOException;
1414
import java.util.*;
1515

@@ -38,6 +38,7 @@ public SynonymResponse getSynonyms(Language language, String word) {
3838
Connection.Response response;
3939
try {
4040
response = Jsoup.connect(URL)
41+
.header("User-Agent", RandomUserAgent.getRandomUserAgent())
4142
.ignoreHttpErrors(true)
4243
.execute();
4344
} catch (IOException e) {
@@ -65,14 +66,15 @@ public ContextResponse getContext(Language sourceLanguage, Language targetLangua
6566
contextResponse.setErrorMessage(properties.getProperty("message.error.context.sameLanguage"));
6667
return contextResponse;
6768
}
68-
String URL = CONTEXT_URL + sourceLanguage.toString() + "-" + targetLanguage.toString() + "/" + word;
69+
String URL = CONTEXT_URL + sourceLanguage + "-" + targetLanguage + "/" + word;
6970

7071
Document document;
7172
Map<String, String> contextMap;
7273
String[] translations;
7374
Connection.Response response;
7475
try {
7576
response = Jsoup.connect(URL)
77+
.header("User-Agent", RandomUserAgent.getRandomUserAgent())
7678
.ignoreHttpErrors(true)
7779
.execute();
7880
document = response.parse();
@@ -107,6 +109,7 @@ public VoiceResponse getVoiceStream(Voice voice, String text) {
107109
Connection.Response response;
108110
try {
109111
response = Jsoup.connect(requestURL)
112+
.header("User-Agent", RandomUserAgent.getRandomUserAgent())
110113
.ignoreContentType(true)
111114
.ignoreHttpErrors(true)
112115
.execute();
@@ -143,6 +146,7 @@ public ConjugationResponse getWordConjugation(Language language, String word) {
143146
Connection.Response response;
144147
try {
145148
response = Jsoup.connect(URL)
149+
.header("User-Agent", RandomUserAgent.getRandomUserAgent())
146150
.ignoreContentType(true)
147151
.ignoreHttpErrors(true)
148152
.execute();
@@ -177,6 +181,7 @@ public SpellCheckResponse getSpellCheck(Language language, String text) {
177181
try {
178182
response = Jsoup.connect(SPELLCHECK_URL)
179183
.header("Content-Type", "application/json")
184+
.header("User-Agent", RandomUserAgent.getRandomUserAgent())
180185
.ignoreContentType(true)
181186
.ignoreHttpErrors(true)
182187
.requestBody(requestJson)

src/main/java/reverso/data/request/RandomUserAgent.java

Lines changed: 1670 additions & 0 deletions
Large diffs are not rendered by default.

src/main/java/reverso/data/request/TranslationRequest.java

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/main/java/reverso/supportedLanguages/Language.java renamed to src/main/java/reverso/language/Language.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package reverso.supportedLanguages;
1+
package reverso.language;
22

33
public enum Language {
44
ARABIC("ar", true, null),

src/main/java/reverso/supportedLanguages/Voice.java renamed to src/main/java/reverso/language/Voice.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package reverso.supportedLanguages;
1+
package reverso.language;
22

33
import java.util.Arrays;
44
import java.util.concurrent.ThreadLocalRandom;

src/test/java/reverso/getContextTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.junit.jupiter.api.*;
44
import reverso.data.response.impl.ContextResponse;
5-
import reverso.supportedLanguages.Language;
5+
import reverso.language.Language;
66

77
import java.io.IOException;
88
import java.util.Properties;

src/test/java/reverso/getSpellCheck.java

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.junit.jupiter.api.Test;
66
import org.junit.jupiter.api.TestInstance;
77
import reverso.data.response.impl.SpellCheckResponse;
8-
import reverso.supportedLanguages.Language;
8+
import reverso.language.Language;
99
import static org.junit.jupiter.api.Assertions.*;
1010
import java.io.IOException;
1111
import java.util.Properties;
@@ -34,7 +34,7 @@ void initializeReversoAndProperties() {
3434
}
3535

3636
@Test
37-
void SuccessEnglishSpellCheckRequest() {
37+
void successEnglishSpellCheckRequest() {
3838

3939
String englishText = "here ve have errores, we shuld to fix et";
4040
SpellCheckResponse response = reverso.getSpellCheck(Language.ENGLISH,englishText);
@@ -46,6 +46,42 @@ void SuccessEnglishSpellCheckRequest() {
4646
assertNotNull(response.getStats());
4747
}
4848

49+
@Test
50+
void successFrenchSpellCheckRequest() {
51+
52+
String frenchText = "Je sui arivé a l'otel en Paris, é j'aim bocoup moin la vil.";
53+
54+
SpellCheckResponse response = reverso.getSpellCheck(Language.FRENCH,frenchText);
55+
56+
assertTrue(response.isOK());
57+
assertNull(response.getErrorMessage());
58+
assertNotNull(response.getCorrectedText());
59+
assertNotEquals(frenchText, response.getCorrectedText());
60+
assertNotNull(response.getStats());
61+
}
62+
63+
64+
@Test
65+
void failedUnsupportedRussianSpellCheckRequest() {
66+
67+
SpellCheckResponse response = reverso.getSpellCheck(Language.RUSSIAN,"good luck");
68+
69+
assertFalse(response.isOK());
70+
assertNotNull(response.getErrorMessage());
71+
assertEquals(properties.getProperty("message.error.spellCheck.unsupportedLanguage"), response.getErrorMessage());
72+
assertNull(response.getCorrectedText());
73+
}
74+
75+
@Test
76+
void failedNoMistakesOnTextSpellCheckRequest() {
77+
78+
SpellCheckResponse response = reverso.getSpellCheck(Language.SPANISH,"hola");
79+
80+
assertFalse(response.isOK());
81+
assertNotNull(response.getErrorMessage());
82+
assertEquals(properties.getProperty("message.error.spellCheck.noErrorsOrMismatchedLanguage"), response.getErrorMessage());
83+
}
84+
4985
@AfterEach
5086
void initializeInstance(){
5187
spellCheckResponse = null;

src/test/java/reverso/getSynonymsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import org.junit.jupiter.api.Test;
66
import org.junit.jupiter.api.TestInstance;
77
import reverso.data.response.impl.SynonymResponse;
8-
import reverso.supportedLanguages.Language;
8+
import reverso.language.Language;
99
import static org.junit.jupiter.api.Assertions.*;
1010

1111
import java.io.IOException;

src/test/java/reverso/getVoiceStreamTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import org.junit.jupiter.api.*;
44
import reverso.data.response.impl.VoiceResponse;
5-
import reverso.supportedLanguages.Voice;
5+
import reverso.language.Voice;
66

77
import java.io.IOException;
88
import java.util.Properties;

0 commit comments

Comments
 (0)