Removed badly encoded character from test class. Minor re-formatting
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@776041 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Josh Micich
parent
8cfca324f1
commit
b924e3f4c8
|
|
@ -1,253 +1,243 @@
|
||||||
/* ====================================================================
|
/* ====================================================================
|
||||||
Licensed to the Apache Software Foundation (ASF) under one or more
|
Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
contributor license agreements. See the NOTICE file distributed with
|
contributor license agreements. See the NOTICE file distributed with
|
||||||
this work for additional information regarding copyright ownership.
|
this work for additional information regarding copyright ownership.
|
||||||
The ASF licenses this file to You under the Apache License, Version 2.0
|
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 not use this file except in compliance with
|
||||||
the License. You may obtain a copy of the License at
|
the License. You may obtain a copy of the License at
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
Unless required by applicable law or agreed to in writing, software
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
==================================================================== */
|
==================================================================== */
|
||||||
|
|
||||||
package org.apache.poi.openxml4j.opc.compliance;
|
package org.apache.poi.openxml4j.opc.compliance;
|
||||||
|
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
import java.net.URISyntaxException;
|
import java.net.URISyntaxException;
|
||||||
|
|
||||||
import junit.framework.TestCase;
|
import junit.framework.TestCase;
|
||||||
|
|
||||||
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
|
||||||
import org.apache.poi.openxml4j.opc.PackagePartName;
|
import org.apache.poi.openxml4j.opc.PackagePartName;
|
||||||
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
|
import org.apache.poi.openxml4j.opc.PackagingURIHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Test part name Open Packaging Convention compliance.
|
* Test part name Open Packaging Convention compliance.
|
||||||
*
|
*
|
||||||
* (Open Packaging Convention 8.1.1 Part names) :
|
* (Open Packaging Convention 8.1.1 Part names) :
|
||||||
*
|
*
|
||||||
* The part name grammar is defined as follows:
|
* The part name grammar is defined as follows:
|
||||||
*
|
*
|
||||||
* part_name = 1*( "/" segment )
|
* part_name = 1*( "/" segment )
|
||||||
*
|
*
|
||||||
* segment = 1*( pchar )
|
* segment = 1*( pchar )
|
||||||
*
|
*
|
||||||
* pchar is defined in RFC 3986.
|
* pchar is defined in RFC 3986.
|
||||||
*
|
*
|
||||||
* The part name grammar implies the following constraints. The package
|
* The part name grammar implies the following constraints. The package
|
||||||
* implementer shall neither create any part that violates these constraints nor
|
* implementer shall neither create any part that violates these constraints nor
|
||||||
* retrieve any data from a package as a part if the purported part name
|
* retrieve any data from a package as a part if the purported part name
|
||||||
* violates these constraints.
|
* violates these constraints.
|
||||||
*
|
*
|
||||||
* A part name shall not be empty. [M1.1]
|
* A part name shall not be empty. [M1.1]
|
||||||
*
|
*
|
||||||
* A part name shall not have empty segments. [M1.3]
|
* A part name shall not have empty segments. [M1.3]
|
||||||
*
|
*
|
||||||
* A part name shall start with a forward slash ("/") character. [M1.4]
|
* A part name shall start with a forward slash ("/") character. [M1.4]
|
||||||
*
|
*
|
||||||
* A part name shall not have a forward slash as the last character. [M1.5]
|
* A part name shall not have a forward slash as the last character. [M1.5]
|
||||||
*
|
*
|
||||||
* A segment shall not hold any characters other than pchar characters. [M1.6]
|
* A segment shall not hold any characters other than pchar characters. [M1.6]
|
||||||
*
|
*
|
||||||
* Part segments have the following additional constraints. The package
|
* Part segments have the following additional constraints. The package
|
||||||
* implementer shall neither create any part with a part name comprised of a
|
* implementer shall neither create any part with a part name comprised of a
|
||||||
* segment that violates these constraints nor retrieve any data from a package
|
* segment that violates these constraints nor retrieve any data from a package
|
||||||
* as a part if the purported part name contains a segment that violates these
|
* as a part if the purported part name contains a segment that violates these
|
||||||
* constraints.
|
* constraints.
|
||||||
*
|
*
|
||||||
* A segment shall not contain percent-encoded forward slash ("/"), or backward
|
* A segment shall not contain percent-encoded forward slash ("/"), or backward
|
||||||
* slash ("\") characters. [M1.7]
|
* slash ("\") characters. [M1.7]
|
||||||
*
|
*
|
||||||
* A segment shall not contain percent-encoded unreserved characters. [M1.8]
|
* A segment shall not contain percent-encoded unreserved characters. [M1.8]
|
||||||
*
|
*
|
||||||
* A segment shall not end with a dot (".") character. [M1.9]
|
* A segment shall not end with a dot (".") character. [M1.9]
|
||||||
*
|
*
|
||||||
* A segment shall include at least one non-dot character. [M1.10]
|
* A segment shall include at least one non-dot character. [M1.10]
|
||||||
*
|
*
|
||||||
* A package implementer shall neither create nor recognize a part with a part
|
* A package implementer shall neither create nor recognize a part with a part
|
||||||
* name derived from another part name by appending segments to it. [M1.11]
|
* name derived from another part name by appending segments to it. [M1.11]
|
||||||
*
|
*
|
||||||
* Part name equivalence is determined by comparing part names as
|
* Part name equivalence is determined by comparing part names as
|
||||||
* case-insensitive ASCII strings. [M1.12]
|
* case-insensitive ASCII strings. [M1.12]
|
||||||
*
|
*
|
||||||
* @author Julien Chable
|
* @author Julien Chable
|
||||||
* @version 1.0
|
*/
|
||||||
*/
|
public final class TestOPCCompliancePartName extends TestCase {
|
||||||
public class TestOPCCompliancePartName extends TestCase {
|
|
||||||
|
public TestOPCCompliancePartName(String name) {
|
||||||
public TestOPCCompliancePartName(String name) {
|
super(name);
|
||||||
super(name);
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* Test some common invalid names.
|
||||||
* Test some common invalid names.
|
*
|
||||||
*
|
* A segment shall not contain percent-encoded unreserved characters. [M1.8]
|
||||||
* A segment shall not contain percent-encoded unreserved characters. [M1.8]
|
*/
|
||||||
*/
|
public void testInvalidPartNames() {
|
||||||
public void testInvalidPartNames() {
|
String[] invalidNames = { "/", "/xml./doc.xml", "[Content_Types].xml", "//xml/." };
|
||||||
String[] invalidNames = { "/", "/xml./doc.xml", "[Content_Types].xml", "//xml/." };
|
for (String s : invalidNames) {
|
||||||
for (String s : invalidNames) {
|
URI uri = null;
|
||||||
URI uri = null;
|
try {
|
||||||
try {
|
uri = new URI(s);
|
||||||
uri = new URI(s);
|
} catch (URISyntaxException e) {
|
||||||
} catch (URISyntaxException e) {
|
assertTrue(s == "[Content_Types].xml");
|
||||||
assertTrue(s == "[Content_Types].xml");
|
continue;
|
||||||
continue;
|
}
|
||||||
}
|
assertFalse("This part name SHOULD NOT be valid: " + s,
|
||||||
assertFalse("This part name SHOULD NOT be valid: " + s,
|
PackagingURIHelper.isValidPartName(uri));
|
||||||
PackagingURIHelper.isValidPartName(uri));
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* Test some common valid names.
|
||||||
* Test some common valid names.
|
*/
|
||||||
*/
|
public void testValidPartNames() throws URISyntaxException {
|
||||||
public void testValidPartNames() throws URISyntaxException {
|
String[] validNames = { "/xml/item1.xml", "/document.xml",
|
||||||
String[] validNames = { "/xml/item1.xml", "/document.xml",
|
"/a/%D1%86.xml" };
|
||||||
"/a/%D1%86.xml" };
|
for (String s : validNames)
|
||||||
for (String s : validNames)
|
assertTrue("This part name SHOULD be valid: " + s,
|
||||||
assertTrue("This part name SHOULD be valid: " + s,
|
PackagingURIHelper.isValidPartName(new URI(s)));
|
||||||
PackagingURIHelper.isValidPartName(new URI(s)));
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* A part name shall not be empty. [M1.1]
|
||||||
* A part name shall not be empty. [M1.1]
|
*/
|
||||||
*/
|
public void testEmptyPartNameFailure() throws URISyntaxException {
|
||||||
public void testEmptyPartNameFailure() throws URISyntaxException {
|
try {
|
||||||
try {
|
PackagingURIHelper.createPartName(new URI(""));
|
||||||
PackagingURIHelper.createPartName(new URI(""));
|
fail("A part name shall not be empty. [M1.1]");
|
||||||
fail("A part name shall not be empty. [M1.1]");
|
} catch (InvalidFormatException e) {
|
||||||
} catch (InvalidFormatException e) {
|
// Normal behaviour
|
||||||
// Normal behaviour
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* A part name shall not have empty segments. [M1.3]
|
||||||
* A part name shall not have empty segments. [M1.3]
|
*
|
||||||
*
|
* A segment shall not end with a dot ('.') character. [M1.9]
|
||||||
* A segment shall not end with a dot ('.') character. [M1.9]
|
*
|
||||||
*
|
* A segment shall include at least one non-dot character. [M1.10]
|
||||||
* A segment shall include at least one non-dot character. [M1.10]
|
*/
|
||||||
*/
|
public void testPartNameWithInvalidSegmentsFailure() {
|
||||||
public void testPartNameWithInvalidSegmentsFailure() {
|
String[] invalidNames = { "//document.xml", "//word/document.xml",
|
||||||
String[] invalidNames = { "//document.xml", "//word/document.xml",
|
"/word//document.rels", "/word//rels//document.rels",
|
||||||
"/word//document.rels", "/word//rels//document.rels",
|
"/xml./doc.xml", "/document.", "/./document.xml",
|
||||||
"/xml./doc.xml", "/document.", "/./document.xml",
|
"/word/./doc.rels", "/%2F/document.xml" };
|
||||||
"/word/./doc.rels", "/%2F/document.xml" };
|
try {
|
||||||
try {
|
for (String s : invalidNames)
|
||||||
for (String s : invalidNames)
|
assertFalse(
|
||||||
assertFalse(
|
"A part name shall not have empty segments. [M1.3]",
|
||||||
"A part name shall not have empty segments. [M1.3]",
|
PackagingURIHelper.isValidPartName(new URI(s)));
|
||||||
PackagingURIHelper.isValidPartName(new URI(s)));
|
} catch (URISyntaxException e) {
|
||||||
} catch (URISyntaxException e) {
|
fail();
|
||||||
fail();
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* A segment shall not hold any characters other than ipchar (RFC 3987) characters.
|
||||||
* A segment shall not hold any characters other than pchar characters.
|
* [M1.6].
|
||||||
* [M1.6].
|
*/
|
||||||
*/
|
public void testPartNameWithNonPCharCharacters() {
|
||||||
public void testPartNameWithNonPCharCharacters() {
|
String[] validNames = { "/doc&.xml" };
|
||||||
String[] invalidNames = { "/doc<6F>&.xml" };
|
try {
|
||||||
try {
|
for (String s : validNames)
|
||||||
for (String s : invalidNames)
|
assertTrue(
|
||||||
assertTrue(
|
"A segment shall not contain non pchar characters [M1.6] : "
|
||||||
"A segment shall not contain non pchar characters [M1.6] : "
|
+ s, PackagingURIHelper
|
||||||
+ s, PackagingURIHelper
|
.isValidPartName(new URI(s)));
|
||||||
.isValidPartName(new URI(s)));
|
} catch (URISyntaxException e) {
|
||||||
} catch (URISyntaxException e) {
|
fail();
|
||||||
fail();
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* A segment shall not contain percent-encoded unreserved characters [M1.8].
|
||||||
* A segment shall not contain percent-encoded unreserved characters [M1.8].
|
*/
|
||||||
*/
|
public void testPartNameWithUnreservedEncodedCharactersFailure() {
|
||||||
public void testPartNameWithUnreservedEncodedCharactersFailure() {
|
String[] invalidNames = { "/a/docum%65nt.xml" };
|
||||||
String[] invalidNames = { "/a/docum%65nt.xml" };
|
try {
|
||||||
try {
|
for (String s : invalidNames)
|
||||||
for (String s : invalidNames)
|
assertFalse(
|
||||||
assertFalse(
|
"A segment shall not contain percent-encoded unreserved characters [M1.8] : "
|
||||||
"A segment shall not contain percent-encoded unreserved characters [M1.8] : "
|
+ s, PackagingURIHelper
|
||||||
+ s, PackagingURIHelper
|
.isValidPartName(new URI(s)));
|
||||||
.isValidPartName(new URI(s)));
|
} catch (URISyntaxException e) {
|
||||||
} catch (URISyntaxException e) {
|
fail();
|
||||||
fail();
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* A part name shall start with a forward slash ('/') character. [M1.4]
|
||||||
* A part name shall start with a forward slash ('/') character. [M1.4]
|
*/
|
||||||
*/
|
public void testPartNameStartsWithAForwardSlashFailure()
|
||||||
public void testPartNameStartsWithAForwardSlashFailure()
|
throws URISyntaxException {
|
||||||
throws URISyntaxException {
|
try {
|
||||||
try {
|
PackagingURIHelper.createPartName(new URI("document.xml"));
|
||||||
PackagingURIHelper.createPartName(new URI("document.xml"));
|
fail("A part name shall start with a forward slash ('/') character. [M1.4]");
|
||||||
fail("A part name shall start with a forward slash ('/') character. [M1.4]");
|
} catch (InvalidFormatException e) {
|
||||||
} catch (InvalidFormatException e) {
|
// Normal behaviour
|
||||||
// Normal behaviour
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
/**
|
||||||
/**
|
* A part name shall not have a forward slash as the last character. [M1.5]
|
||||||
* A part name shall not have a forward slash as the last character. [M1.5]
|
*/
|
||||||
*/
|
public void testPartNameEndsWithAForwardSlashFailure()
|
||||||
public void testPartNameEndsWithAForwardSlashFailure()
|
throws URISyntaxException {
|
||||||
throws URISyntaxException {
|
try {
|
||||||
try {
|
PackagingURIHelper.createPartName(new URI("/document.xml/"));
|
||||||
PackagingURIHelper.createPartName(new URI("/document.xml/"));
|
fail("A part name shall not have a forward slash as the last character. [M1.5]");
|
||||||
fail("A part name shall not have a forward slash as the last character. [M1.5]");
|
} catch (InvalidFormatException e) {
|
||||||
} catch (InvalidFormatException e) {
|
// Normal behaviour
|
||||||
// Normal behaviour
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
/**
|
||||||
|
* Part name equivalence is determined by comparing part names as
|
||||||
/**
|
* case-insensitive ASCII strings. [M1.12]
|
||||||
* Part name equivalence is determined by comparing part names as
|
*/
|
||||||
* case-insensitive ASCII strings. [M1.12]
|
public void testPartNameComparaison() throws Exception {
|
||||||
*/
|
String[] partName1 = { "/word/document.xml", "/docProps/core.xml", "/rels/.rels" };
|
||||||
public void testPartNameComparaison() throws Exception {
|
String[] partName2 = { "/WORD/DocUment.XML", "/docProps/core.xml", "/rels/.rels" };
|
||||||
String[] partName1 = { "/word/document.xml", "/docProps/core.xml",
|
for (int i = 0; i < partName1.length || i < partName2.length; ++i) {
|
||||||
"/rels/.rels" };
|
PackagePartName p1 = PackagingURIHelper.createPartName(partName1[i]);
|
||||||
String[] partName2 = { "/WORD/DocUment.XML", "/docProps/core.xml",
|
PackagePartName p2 = PackagingURIHelper.createPartName(partName2[i]);
|
||||||
"/rels/.rels" };
|
assertTrue(p1.equals(p2));
|
||||||
for (int i = 0; i < partName1.length || i < partName2.length; ++i) {
|
assertTrue(p1.compareTo(p2) == 0);
|
||||||
PackagePartName p1 = PackagingURIHelper
|
assertTrue(p1.hashCode() == p2.hashCode());
|
||||||
.createPartName(partName1[i]);
|
}
|
||||||
PackagePartName p2 = PackagingURIHelper
|
}
|
||||||
.createPartName(partName2[i]);
|
|
||||||
assertTrue(p1.equals(p2));
|
/**
|
||||||
assertTrue(p1.compareTo(p2) == 0);
|
* Part name equivalence is determined by comparing part names as
|
||||||
assertTrue(p1.hashCode() == p2.hashCode());
|
* case-insensitive ASCII strings. [M1.12].
|
||||||
}
|
*
|
||||||
}
|
* All the comparisons MUST FAIL !
|
||||||
|
*/
|
||||||
/**
|
public void testPartNameComparaisonFailure() throws Exception {
|
||||||
* Part name equivalence is determined by comparing part names as
|
String[] partName1 = { "/word/document.xml", "/docProps/core.xml", "/rels/.rels" };
|
||||||
* case-insensitive ASCII strings. [M1.12].
|
String[] partName2 = { "/WORD/DocUment.XML2", "/docProp/core.xml", "/rels/rels" };
|
||||||
*
|
for (int i = 0; i < partName1.length || i < partName2.length; ++i) {
|
||||||
* All the comparaisons MUST FAIL !
|
PackagePartName p1 = PackagingURIHelper.createPartName(partName1[i]);
|
||||||
*/
|
PackagePartName p2 = PackagingURIHelper.createPartName(partName2[i]);
|
||||||
public void testPartNameComparaisonFailure() throws Exception {
|
assertFalse(p1.equals(p2));
|
||||||
String[] partName1 = { "/word/document.xml", "/docProps/core.xml",
|
assertFalse(p1.compareTo(p2) == 0);
|
||||||
"/rels/.rels" };
|
assertFalse(p1.hashCode() == p2.hashCode());
|
||||||
String[] partName2 = { "/WORD/DocUment.XML2", "/docProp/core.xml",
|
}
|
||||||
"/rels/rels" };
|
}
|
||||||
for (int i = 0; i < partName1.length || i < partName2.length; ++i) {
|
}
|
||||||
PackagePartName p1 = PackagingURIHelper
|
|
||||||
.createPartName(partName1[i]);
|
|
||||||
PackagePartName p2 = PackagingURIHelper
|
|
||||||
.createPartName(partName2[i]);
|
|
||||||
assertFalse(p1.equals(p2));
|
|
||||||
assertFalse(p1.compareTo(p2) == 0);
|
|
||||||
assertFalse(p1.hashCode() == p2.hashCode());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue