svn commit: r1877368 - in /santuario/xml-security-java/trunk/src: main/java/org/apache/xml/security/Init.java test/java/org/apache/xml/security/test/dom/InitTest.java

[co...@apache.org]

Author: coheigea
Date: Tue May  5 07:22:29 2020
New Revision: 1877368

URL: http://svn.apache.org/viewvc?rev=1877368&view=rev
Log:
Adding test for Init using a file

Added:
    santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/InitTest.java
Modified:
    santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java

Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java?rev=1877368&r1=1877367&r2=1877368&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/Init.java Tue May  5 07:22:29 2020
@@ -31,6 +31,7 @@ import org.apache.xml.security.c14n.Cano
 import org.apache.xml.security.exceptions.XMLSecurityException;
 import org.apache.xml.security.keys.keyresolver.KeyResolver;
 import org.apache.xml.security.transforms.Transform;
+import org.apache.xml.security.utils.ClassLoaderUtils;
 import org.apache.xml.security.utils.ElementProxy;
 import org.apache.xml.security.utils.I18n;
 import org.apache.xml.security.utils.XMLUtils;
@@ -84,7 +85,7 @@ public class Init {
                         if (cfile == null) {
                             return null;
                         }
-                        return Init.class.getResourceAsStream(cfile);
+                        return ClassLoaderUtils.getResourceAsStream(cfile, Init.class);
                     }
                 );
         if (is == null) {

Added: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/InitTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/InitTest.java?rev=1877368&view=auto
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/InitTest.java (added)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/InitTest.java Tue May  5 07:22:29 2020
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. 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
+ *
+ * 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. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.xml.security.test.dom;
+
+
+import org.apache.xml.security.Init;
+import org.apache.xml.security.algorithms.JCEMapper;
+import org.apache.xml.security.algorithms.MessageDigestAlgorithm;
+import org.apache.xml.security.algorithms.SignatureAlgorithm;
+import org.apache.xml.security.signature.XMLSignature;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class InitTest {
+
+    @BeforeAll
+    public static void setup() {
+        System.setProperty("org.apache.xml.security.resource.config",
+                "org/apache/xml/security/resource/config.xml");
+    }
+
+    @AfterAll
+    public static void cleanup() {
+        System.clearProperty("org.apache.xml.security.resource.config");
+    }
+
+    @org.junit.jupiter.api.Test
+    public void testFileInit() throws Exception {
+        assertFalse(Init.isInitialized());
+        Init.init();
+        assertTrue(Init.isInitialized());
+
+        // Test that initialization seems to have happened OK
+        new SignatureAlgorithm(TestUtils.newDocument(), XMLSignature.ALGO_ID_SIGNATURE_RSA_SHA256);
+        assertEquals("MessageDigest", JCEMapper.getAlgorithmClassFromURI(MessageDigestAlgorithm.ALGO_ID_DIGEST_SHA256));
+    }
+
+}