javadoc and compiler warning house-keeping

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1553428 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java
index 4b2ffb2b4e954adba4fa6e7e4e3583b85cc8bc59..589821ea0c88f1925f98b6102c0e74c93f404bd8 100644 (file)
--- a/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java
+++ b/src/ooxml/testcases/org/apache/poi/poifs/crypt/TestCertificateEncryption.java
@@ -27,26 +27,27 @@ import java.io.FileInputStream;
 import java.io.IOException;\r
 import java.io.InputStream;\r
 import java.io.OutputStream;\r
-import java.math.BigInteger;\r
 import java.security.GeneralSecurityException;\r
 import java.security.KeyPair;\r
-import java.security.KeyPairGenerator;\r
 import java.security.KeyStore;\r
 import java.security.PrivateKey;\r
 import java.security.PublicKey;\r
-import java.security.SecureRandom;\r
-import java.security.cert.Certificate;\r
 import java.security.cert.X509Certificate;\r
-import java.util.Date;\r
 \r
 import org.apache.poi.POIDataSamples;\r
 import org.apache.poi.poifs.crypt.agile.AgileDecryptor;\r
 import org.apache.poi.poifs.crypt.agile.AgileEncryptionVerifier;\r
 import org.apache.poi.poifs.filesystem.POIFSFileSystem;\r
 import org.apache.poi.util.IOUtils;\r
-import org.junit.BeforeClass;\r
 import org.junit.Test;\r
 \r
