You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2022/05/13 11:54:41 UTC
[tika] 02/10: TIKA-3757 - migrate to junit5 in tika-translate
This is an automated email from the ASF dual-hosted git repository.
tallison pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tika.git
commit de04c1cdd9cb4d12d4db52cedb26369801b37c65
Author: tallison <ta...@apache.org>
AuthorDate: Fri May 13 04:51:28 2022 -0400
TIKA-3757 - migrate to junit5 in tika-translate
---
tika-translate/pom.xml | 58 +++++++++-----------
.../translate/impl/CachedTranslatorTest.java | 39 ++++++-------
.../translate/impl/GoogleTranslatorTest.java | 24 ++++----
.../impl/JoshuaNetworkTranslatorTest.java | 37 ++++++-------
.../translate/impl/Lingo24TranslatorTest.java | 27 ++++-----
.../translate/impl/MarianTranslatorTest.java | 33 +++++------
.../translate/impl/MicrosoftTranslatorTest.java | 23 ++++----
.../translate/impl/MosesTranslatorTest.java | 16 +++---
.../language/translate/impl/RTGTranslatorTest.java | 64 +++++++++++-----------
.../translate/impl/YandexTranslatorTest.java | 52 +++++++++---------
10 files changed, 180 insertions(+), 193 deletions(-)
diff --git a/tika-translate/pom.xml b/tika-translate/pom.xml
index 4d8f6b0e1..41b77fa26 100644
--- a/tika-translate/pom.xml
+++ b/tika-translate/pom.xml
@@ -19,7 +19,8 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -126,39 +127,32 @@
<artifactId>tyrus-standalone-client</artifactId>
<version>2.0.2</version>
</dependency>
- <!-- after we migrate everything to junit5, we can get rid of this -->
- <dependency>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- <version>${junit5.version}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<reporting>
<plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>3.3.0</version>
- <reportSets>
- <reportSet>
- <reports>
- <report>index</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>3.0.5</version>
- <configuration>
- <jvmArgs>-Xmx256m</jvmArgs>
- <timeout>240000</timeout>
- <effort>max</effort>
- <failOnError>true</failOnError>
- </configuration>
- </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>3.3.0</version>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>index</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>3.0.5</version>
+ <configuration>
+ <jvmArgs>-Xmx256m</jvmArgs>
+ <timeout>240000</timeout>
+ <effort>max</effort>
+ <failOnError>true</failOnError>
+ </configuration>
+ </plugin>
</plugins>
</reporting>
<build>
@@ -239,7 +233,7 @@
</goals>
</pluginExecutionFilter>
<action>
- <execute />
+ <execute/>
</action>
</pluginExecution>
</pluginExecutions>
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/CachedTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/CachedTranslatorTest.java
index 55bac7815..65dc44627 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/CachedTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/CachedTranslatorTest.java
@@ -17,16 +17,13 @@
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tika.language.translate.impl.CachedTranslator;
-import org.apache.tika.language.translate.impl.GoogleTranslator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test harness for the {@link CachedTranslator}. Take care to choose your target language carefully
@@ -35,7 +32,7 @@ import org.apache.tika.language.translate.impl.GoogleTranslator;
public class CachedTranslatorTest {
private CachedTranslator cachedTranslator;
- @Before
+ @BeforeEach
public void setUp(){
cachedTranslator = new CachedTranslator(new GoogleTranslator());
}
@@ -45,8 +42,8 @@ public class CachedTranslatorTest {
for (int i = 0; i < 20; i++) {
cachedTranslator.translate("This is a test string to translate!", "en", "sv");
}
- assertEquals("Cache doesn't have a single translation pair!", cachedTranslator.getNumTranslationPairs(), 1);
- assertEquals("Cache has more than one element!", cachedTranslator.getNumTranslationsFor("en", "sv"), 1);
+ assertEquals(cachedTranslator.getNumTranslationPairs(), 1, "Cache doesn't have a single translation pair!");
+ assertEquals(cachedTranslator.getNumTranslationsFor("en", "sv"), 1, "Cache has more than one element!");
}
@Test
@@ -55,9 +52,9 @@ public class CachedTranslatorTest {
cachedTranslator.translate("This is a test string to translate!", "en", "no");
cachedTranslator.translate("This is a different string...", "en", "fr");
}
- assertEquals("Cache doesn't have two translation pairs!", cachedTranslator.getNumTranslationPairs(), 2);
- assertEquals("Cache has more than en to no translation!", cachedTranslator.getNumTranslationsFor("en", "no"), 1);
- assertEquals("Cache has more than en to fr translation!", cachedTranslator.getNumTranslationsFor("en", "fr"), 1);
+ assertEquals(cachedTranslator.getNumTranslationPairs(), 2, "Cache doesn't have two translation pairs!");
+ assertEquals(cachedTranslator.getNumTranslationsFor("en", "no"), 1, "Cache has more than en to no translation!");
+ assertEquals(cachedTranslator.getNumTranslationsFor("en", "fr"), 1, "Cache has more than en to fr translation!");
}
@Test
@@ -77,12 +74,12 @@ public class CachedTranslatorTest {
@Test
public void testCacheContains() throws Exception {
String text = "Text that should be long enough to detect a language from.";
- assertFalse("Cache should not contain a translation!",
- cachedTranslator.contains(text, "en", "it"));
+ assertFalse(cachedTranslator.contains(text, "en", "it"),
+ "Cache should not contain a translation!");
cachedTranslator.translate(text, "en", "it");
- assertTrue("Cache should contain a translation!",
- cachedTranslator.contains(text, "en", "it"));
- assertTrue("Cache should detect source language when checking if contains.",
- cachedTranslator.contains(text, "it"));
+ assertTrue(cachedTranslator.contains(text, "en", "it"),
+ "Cache should contain a translation!");
+ assertTrue(cachedTranslator.contains(text, "it"),
+ "Cache should detect source language when checking if contains.");
}
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/GoogleTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/GoogleTranslatorTest.java
index f1b872771..dcb6a9b8a 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/GoogleTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/GoogleTranslatorTest.java
@@ -17,11 +17,13 @@
package org.apache.tika.language.translate.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import org.junit.Before;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.apache.tika.language.translate.impl.GoogleTranslator;
@@ -38,11 +40,12 @@ public class GoogleTranslatorTest {
}
- @Before
+ @BeforeEach
public void setUp() {
translator = new GoogleTranslator();
}
+ @Test
public void testSimpleTranslate() {
String source = "hola senor";
String expected = "hello sir";
@@ -52,9 +55,8 @@ public class GoogleTranslatorTest {
try {
result = translator.translate(source, "es", "en");
assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result);
+ assertEquals(expected, result, "Result: [" + result
+ + "]: not equal to expected: [" + expected + "]");
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -62,6 +64,7 @@ public class GoogleTranslatorTest {
}
}
+ @Test
public void testTranslateGuessLanguage() {
String source = "bonjour comment vas-tu";
String expected = "hello how are you";
@@ -71,9 +74,8 @@ public class GoogleTranslatorTest {
try {
result = translator.translate(source, "en");
assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result);
+ assertEquals(expected, result, "Result: [" + result
+ + "]: not equal to expected: [" + expected + "]");
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslatorTest.java
index f04203185..10ca303ea 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/JoshuaNetworkTranslatorTest.java
@@ -16,28 +16,27 @@
*/
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tika.language.translate.impl.JoshuaNetworkTranslator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class JoshuaNetworkTranslatorTest {
+ JoshuaNetworkTranslator translator;
- JoshuaNetworkTranslator translator;
-
- @Before
- public void setUp() {
- translator = new JoshuaNetworkTranslator();
- }
+ @BeforeEach
+ public void setUp() {
+ translator = new JoshuaNetworkTranslator();
+ }
- @Test
- public void testSimpleSpanishToEnglishTranslation() throws Exception {
- String source = "hola";
- String expected = "hello";
- String translated = translator.translate(source, "spanish", "english");
- if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
- }
+ @Test
+ public void testSimpleSpanishToEnglishTranslation() throws Exception {
+ String source = "hola";
+ String expected = "hello";
+ String translated = translator.translate(source, "spanish", "english");
+ if (translator.isAvailable()) {
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
+ }
+ }
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/Lingo24TranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/Lingo24TranslatorTest.java
index ec89784de..08114b69b 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/Lingo24TranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/Lingo24TranslatorTest.java
@@ -16,13 +16,12 @@
*/
package org.apache.tika.language.translate.impl;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
-import org.junit.Before;
-
-import org.apache.tika.language.translate.impl.Lingo24Translator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test harness for the {@link Lingo24Translator}.
@@ -32,11 +31,12 @@ public class Lingo24TranslatorTest {
private Lingo24Translator translator;
- @Before
+ @BeforeEach
public void setUp() {
translator = new Lingo24Translator();
}
+ @Test
public void testSimpleTranslate() {
String source = "Hola, hoy es un día genial para traducir";
String expected = "Hello, today is a great day to translate";
@@ -46,9 +46,9 @@ public class Lingo24TranslatorTest {
try {
result = translator.translate(source, "es", "en");
assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result);
+ assertEquals(
+ expected, result, "Result: [" + result
+ + "]: not equal to expected: [" + expected + "]");
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
@@ -56,6 +56,7 @@ public class Lingo24TranslatorTest {
}
}
+ @Test
public void testTranslateGuessLanguage() {
String source = "C'est une merveilleuse journée pour traduction";
String expected = "It is a wonderful day for translation";
@@ -65,9 +66,9 @@ public class Lingo24TranslatorTest {
try {
result = translator.translate(source, "en");
assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result);
+ assertEquals(expected, result,
+ "Result: [" + result
+ + "]: not equal to expected: [" + expected + "]");
} catch (Exception e) {
e.printStackTrace();
fail(e.getMessage());
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
index 22afc68c0..42bbf68fb 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MarianTranslatorTest.java
@@ -16,45 +16,40 @@
*/
package org.apache.tika.language.translate.impl;
-import org.junit.AssumptionViolatedException;
-import org.junit.Before;
-import org.junit.Test;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class MarianTranslatorTest {
private MarianTranslator translator;
- @Before
+ @BeforeEach
public void setUp() {
translator = new MarianTranslator();
}
@Test
public void testTranslate_English_Romanian() throws Exception {
+ assumeTrue(translator.isAvailable("en", "ro"));
String source = "Apache Tika is a wonderful tool";
String expected = "Apache Tika este un instrument minunat";
String translated = translator.translate(source, "en", "ro");
- if (translator.isAvailable("en", "ro")) {
- assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
- } else {
- throw new AssumptionViolatedException("Engine not available");
- }
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
@Test
public void testTranslate_Romanian_English() throws Exception {
+ assumeTrue(translator.isAvailable("ro", "en"));
String source = "Apache Tika este un instrument minunat";
String expected = "Apache Tika is a wonderful tool";
String translated = translator.translate(source, "ro", "en");
- if (translator.isAvailable("ro", "en")) {
- assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
- } else {
- throw new AssumptionViolatedException("Engine not available");
- }
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
@Test
@@ -62,8 +57,8 @@ public class MarianTranslatorTest {
String source = "Apache Tika is a wonderful tool";
String expected = "Apache Tika is a wonderful tool"; // Pattern from other Translators is to return source
String translated = translator.translate(source, "en", "zz");
- assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MicrosoftTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MicrosoftTranslatorTest.java
index b523178ef..5231ee158 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MicrosoftTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MicrosoftTranslatorTest.java
@@ -16,40 +16,41 @@
*/
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import org.apache.tika.language.translate.impl.MicrosoftTranslator;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Test cases for the {@link MicrosoftTranslator} class.
*/
public class MicrosoftTranslatorTest {
MicrosoftTranslator translator;
- @Before
+ @BeforeEach
public void setUp() {
translator = new MicrosoftTranslator();
}
@Test
public void testSimpleTranslate() throws Exception {
+ assumeTrue(translator.isAvailable());
String source = "hello";
String expected = "salut";
String translated = translator.translate(source, "en", "fr");
- if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
@Test
public void testSimpleDetectTranslate() throws Exception {
+ assumeTrue(translator.isAvailable());
String source = "hello";
String expected = "salut";
String translated = translator.translate(source, "fr");
- if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
@Test
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MosesTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MosesTranslatorTest.java
index 7db39293d..40aca5a84 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MosesTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/MosesTranslatorTest.java
@@ -16,26 +16,26 @@
*/
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
-import static org.junit.Assert.assertTrue;
-
-import org.apache.tika.language.translate.impl.MosesTranslator;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
public class MosesTranslatorTest {
MosesTranslator translator;
- @Before
+ @BeforeEach
public void setUp() {
translator = new MosesTranslator();
}
@Test
public void testSimpleTranslate() throws Exception {
+ assumeTrue(translator.isAvailable());
String source = "hola";
String expected = "hello";
String translated = translator.translate(source, "sp", "en");
- if (translator.isAvailable()) assertTrue("Translate " + source + " to " + expected + " (was " + translated + ")",
- expected.equalsIgnoreCase(translated));
+ assertTrue(expected.equalsIgnoreCase(translated),
+ "Translate " + source + " to " + expected + " (was " + translated + ")");
}
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/RTGTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/RTGTranslatorTest.java
index 816f25510..8d5f458e7 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/RTGTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/RTGTranslatorTest.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,50 +17,48 @@
package org.apache.tika.language.translate.impl;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.util.Locale;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
import org.apache.tika.language.translate.impl.RTGTranslator;
/**
* Test harness for the {@link RTGTranslator}.
- *
+ *
*/
public class RTGTranslatorTest {
- private RTGTranslator translator;
-
+ private RTGTranslator translator;
- @Before
- public void setUp() {
- translator = new RTGTranslator();
- }
- @Test
- public void testSimpleTranslate() {
- String source = "hola señor";
- String expected = "hello, sir.";
+ @BeforeEach
+ public void setUp() {
+ translator = new RTGTranslator();
+ }
- String result = null;
- if (translator.isAvailable()) {
- try {
- result = translator.translate(source);
- assertNotNull(result);
- assertEquals("Result: [" + result
- + "]: not equal to expected: [" + expected + "]",
- expected, result.toLowerCase(Locale.getDefault()));
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
- }
+ @Test
+ public void testSimpleTranslate() {
+ assumeTrue(translator.isAvailable());
+ String source = "hola señor";
+ String expected = "hello, sir.";
+ String result = null;
+ try {
+ result = translator.translate(source);
+ assertNotNull(result);
+ assertEquals(expected, result.toLowerCase(Locale.getDefault()),
+ "Result: [" + result + "]: not equal to expected: [" + expected + "]");
+ } catch (Exception e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
+ }
}
diff --git a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/YandexTranslatorTest.java b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/YandexTranslatorTest.java
index 26ea73b41..b8802d961 100644
--- a/tika-translate/src/test/java/org/apache/tika/language/translate/impl/YandexTranslatorTest.java
+++ b/tika-translate/src/test/java/org/apache/tika/language/translate/impl/YandexTranslatorTest.java
@@ -14,61 +14,60 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.tika.language.translate.impl;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.fail;
+import static org.junit.jupiter.api.Assumptions.assumeTrue;
+
import org.apache.tika.exception.TikaException;
import org.apache.tika.language.translate.impl.YandexTranslator;
-import org.junit.Before;
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import java.io.IOException;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
/**
* Generic Tests to ensure that the RSS library behaves as expected
- * @author mark
*
+ * @author mark
*/
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+
public class YandexTranslatorTest {
private YandexTranslator translator;
-
- @Before
+
+ @BeforeEach
public void setUp() throws Exception {
this.translator = new YandexTranslator();
}
@Test
public void test1EN_ES_Translation() {
+ assumeTrue(translator.isAvailable());
String inputText = "Hello World!!!";
String expectedText = "Hola Mundo!!!";
- try{
- String transText = translator.translate(inputText, "en", "es");
- assertNotNull("Text not translated", transText);
- assumeTrue(expectedText.equals(transText));
- }
- catch(TikaException | IOException e){
- e.printStackTrace();
- fail(e.getMessage());
- }
+ try {
+ String transText = translator.translate(inputText, "en", "es");
+ assertNotNull(transText, "Text not translated");
+ assertEquals(expectedText, transText);
+ } catch (TikaException | IOException e) {
+ e.printStackTrace();
+ fail(e.getMessage());
+ }
}
@Test
public void test2UNDEFINED_DE_ES_Translation() {
+ assumeTrue(translator.isAvailable());
String inputText = "Guten Tag!!!";
String expectedText = "Buen Día!!!";
try {
String transText = translator.translate(inputText, "es");
- assertNotNull("Text not translated", transText);
- assumeTrue(expectedText.equals(transText));
+ assertNotNull(transText, "Text not translated");
+ assertEquals(expectedText, transText);
} catch (TikaException | IOException e) {
e.printStackTrace();
fail(e.getMessage());
@@ -77,12 +76,13 @@ public class YandexTranslatorTest {
@Test
public void test3UNDEFINED_IT_EN_Translation() {
+ assumeTrue(translator.isAvailable());
String inputText = "Buona Sera!!!";
String expectedText = "Good Evening!!!";
try {
String transText = translator.translate(inputText, "en");
- assertNotNull("Text not translated", transText);
- assumeTrue(expectedText.equals(transText));
+ assertNotNull(transText, "Text not translated");
+ assertEquals(expectedText, transText);
} catch (TikaException | IOException e) {
e.printStackTrace();
fail(e.getMessage());