Author: tallison
Date: Thu Jul 16 01:17:08 2015
New Revision: 1691299

URL: http://svn.apache.org/r1691299
Log:
TIKA-1685 clean up easily cleaned up deprecations

Modified:
    
tika/trunk/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java
    
tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java
    
tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java
    tika/trunk/tika-bundle/pom.xml
    
tika/trunk/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java
    
tika/trunk/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java
    
tika/trunk/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
    
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
    
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java
    
tika/trunk/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DigestingParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/OutlookPSTParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
    
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java
    
tika/trunk/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java
    
tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
    
tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/GoogleTranslatorTest.java
    
tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/Lingo24TranslatorTest.java

Modified: 
tika/trunk/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java
 (original)
+++ 
tika/trunk/tika-app/src/test/java/org/apache/tika/cli/TikaCLIBatchCommandLineTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,8 +16,8 @@
  */
 package org.apache.tika.cli;
 
-import static junit.framework.TestCase.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.io.FileOutputStream;

Modified: 
tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java
 (original)
+++ 
tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchDriverTest.java
 Thu Jul 16 01:17:08 2015
@@ -17,9 +17,9 @@ package org.apache.tika.batch.fs;
  * limitations under the License.
  */
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.TestCase.assertNotNull;
+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 java.io.File;

Modified: 
tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java
 (original)
+++ 
tika/trunk/tika-batch/src/test/java/org/apache/tika/batch/fs/BatchProcessTest.java
 Thu Jul 16 01:17:08 2015
@@ -17,10 +17,10 @@ package org.apache.tika.batch.fs;
  */
 
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.fail;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import java.io.File;
 import java.io.IOException;

Modified: tika/trunk/tika-bundle/pom.xml
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-bundle/pom.xml?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- tika/trunk/tika-bundle/pom.xml (original)
+++ tika/trunk/tika-bundle/pom.xml Thu Jul 16 01:17:08 2015
@@ -182,7 +182,6 @@
               javax.xml.stream;version="[1.0,2)";resolution:=optional,
               javax.xml.stream.events;version="[1.0,2)";resolution:=optional,
               javax.xml.stream.util;version="[1.0,2)";resolution:=optional,
-              junit.framework;resolution:=optional,
               junit.textui;resolution:=optional,
               net.sf.ehcache;resolution:=optional,
               nu.xom;resolution:=optional,

Modified: 
tika/trunk/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java
 (original)
+++ 
tika/trunk/tika-core/src/test/java/org/apache/tika/sax/BasicContentHandlerFactoryTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,9 +16,9 @@
  */
 package org.apache.tika.sax;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

Modified: 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java
 (original)
+++ 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/AdvancedTypeDetectorTest.java
 Thu Jul 16 01:17:08 2015
@@ -14,7 +14,8 @@
 
 package org.apache.tika.example;
 