+/*\r
+import org.junit.BeforeClass;\r
+import java.util.Date;\r
+import java.math.BigInteger;\r
+import java.security.KeyPairGenerator;\r
+import java.security.SecureRandom;\r
+import java.security.cert.Certificate;\r
 import sun.security.x509.AlgorithmId;\r
 import sun.security.x509.CertificateAlgorithmId;\r
 import sun.security.x509.CertificateIssuerName;\r
@@ -58,9 +59,10 @@ import sun.security.x509.CertificateX509Key;
 import sun.security.x509.X500Name;\r
 import sun.security.x509.X509CertImpl;\r
 import sun.security.x509.X509CertInfo;\r
+*/\r
 \r
 /**\r
- * {@linkplain http://stackoverflow.com/questions/1615871/creating-an-x509-certificate-in-java-without-bouncycastle}\r
+ * @see <a href="http://stackoverflow.com/questions/1615871/creating-an-x509-certificate-in-java-without-bouncycastle">creating a self-signed certificate</a> \r
  */\r
 public class TestCertificateEncryption {\r
     /**\r
@@ -91,7 +93,7 @@ public class TestCertificateEncryption {
      * The keystore generation / loading is split, because normally the keystore would\r
      * already exist.\r
      */ \r
-    @BeforeClass\r
+    /* @BeforeClass\r
     public static void initKeystore() throws GeneralSecurityException, IOException {\r
         CertData certData = new CertData();\r
         \r
@@ -134,14 +136,16 @@ public class TestCertificateEncryption {
         ByteArrayOutputStream bos = new ByteArrayOutputStream();\r
         keystore.store(bos, password.toCharArray());\r
         pfxFileBytes = bos.toByteArray();\r
-    }\r
+    } */\r
 \r
     public CertData loadKeystore()\r
     throws GeneralSecurityException, IOException {\r
         KeyStore keystore = KeyStore.getInstance("PKCS12");\r
         \r
-        InputStream fis = new ByteArrayInputStream(pfxFileBytes);\r
+        // InputStream fis = new ByteArrayInputStream(pfxFileBytes);\r
+        InputStream fis = POIDataSamples.getPOIFSInstance().openResourceAsStream("poitest.pfx");\r
         keystore.load(fis, password.toCharArray());\r
+        fis.close();\r
         \r
         X509Certificate x509 = (X509Certificate)keystore.getCertificate(certAlias);\r
         PrivateKey privateKey = (PrivateKey)keystore.getKey(certAlias, password.toCharArray());\r

diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
index ab1076c4583950a8c27273a91d38d364b8a39136..27fd702100ecde8f700e24f5b216c1085c932734 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/extractor/TestExtractor.java
@@ -21,8 +21,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.util.List;
 
-import junit.framework.TestCase;
-
 import org.apache.poi.POIDataSamples;
 import org.apache.poi.POITestCase;
 import org.apache.poi.hslf.HSLFSlideShow;
@@ -57,10 +55,6 @@ public final class TestExtractor extends POITestCase {
       ppe2 = new PowerPointExtractor(slTests.openResourceAsStream("with_textbox.ppt"));
    }
 
-   private static void assertContains(String reason, String haystack, String needle) {
-      assertTrue(reason, haystack.contains(needle));
-   }
-
     public void testReadSheetText() {
        // Basic 2 page example
                String sheetText = ppe.getText();
@@ -174,6 +168,7 @@ public final class TestExtractor extends POITestCase {
      /**
       * A powerpoint file with embeded powerpoint files
       */
+     @SuppressWarnings("unused")
      public void testExtractFromOwnEmbeded() throws Exception {
          String path = "ppt_with_embeded.ppt";
          ppe = new PowerPointExtractor(POIDataSamples.getSlideShowInstance().openResourceAsStream(path));
@@ -281,6 +276,7 @@ public final class TestExtractor extends POITestCase {
        assertContains(text, "test phrase");
     }
     
+   @SuppressWarnings("unused")
    public void testSlideMasterText() throws Exception {
       String masterTitleText = "This is the Master Title";
       String masterRandomText = "This text comes from the Master Slide";
@@ -337,10 +333,10 @@ public final class TestExtractor extends POITestCase {
        // Check for the english text in the mixed line
        assertContains(text, "Mix");
        
-       // Check for the chinese text in the mixed line - 表
+       // Check for the chinese text in the mixed line
        assertContains(text, "\u8868");
        
-       // Check for the chinese only text line - ﾊﾝｶｸ
+       // Check for the chinese only text line
        assertContains(text, "\uff8a\uff9d\uff76\uff78");
     }
     
@@ -348,6 +344,7 @@ public final class TestExtractor extends POITestCase {
      * Tests that we can work with both {@link POIFSFileSystem}
      *  and {@link NPOIFSFileSystem}
      */
+    @SuppressWarnings("resource")
     public void testDifferentPOIFS() throws Exception {
        // Open the two filesystems
        DirectoryNode[] files = new DirectoryNode[2];
@@ -356,7 +353,7 @@ public final class TestExtractor extends POITestCase {
        
        // Open directly 
        for(DirectoryNode dir : files) {
-          PowerPointExtractor extractor = new PowerPointExtractor(dir, null);
+          PowerPointExtractor extractor = new PowerPointExtractor(dir);
           assertEquals(expectText, extractor.getText());
        }
 

diff --git a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
index fe013f491a1dda8f9741c3d4224030fa970008ff..a71b72a28bcbbfa144234357be6c2cf0867e0925 100644 (file)
--- a/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
+++ b/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestRichTextRun.java
@@ -649,7 +649,7 @@ if(false) {
       // Check we can get the english text out of that
       String text = rt.getText();
       assertContains(text, "Single byte");
-      // And the chinese - ﾊﾝｶｸ
+      // And the chinese
       assertContains(text, "\uff8a\uff9d\uff76\uff78");
       
       // It isn't bold or italic

diff --git a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java b/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
index 6e1963b69a263317d9c660ecb86458043c24889a..a934202ed1fe82a2ea96110baca28dd9d6c3a52e 100644 (file)
--- a/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
+++ b/src/testcases/org/apache/poi/ss/formula/functions/TestMirr.java
@@ -19,8 +19,13 @@ package org.apache.poi.ss.formula.functions;
 \r
 import junit.framework.AssertionFailedError;\r
 import junit.framework.TestCase;\r
+\r
 import org.apache.poi.hssf.HSSFTestDataSamples;\r
-import org.apache.poi.hssf.usermodel.*;\r
+import org.apache.poi.hssf.usermodel.HSSFCell;\r
+import org.apache.poi.hssf.usermodel.HSSFFormulaEvaluator;\r
+import org.apache.poi.hssf.usermodel.HSSFRow;\r
+import org.apache.poi.hssf.usermodel.HSSFSheet;\r
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;\r
 import org.apache.poi.ss.formula.eval.ErrorEval;\r
 import org.apache.poi.ss.formula.eval.EvaluationException;\r
 import org.apache.poi.ss.usermodel.CellValue;\r
@@ -29,7 +34,7 @@ import org.apache.poi.ss.usermodel.CellValue;
  * Tests for {@link org.apache.poi.ss.formula.functions.Mirr}\r
  *\r
  * @author Carlos Delgado (carlos dot del dot est at gmail dot com)\r
- * @author Cédric Walter (cedric dot walter at gmail dot com)\r
+ * @author Cedric Walter (cedric dot walter at gmail dot com)\r
  * @see {@link org.apache.poi.ss.formula.functions.TestIrr}\r
  */\r
 public final class TestMirr extends TestCase {\r

diff --git a/test-data/poifs/poitest.pfx b/test-data/poifs/poitest.pfx
new file mode 100644 (file)
index 0000000..14be4d0
Binary files /dev/null and b/test-data/poifs/poitest.pfx differ