You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2013/06/28 00:19:13 UTC
svn commit: r1497586 - in
/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis:
test/suite/MetadataTestSuite.java xml/FreeTextMarshallingTest.java
Author: desruisseaux
Date: Thu Jun 27 22:19:12 2013
New Revision: 1497586
URL: http://svn.apache.org/r1497586
Log:
More tests.
Added:
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java (with props)
Modified:
sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1497586&r1=1497585&r2=1497586&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java [UTF-8] Thu Jun 27 22:19:12 2013
@@ -57,6 +57,7 @@ import org.junit.BeforeClass;
// XML marshalling.
org.apache.sis.xml.NilReasonMarshallingTest.class,
+ org.apache.sis.xml.FreeTextMarshallingTest.class,
org.apache.sis.internal.jaxb.code.CodeListMarshallingTest.class,
org.apache.sis.internal.jaxb.gmd.LanguageMarshallingTest.class,
org.apache.sis.internal.jaxb.gml.TimePeriodTest.class
Added: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java?rev=1497586&view=auto
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java (added)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java [UTF-8] Thu Jun 27 22:19:12 2013
@@ -0,0 +1,113 @@
+/*
+ * 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.sis.xml;
+
+import java.util.Locale;
+import javax.xml.bind.JAXBException;
+import org.opengis.metadata.citation.Citation;
+import org.apache.sis.util.iso.DefaultInternationalString;
+import org.apache.sis.test.XMLTestCase;
+import org.junit.Test;
+
+import static org.apache.sis.test.Assert.*;
+
+
+/**
+ * Tests the XML marshalling of {@code FreeText}.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @since 0.3 (derived from geotk-3.17)
+ * @version 0.3
+ * @module
+ *
+ * @see <a href="http://jira.geotoolkit.org/browse/GEOTK-107">GEOTK-107</a>
+ * @see <a href="http://jira.geotoolkit.org/browse/GEOTK-152">GEOTK-152</a>
+ * @see MetadataMarshallingTest#testTextGroup()
+ */
+public final strictfp class FreeTextMarshallingTest extends XMLTestCase {
+ /**
+ * Returns the expected string.
+ */
+ private static DefaultInternationalString getExpectedI18N() {
+ final DefaultInternationalString i18n = new DefaultInternationalString();
+ i18n.add(Locale.ENGLISH, "OpenSource Project");
+ i18n.add(Locale.FRENCH, "Projet OpenSource");
+ i18n.add(Locale.ITALIAN, "Progetto OpenSource");
+ return i18n;
+ }
+
+ /**
+ * Tests parsing of a free text in an ISO 19139-compliant way.
+ * The free text is wrapped inside a citation for marshalling
+ * purpose, but only the free text is actually tested.
+ *
+ * @throws JAXBException If the XML in this test can not be parsed by JAXB.
+ */
+ @Test
+ public void testStandard() throws JAXBException {
+ final String expected =
+ "<gmd:CI_Citation xmlns:gmd=\"" + Namespaces.GMD + "\" xmlns:gco=\"" + Namespaces.GCO + "\" xmlns:xsi=\"" + Namespaces.XSI + "\">\n" +
+ " <gmd:title xsi:type=\"gmd:PT_FreeText_PropertyType\">\n" +
+ " <gco:CharacterString>OpenSource Project</gco:CharacterString>\n" +
+ " <gmd:PT_FreeText>\n" +
+ " <gmd:textGroup>\n" +
+ " <gmd:LocalisedCharacterString locale=\"#locale-eng\">OpenSource Project</gmd:LocalisedCharacterString>\n" +
+ " </gmd:textGroup>\n" +
+ " <gmd:textGroup>\n" +
+ " <gmd:LocalisedCharacterString locale=\"#locale-ita\">Progetto OpenSource</gmd:LocalisedCharacterString>\n" +
+ " </gmd:textGroup>\n" +
+ " <gmd:textGroup>\n" +
+ " <gmd:LocalisedCharacterString locale=\"#locale-fra\">Projet OpenSource</gmd:LocalisedCharacterString>\n" +
+ " </gmd:textGroup>\n" +
+ " </gmd:PT_FreeText>\n" +
+ " </gmd:title>\n" +
+ "</gmd:CI_Citation>\n";
+
+ final Citation citation = (Citation) XML.unmarshal(expected);
+ assertEquals(getExpectedI18N(), citation.getTitle());
+ final String actual = XML.marshal(citation);
+ assertXmlEquals(expected, actual, "xmlns:*");
+ }
+
+ /**
+ * Tests parsing of a free text in the legacy (pre-Geotk 3.17) format.
+ * We continue to support this format for compatibility reason, but
+ * also because it is more compact and closer to what we would expect
+ * inside a {@code <textGroup>} node.
+ *
+ * @throws JAXBException If the XML in this test can not be parsed by JAXB.
+ */
+ @Test
+ public void testLegacy() throws JAXBException {
+ final String legacy =
+ "<gmd:CI_Citation xmlns:gmd=\"" + Namespaces.GMD + "\" xmlns:gco=\"" + Namespaces.GCO + "\" xmlns:xsi=\"" + Namespaces.XSI + "\">\n" +
+ " <gmd:title xsi:type=\"gmd:PT_FreeText_PropertyType\">\n" +
+ " <gco:CharacterString>OpenSource Project</gco:CharacterString>\n" +
+ " <gmd:PT_FreeText>\n" +
+ " <gmd:textGroup>\n" +
+ " <gmd:LocalisedCharacterString locale=\"#locale-eng\">OpenSource Project</gmd:LocalisedCharacterString>\n" +
+ " <gmd:LocalisedCharacterString locale=\"#locale-ita\">Progetto OpenSource</gmd:LocalisedCharacterString>\n" +
+ " <gmd:LocalisedCharacterString locale=\"#locale-fra\">Projet OpenSource</gmd:LocalisedCharacterString>\n" +
+ " </gmd:textGroup>\n" +
+ " </gmd:PT_FreeText>\n" +
+ " </gmd:title>\n" +
+ "</gmd:CI_Citation>\n";
+
+ final Citation citation = (Citation) XML.unmarshal(legacy);
+ assertEquals(getExpectedI18N(), citation.getTitle());
+ }
+}
Propchange: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain;charset=UTF-8