From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 5 May 2010 15:29:01 +0000 Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk. git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../at/gv/egiz/bku/online/conf/SSLConfigTest.java | 40 ---------- .../egiz/stal/service/STALRequestBrokerTest.java | 7 +- .../src/test/resources/commons-logging.properties | 16 ---- BKUOnline/src/test/resources/templates/empty.xml | 2 + .../src/test/resources/templates/template.xsl | 88 ++++++++++++++++++++++ 5 files changed, 94 insertions(+), 59 deletions(-) delete mode 100644 BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java delete mode 100644 BKUOnline/src/test/resources/commons-logging.properties create mode 100644 BKUOnline/src/test/resources/templates/empty.xml create mode 100644 BKUOnline/src/test/resources/templates/template.xsl (limited to 'BKUOnline/src/test') diff --git a/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java b/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java deleted file mode 100644 index eefaf5b6..00000000 --- a/BKUOnline/src/test/java/at/gv/egiz/bku/online/conf/SSLConfigTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package at.gv.egiz.bku.online.conf; - -import java.net.URL; - -import javax.net.ssl.HttpsURLConnection; - -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -@Ignore -public class SSLConfigTest { - - private SpringConfigurator cfg; - private ApplicationContext ctx; - - @Before - public void setUp() throws Exception { - ctx = new ClassPathXmlApplicationContext("applicationContext.xml"); - - } - - @Ignore - @Test - public void testConnect() throws Exception { - String url = "https://apps.egiz.gv.at/exchange-moa-id-auth/VerifyIdentityLink?MOASessionID=8151862969943601574"; - URL u = new URL(url); - HttpsURLConnection uc = (HttpsURLConnection) u.openConnection(); - uc.connect(); - System.out.println(uc.getCipherSuite()); - } - - @After - public void shutDown() { - - } -} diff --git a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java index 741974eb..da816d48 100644 --- a/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java +++ b/BKUOnline/src/test/java/at/gv/egiz/stal/service/STALRequestBrokerTest.java @@ -47,11 +47,11 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import javax.xml.bind.JAXBElement; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import static org.junit.Assert.*; @@ -62,11 +62,12 @@ import static org.junit.Assert.*; @Ignore public class STALRequestBrokerTest { - private static final Log log = LogFactory.getLog(STALRequestBrokerTest.class); + private final Logger log = LoggerFactory.getLogger(STALRequestBrokerTest.class); protected static STALRequestBroker stal; @BeforeClass public static void setUp() { + Logger log = LoggerFactory.getLogger(STALRequestBrokerTest.class); RequestBrokerSTALFactory fac = new RequestBrokerSTALFactory(); stal = (STALRequestBrokerImpl) fac.createSTAL(); log.debug("Created STAL " + stal.getClass().getName()); diff --git a/BKUOnline/src/test/resources/commons-logging.properties b/BKUOnline/src/test/resources/commons-logging.properties deleted file mode 100644 index 0d497b1b..00000000 --- a/BKUOnline/src/test/resources/commons-logging.properties +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2008 Federal Chancellery Austria and -# Graz University of Technology -# -# Licensed 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. - -org.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger diff --git a/BKUOnline/src/test/resources/templates/empty.xml b/BKUOnline/src/test/resources/templates/empty.xml new file mode 100644 index 00000000..5381ac6c --- /dev/null +++ b/BKUOnline/src/test/resources/templates/empty.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/BKUOnline/src/test/resources/templates/template.xsl b/BKUOnline/src/test/resources/templates/template.xsl new file mode 100644 index 00000000..6ec73a42 --- /dev/null +++ b/BKUOnline/src/test/resources/templates/template.xsl @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + Signatur der Anmeldedaten + + + +

Anmeldedaten:

+ +

Daten zur Person

+ + + + + + + + + + + + + +
Name: + + + +
Geburtsdatum: + +
+ +

Technische Parameter

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
URL:
Bereich:
Identifikator: +
Datum + +
Uhrzeit + +
+ + + + -- cgit v1.2.3