/hg/release/icedtea-web-1.3: Unit test for JCV.isMetaInfFile()

[adomurad at icedtea.classpath.org]

changeset 17c0255d5128 in /hg/release/icedtea-web-1.3
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.3?cmd=changeset;node=17c0255d5128
author: Adam Domurad <adomurad at redhat.com>
date: Tue Aug 14 14:38:27 2012 -0400

	Unit test for JCV.isMetaInfFile()


diffstat:

 ChangeLog                                                           |   8 +
 netx/net/sourceforge/jnlp/tools/JarCertVerifier.java                |   2 +-
 tests/netx/unit/net/sourceforge/jnlp/tools/JarCertVerifierTest.java |  54 ++++++++++
 3 files changed, 63 insertions(+), 1 deletions(-)

diffs (85 lines):

diff -r bc280713fc34 -r 17c0255d5128 ChangeLog
--- a/ChangeLog	Tue Aug 07 11:03:18 2012 -0400
+++ b/ChangeLog	Tue Aug 14 14:38:27 2012 -0400
@@ -1,3 +1,11 @@
+2012-08-14  Adam Domurad  <adomurad at redhat.com>
+
+	Unit test for method in JCV, isMetaInfFile()
+	* netx/net/sourceforge/jnlp/tools/JarCertVerifier.java: 
+	Made isMetaInfFile package-private for testing purposes.
+	* tests/netx/unit/net/sourceforge/jnlp/tools/JarCertVerifierTest.java:
+	New, tests isMetaInfFile
+
 2012-08-07  Adam Domurad  <adomurad at redhat.com>
 
 	Fixes PR1106, plugin crashing with firefox + archlinux/gentoo
diff -r bc280713fc34 -r 17c0255d5128 netx/net/sourceforge/jnlp/tools/JarCertVerifier.java
--- a/netx/net/sourceforge/jnlp/tools/JarCertVerifier.java	Tue Aug 07 11:03:18 2012 -0400
+++ b/netx/net/sourceforge/jnlp/tools/JarCertVerifier.java	Tue Aug 14 14:38:27 2012 -0400
@@ -441,7 +441,7 @@
      * . META-INF/*.DSA
      * . META-INF/*.RSA
      */
-    static private boolean isMetaInfFile(String name) {
+    static boolean isMetaInfFile(String name) {
         String ucName = name.toUpperCase();
         return ucName.startsWith(META_INF);
     }
diff -r bc280713fc34 -r 17c0255d5128 tests/netx/unit/net/sourceforge/jnlp/tools/JarCertVerifierTest.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/netx/unit/net/sourceforge/jnlp/tools/JarCertVerifierTest.java	Tue Aug 14 14:38:27 2012 -0400
@@ -0,0 +1,54 @@
+/* JarCertVerifierTest.java
+Copyright (C) 2012 Red Hat, Inc.
+
+This file is part of IcedTea.
+
+IcedTea is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License as published by
+the Free Software Foundation, version 2.
+
+IcedTea is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with IcedTea; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version.
+ */
+
+package net.sourceforge.jnlp.tools;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class JarCertVerifierTest {
+
+    @Test
+    public void testIsMetaInfFile() {
+        final String METAINF ="META-INF";
+        assertFalse(JarCertVerifier.isMetaInfFile("some_dir/" + METAINF + "/filename"));
+        assertFalse(JarCertVerifier.isMetaInfFile(METAINF + "filename"));
+        assertTrue(JarCertVerifier.isMetaInfFile(METAINF + "/filename"));
+    }
+
+}