-import junit.framework.Assert;
+
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
@@ -23,7 +24,7 @@ public class AdvancedTypeDetectorTest {
 
        @Test
        public void testDetectWithCustomConfig() throws Exception {
-               Assert.assertEquals("application/xml",
+               assertEquals("application/xml",
                                
AdvancedTypeDetector.detectWithCustomConfig("pom.xml"));
        }
 

Modified: 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
 (original)
+++ 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/DumpTikaConfigExampleTest.java
 Thu Jul 16 01:17:08 2015
@@ -18,6 +18,15 @@ package org.apache.tika.example;
  */
 
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+
 import org.apache.tika.config.TikaConfig;
 import org.apache.tika.detect.CompositeDetector;
 import org.apache.tika.parser.AutoDetectParser;
@@ -27,14 +36,6 @@ import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
 
 public class DumpTikaConfigExampleTest {
     private File configFile;

Modified: 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
 (original)
+++ 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTextExtractorTest.java
 Thu Jul 16 01:17:08 2015
@@ -14,12 +14,12 @@
 
 package org.apache.tika.example;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.PrintStream;
 
-import junit.framework.Assert;
-
 import org.apache.commons.io.FileUtils;
 import org.junit.Test;
 
@@ -46,7 +46,7 @@ public class SimpleTextExtractorTest {
 
         System.setOut(out);
 
-        Assert.assertEquals(message, 
buffer.toString(Charsets.UTF_8.name()).trim());
+        assertEquals(message, buffer.toString(Charsets.UTF_8.name()).trim());
     }
 
 }

Modified: 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java
 (original)
+++ 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/SimpleTypeDetectorTest.java
 Thu Jul 16 01:17:08 2015
@@ -14,15 +14,13 @@
 
 package org.apache.tika.example;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.ByteArrayOutputStream;
-import java.io.OutputStreamWriter;
 import java.io.PrintStream;
 
-import junit.framework.Assert;
-
-import org.junit.Test;
-
 import com.google.common.base.Charsets;
+import org.junit.Test;
 
 @SuppressWarnings("deprecation")
 public class SimpleTypeDetectorTest {
@@ -38,7 +36,7 @@ public class SimpleTypeDetectorTest {
 
                System.setOut(out);
 
-               Assert.assertEquals("pom.xml: application/xml",
+               assertEquals("pom.xml: application/xml",
                                buffer.toString(Charsets.UTF_8.name()).trim());
        }
 

Modified: 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java
 (original)
+++ 
tika/trunk/tika-example/src/test/java/org/apache/tika/example/TestParsingExample.java
 Thu Jul 16 01:17:08 2015
@@ -17,8 +17,8 @@
 
 package org.apache.tika.example;
 
-import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DigestingParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DigestingParserTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DigestingParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/DigestingParserTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,7 +16,7 @@
  */
 package org.apache.tika.parser;
 
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/code/SourceCodeParserTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,9 +16,9 @@
  */
 package org.apache.tika.parser.code;
 
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertTrue;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.io.ByteArrayInputStream;
 import java.util.Set;

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/PSDParserTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/image/PSDParserTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,7 +16,7 @@
  */
 package org.apache.tika.parser.image;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.io.InputStream;
 

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/MboxParserTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,8 +16,8 @@
  */
 package org.apache.tika.parser.mbox;
 
-import static junit.framework.Assert.assertEquals;
 import static org.apache.tika.TikaTest.assertContains;
+import static org.junit.Assert.assertEquals;
 
 import java.io.InputStream;
 import java.util.Map;

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/OutlookPSTParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/OutlookPSTParserTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/OutlookPSTParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mbox/OutlookPSTParserTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,7 +16,7 @@
  */
 package org.apache.tika.parser.mbox;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/microsoft/OfficeParserTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,7 +16,7 @@
  */
 package org.apache.tika.parser.microsoft;
 
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
 
 import java.io.InputStream;
 

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/mock/MockParserTest.java
 Thu Jul 16 01:17:08 2015
@@ -17,8 +17,8 @@ package org.apache.tika.parser.mock;
  * limitations under the License.
  */
 
-import static junit.framework.TestCase.assertEquals;
-import static junit.framework.TestCase.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.ByteArrayOutputStream;

Modified: 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java
 (original)
+++ 
tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/solidworks/SolidworksParserTest.java
 Thu Jul 16 01:17:08 2015
@@ -16,7 +16,7 @@
  */
 package org.apache.tika.parser.solidworks;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
 
 import java.io.InputStream;
 

Modified: 
tika/trunk/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java
 (original)
+++ 
tika/trunk/tika-serialization/src/main/java/org/apache/tika/metadata/serialization/JsonMetadataSerializer.java
 Thu Jul 16 01:17:08 2015
@@ -52,11 +52,11 @@ public class JsonMetadataSerializer impl
     @Override
     public JsonElement serialize(Metadata metadata, Type type, 
JsonSerializationContext context) {
         if (metadata == null){
-            return new JsonNull();
+            return JsonNull.INSTANCE;
         }
         String[] names = getNames(metadata);
         if (names == null) {
-            return new JsonNull();
+            return JsonNull.INSTANCE;
         }
 
         JsonObject root = new JsonObject();

Modified: 
tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
 (original)
+++ 
tika/trunk/tika-serialization/src/test/java/org/apache/tika/metadata/serialization/JsonMetadataListTest.java
 Thu Jul 16 01:17:08 2015
@@ -17,6 +17,10 @@ package org.apache.tika.metadata.seriali
 * limitations under the License.
 */
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.io.StringReader;
 import java.io.StringWriter;
 import java.util.LinkedList;
@@ -25,10 +29,6 @@ import java.util.List;
 import org.apache.tika.metadata.Metadata;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.TestCase.assertNull;
-import static org.junit.Assert.assertEquals;
-
 public class JsonMetadataListTest {
 
 

Modified: 
tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/GoogleTranslatorTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/GoogleTranslatorTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/GoogleTranslatorTest.java
 (original)
+++ 
tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/GoogleTranslatorTest.java
 Thu Jul 16 01:17:08 2015
@@ -17,15 +17,18 @@
 
 package org.apache.tika.language.translate;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import org.junit.Before;
 
-import junit.framework.TestCase;
 
 /**
  * Test harness for the {@link GoogleTranslator}.
  * 
  */
-public class GoogleTranslatorTest extends TestCase {
+public class GoogleTranslatorTest  {
 
        private GoogleTranslator translator;
 

Modified: 
tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/Lingo24TranslatorTest.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/Lingo24TranslatorTest.java?rev=1691299&r1=1691298&r2=1691299&view=diff
==============================================================================
--- 
tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/Lingo24TranslatorTest.java
 (original)
+++ 
tika/trunk/tika-translate/src/test/java/org/apache/tika/language/translate/Lingo24TranslatorTest.java
 Thu Jul 16 01:17:08 2015
@@ -17,14 +17,17 @@
 
 package org.apache.tika.language.translate;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
 import org.junit.Before;
 
 /**
  * Test harness for the {@link 
org.apache.tika.language.translate.Lingo24Translator}.
  *
  */
-public class Lingo24TranslatorTest extends TestCase {
+public class Lingo24TranslatorTest {
 
     private Lingo24Translator translator;
 


Reply via email to