Added RandomUserAgent class, updated Readme file, completed tests, mi…

…nor changes.
Anton3413 · Jul 5, 2024 · 8240cc6 · 8240cc6
1 parent 64d961b
commit 8240cc6
Show file tree

Hide file tree

Showing 11 changed files with 1,723 additions and 72 deletions.
diff --git a/src/main/java/reverso/Main.java b/src/main/java/reverso/Main.java
diff --git a/src/main/java/reverso/Reverso.java b/src/main/java/reverso/Reverso.java
@@ -1,15 +1,15 @@
 package reverso;
 
 import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import org.jsoup.Connection;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import reverso.data.parser.HtmlParser;
+import reverso.data.request.RandomUserAgent;
 import reverso.data.request.SpellCheckRequest;
 import reverso.data.response.impl.*;
-import reverso.supportedLanguages.Language;
-import reverso.supportedLanguages.Voice;
+import reverso.language.Language;
+import reverso.language.Voice;
 import java.io.IOException;
 import java.util.*;
 
@@ -38,6 +38,7 @@ public SynonymResponse getSynonyms(Language language, String word) {
         Connection.Response response;
         try {
             response = Jsoup.connect(URL)
+                    .header("User-Agent", RandomUserAgent.getRandomUserAgent())
                     .ignoreHttpErrors(true)
                     .execute();
         } catch (IOException e) {
@@ -65,14 +66,15 @@ public ContextResponse getContext(Language sourceLanguage, Language targetLangua
             contextResponse.setErrorMessage(properties.getProperty("message.error.context.sameLanguage"));
             return contextResponse;
         }
-        String URL = CONTEXT_URL + sourceLanguage.toString() + "-" + targetLanguage.toString() + "/" + word;
+        String URL = CONTEXT_URL + sourceLanguage + "-" + targetLanguage + "/" + word;
 
         Document document;
         Map<String, String> contextMap;
         String[] translations;
         Connection.Response response;
         try {
             response = Jsoup.connect(URL)
+                    .header("User-Agent", RandomUserAgent.getRandomUserAgent())
                     .ignoreHttpErrors(true)
                     .execute();
             document = response.parse();
@@ -107,6 +109,7 @@ public VoiceResponse getVoiceStream(Voice voice, String text) {
         Connection.Response response;
         try {
             response = Jsoup.connect(requestURL)
+                    .header("User-Agent", RandomUserAgent.getRandomUserAgent())
                     .ignoreContentType(true)
                     .ignoreHttpErrors(true)
                     .execute();
@@ -143,6 +146,7 @@ public ConjugationResponse getWordConjugation(Language language, String word) {
         Connection.Response response;
         try {
             response = Jsoup.connect(URL)
+                    .header("User-Agent", RandomUserAgent.getRandomUserAgent())
                     .ignoreContentType(true)
                     .ignoreHttpErrors(true)
                     .execute();
@@ -177,6 +181,7 @@ public SpellCheckResponse getSpellCheck(Language language, String text) {
         try {
             response = Jsoup.connect(SPELLCHECK_URL)
                     .header("Content-Type", "application/json")
+                    .header("User-Agent", RandomUserAgent.getRandomUserAgent())
                     .ignoreContentType(true)
                     .ignoreHttpErrors(true)
                     .requestBody(requestJson)

diff --git a/src/main/java/reverso/data/request/RandomUserAgent.java b/src/main/java/reverso/data/request/RandomUserAgent.java
diff --git a/src/main/java/reverso/data/request/TranslationRequest.java b/src/main/java/reverso/data/request/TranslationRequest.java
diff --git a/.../reverso/supportedLanguages/Language.java → src/main/java/reverso/language/Language.java b/.../reverso/supportedLanguages/Language.java → src/main/java/reverso/language/Language.java
@@ -1,4 +1,4 @@
-package reverso.supportedLanguages;
+package reverso.language;
 
 public enum Language {
     ARABIC("ar", true, null),

diff --git a/...ava/reverso/supportedLanguages/Voice.java → src/main/java/reverso/language/Voice.java b/...ava/reverso/supportedLanguages/Voice.java → src/main/java/reverso/language/Voice.java
@@ -1,4 +1,4 @@
-package reverso.supportedLanguages;
+package reverso.language;
 
 import java.util.Arrays;
 import java.util.concurrent.ThreadLocalRandom;

diff --git a/src/test/java/reverso/getContextTest.java b/src/test/java/reverso/getContextTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.jupiter.api.*;
 import reverso.data.response.impl.ContextResponse;
-import reverso.supportedLanguages.Language;
+import reverso.language.Language;
 
 import java.io.IOException;
 import java.util.Properties;

diff --git a/src/test/java/reverso/getSpellCheck.java b/src/test/java/reverso/getSpellCheck.java
@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import reverso.data.response.impl.SpellCheckResponse;
-import reverso.supportedLanguages.Language;
+import reverso.language.Language;
 import static org.junit.jupiter.api.Assertions.*;
 import java.io.IOException;
 import java.util.Properties;
@@ -34,7 +34,7 @@ void initializeReversoAndProperties() {
     }
 
     @Test
-    void SuccessEnglishSpellCheckRequest() {
+    void successEnglishSpellCheckRequest() {
 
         String englishText = "here ve have errores, we shuld to fix et";
         SpellCheckResponse response = reverso.getSpellCheck(Language.ENGLISH,englishText);
@@ -46,6 +46,42 @@ void SuccessEnglishSpellCheckRequest() {
         assertNotNull(response.getStats());
     }
 
+    @Test
+    void successFrenchSpellCheckRequest() {
+
+        String frenchText = "Je sui arivé a l'otel en Paris, é j'aim bocoup moin la vil.";
+
+        SpellCheckResponse response = reverso.getSpellCheck(Language.FRENCH,frenchText);
+
+        assertTrue(response.isOK());
+        assertNull(response.getErrorMessage());
+        assertNotNull(response.getCorrectedText());
+        assertNotEquals(frenchText, response.getCorrectedText());
+        assertNotNull(response.getStats());
+    }
+
+
+    @Test
+    void failedUnsupportedRussianSpellCheckRequest() {
+
+        SpellCheckResponse response = reverso.getSpellCheck(Language.RUSSIAN,"good luck");
+
+        assertFalse(response.isOK());
+        assertNotNull(response.getErrorMessage());
+        assertEquals(properties.getProperty("message.error.spellCheck.unsupportedLanguage"), response.getErrorMessage());
+        assertNull(response.getCorrectedText());
+    }
+
+    @Test
+    void failedNoMistakesOnTextSpellCheckRequest() {
+
+        SpellCheckResponse response = reverso.getSpellCheck(Language.SPANISH,"hola");
+
+        assertFalse(response.isOK());
+        assertNotNull(response.getErrorMessage());
+        assertEquals(properties.getProperty("message.error.spellCheck.noErrorsOrMismatchedLanguage"), response.getErrorMessage());
+    }
+
     @AfterEach
     void initializeInstance(){
         spellCheckResponse = null;

diff --git a/src/test/java/reverso/getSynonymsTest.java b/src/test/java/reverso/getSynonymsTest.java
@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import reverso.data.response.impl.SynonymResponse;
-import reverso.supportedLanguages.Language;
+import reverso.language.Language;
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.io.IOException;

diff --git a/src/test/java/reverso/getVoiceStreamTest.java b/src/test/java/reverso/getVoiceStreamTest.java
@@ -2,7 +2,7 @@
 
 import org.junit.jupiter.api.*;
 import reverso.data.response.impl.VoiceResponse;
-import reverso.supportedLanguages.Voice;
+import reverso.language.Voice;
 
 import java.io.IOException;
 import java.util.Properties;

diff --git a/src/test/java/reverso/getWordConjugationTest.java b/src/test/java/reverso/getWordConjugationTest.java
@@ -5,7 +5,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
 import reverso.data.response.impl.ConjugationResponse;
-import reverso.supportedLanguages.Language;
+import reverso.language.Language;
 
 import java.io.IOException;
 import java.util.Properties;