From 99ff8a42188fe44b3a05be428b1a13b1bd97da46 Mon Sep 17 00:00:00 2001
From: Hans <firedrake93@gmail.com>
Date: Mon, 9 Jul 2018 15:41:19 -0500
Subject: [PATCH] ANY23-358 fixed junit.framework.Assert & RDFa11Parser
 deprecation warnings

---
 .../any23/extractor/html/HCalendarExtractorTest.java     | 2 +-
 .../apache/any23/extractor/rdfa/RDFa11ParserTest.java    | 2 ++
 .../apache/any23/encoding/TikaEncodingDetectorTest.java  | 9 +++------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java b/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
index 9b2e3796f..f54994e33 100644
--- a/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/html/HCalendarExtractorTest.java
@@ -17,12 +17,12 @@
 
 package org.apache.any23.extractor.html;
 
-import junit.framework.Assert;
 import org.apache.any23.extractor.ExtractionException;
 import org.apache.any23.extractor.ExtractorFactory;
 import org.apache.any23.rdf.RDFUtils;
 import org.apache.any23.vocab.ICAL;
 import org.apache.any23.vocab.SINDICE;
+import org.junit.Assert;
 import org.junit.Test;
 import org.eclipse.rdf4j.model.Resource;
 import org.eclipse.rdf4j.model.Statement;
diff --git a/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ParserTest.java b/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ParserTest.java
index c015e93a0..72d89c59a 100644
--- a/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ParserTest.java
+++ b/core/src/test/java/org/apache/any23/extractor/rdfa/RDFa11ParserTest.java
@@ -37,7 +37,9 @@
 
 /**
  * @author Michele Mostarda (mostarda@fbk.eu)
+ * @deprecated since 2.3
  */
+@Deprecated
 public class RDFa11ParserTest {
 
     @Test
diff --git a/encoding/src/test/java/org/apache/any23/encoding/TikaEncodingDetectorTest.java b/encoding/src/test/java/org/apache/any23/encoding/TikaEncodingDetectorTest.java
index b99d47dcd..8ebd2ee2a 100644
--- a/encoding/src/test/java/org/apache/any23/encoding/TikaEncodingDetectorTest.java
+++ b/encoding/src/test/java/org/apache/any23/encoding/TikaEncodingDetectorTest.java
@@ -17,7 +17,7 @@
 
 package org.apache.any23.encoding;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -77,12 +77,9 @@ public void testEncodingHTML() throws IOException {
     }
 
     private void assertEncoding(final String expected, final String resource) throws IOException {
-        InputStream fis = this.getClass().getResourceAsStream(resource);
-        try {
+        try (InputStream fis = getClass().getResourceAsStream(resource)) {
             String encoding = detector.guessEncoding(fis);
-            Assert.assertEquals( "Unexpected encoding", expected, encoding );
-        } finally {
-            fis.close();
+            Assert.assertEquals("Unexpected encoding", expected, encoding);
         }
     }