Author: centic
Date: Wed Dec 26 13:28:10 2018
New Revision: 1849763
URL: http://svn.apache.org/viewvc?rev=1849763&view=rev
Log:
Fix various IDE warnings and some JavaDoc adjustments
Modified:
poi/trunk/src/java/org/apache/poi/ss/formula/functions/Complex.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
Modified: poi/trunk/src/java/org/apache/poi/ss/formula/functions/Complex.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/java/org/apache/poi/ss/formula/functions/Complex.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
--- poi/trunk/src/java/org/apache/poi/ss/formula/functions/Complex.java
(original)
+++ poi/trunk/src/java/org/apache/poi/ss/formula/functions/Complex.java Wed Dec
26 13:28:10 2018
@@ -72,7 +72,7 @@ public class Complex extends Var2or3ArgF
} catch (EvaluationException e) {
return e.getErrorEval();
}
- double realNum = 0;
+ double realNum;
try {
realNum = OperandResolver.coerceValueToDouble(veText1);
} catch (EvaluationException e) {
@@ -85,7 +85,7 @@ public class Complex extends Var2or3ArgF
} catch (EvaluationException e) {
return e.getErrorEval();
}
- double realINum = 0;
+ double realINum;
try {
realINum = OperandResolver.coerceValueToDouble(veINum);
} catch (EvaluationException e) {
@@ -104,7 +104,7 @@ public class Complex extends Var2or3ArgF
return ErrorEval.VALUE_INVALID;
}
- StringBuffer strb = new StringBuffer("");
+ StringBuilder strb = new StringBuilder();
if (realNum != 0) {
if (isDoubleAnInt(realNum)) {
strb.append((int)realNum);
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/OPCPackage.java Wed
Dec 26 13:28:10 2018
@@ -293,6 +293,8 @@ public abstract class OPCPackage impleme
* @return A PackageBase object
*
* @throws InvalidFormatException
+ * Throws if the specified file exist and
is not valid.
+ * @throws IOException If reading the stream fails
*/
public static OPCPackage open(InputStream in) throws
InvalidFormatException,
IOException {
@@ -1466,14 +1468,8 @@ public abstract class OPCPackage impleme
}
// Do the save
- FileOutputStream fos = null;
- try {
- fos = new FileOutputStream(targetFile);
+ try (FileOutputStream fos = new FileOutputStream(targetFile)) {
this.save(fos);
- } finally {
- if (fos != null) {
- fos.close();
- }
}
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagePartName.java
Wed Dec 26 13:28:10 2018
@@ -161,7 +161,7 @@ public final class PackagePartName imple
*
* @param partUri
* The part name to check.
- * @throws Exception
+ * @throws InvalidFormatException
* Throws if the part name is invalid.
*/
private static void throwExceptionIfInvalidPartUri(URI partUri)
@@ -513,7 +513,7 @@ public final class PackagePartName imple
* (lexigraphical sort)
*
* @param str1 first string to compare
- * @param str1 second string to compare
+ * @param str2 second string to compare
* @return a negative integer, zero, or a positive integer as the first
argument is less than,
* equal to, or greater than the second.
*/
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackageRelationship.java
Wed Dec 26 13:28:10 2018
@@ -210,18 +210,11 @@ public final class PackageRelationship {
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(id == null ? "id=null" : "id=" + id);
- sb.append(container == null ? " - container=null" : " -
container="
- + container);
- sb.append(relationshipType == null ? " - relationshipType=null"
- : " - relationshipType=" + relationshipType);
- sb.append(source == null ? " - source=null" : " - source="
- + getSourceURI().toASCIIString());
- sb.append(targetUri == null ? " - target=null" : " - target="
- + getTargetURI().toASCIIString());
- sb.append(targetMode == null ? ",targetMode=null" :
",targetMode="
- + targetMode);
- return sb.toString();
+ return (id == null ? "id=null" : "id=" + id) +
+ (container == null ? " - container=null" : " -
container=" + container) +
+ (relationshipType == null ? " -
relationshipType=null" : " - relationshipType=" + relationshipType) +
+ (source == null ? " - source=null" : " -
source=" + getSourceURI().toASCIIString()) +
+ (targetUri == null ? " - target=null" : " -
target=" + getTargetURI().toASCIIString()) +
+ (targetMode == null ? ",targetMode=null" :
",targetMode=" + targetMode);
}
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/PackagingURIHelper.java
Wed Dec 26 13:28:10 2018
@@ -48,32 +48,32 @@ public final class PackagingURIHelper {
/**
* Extension name of a relationship part.
*/
- public static final String RELATIONSHIP_PART_EXTENSION_NAME;
+ public static final String RELATIONSHIP_PART_EXTENSION_NAME = ".rels";
/**
* Segment name of a relationship part.
*/
- public static final String RELATIONSHIP_PART_SEGMENT_NAME;
+ public static final String RELATIONSHIP_PART_SEGMENT_NAME = "_rels";
/**
* Segment name of the package properties folder.
*/
- public static final String PACKAGE_PROPERTIES_SEGMENT_NAME;
+ public static final String PACKAGE_PROPERTIES_SEGMENT_NAME = "docProps";
/**
* Core package properties art name.
*/
- public static final String PACKAGE_CORE_PROPERTIES_NAME;
+ public static final String PACKAGE_CORE_PROPERTIES_NAME = "core.xml";
/**
* Forward slash URI separator.
*/
- public static final char FORWARD_SLASH_CHAR;
+ public static final char FORWARD_SLASH_CHAR = '/';
/**
* Forward slash URI separator.
*/
- public static final String FORWARD_SLASH_STRING;
+ public static final String FORWARD_SLASH_STRING = "/";
/**
* Package relationships part URI
@@ -107,13 +107,6 @@ public final class PackagingURIHelper {
/* Static initialization */
static {
- RELATIONSHIP_PART_SEGMENT_NAME = "_rels";
- RELATIONSHIP_PART_EXTENSION_NAME = ".rels";
- FORWARD_SLASH_CHAR = '/';
- FORWARD_SLASH_STRING = "/";
- PACKAGE_PROPERTIES_SEGMENT_NAME = "docProps";
- PACKAGE_CORE_PROPERTIES_NAME = "core.xml";
-
// Make URI
URI uriPACKAGE_ROOT_URI = null;
URI uriPACKAGE_RELATIONSHIPS_ROOT_URI = null;
Modified: poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
--- poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java
(original)
+++ poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/ZipPackage.java Wed
Dec 26 13:28:10 2018
@@ -94,7 +94,7 @@ public final class ZipPackage extends OP
* @param access
* The package access mode.
* @throws IllegalArgumentException
- * If the specified input stream not an instance of
+ * If the specified input stream is not an instance of
* ZipInputStream.
* @throws IOException
* if input stream cannot be opened, read, or closed
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/ContentType.java
Wed Dec 26 13:28:10 2018
@@ -92,7 +92,7 @@ public final class ContentType {
*
* CHAR = <any US-ASCII character (octets 0 - 127)>
*/
- String token =
"[\\x21-\\x7E&&[^\\(\\)<>@,;:\\\\/\"\\[\\]\\?={}\\x20\\x09]]";
+ String token =
"[\\x21-\\x7E&&[^()<>@,;:\\\\/\"\\[\\]?={}\\x20\\x09]]";
/*
* parameter = attribute "=" value
@@ -248,7 +248,7 @@ public final class ContentType {
public String[] getParameterKeys() {
if (parameters == null)
return new String[0];
- return parameters.keySet().toArray(new String[parameters.size()]);
+ return parameters.keySet().toArray(new String[0]);
}
/**
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/FileHelper.java
Wed Dec 26 13:28:10 2018
@@ -69,7 +69,6 @@ public final class FileHelper {
FileChannel destinationChannel = fos.getChannel()) {
sourceChannel.transferTo(0, sourceChannel.size(),
destinationChannel);
- sourceChannel.close();
}
}
Modified:
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
(original)
+++
poi/trunk/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/PartUnmarshaller.java
Wed Dec 26 13:28:10 2018
@@ -26,7 +26,7 @@ import org.apache.poi.openxml4j.opc.Pack
import org.apache.poi.openxml4j.opc.internal.unmarshallers.UnmarshallContext;
/**
- * Object implemented this interface are considered as part unmarshaller. A
part
+ * Classes implementing this interface are considered as part unmarshaller. A
part
* unmarshaller is responsible to unmarshall a part in order to load it from a
* package.
*
@@ -38,12 +38,10 @@ public interface PartUnmarshaller {
/**
* Save the content of the package in the stream
*
- * @param in
- * The input stream from which the part will be unmarshall.
- * @return The part freshly unmarshall from the input stream.
- * @throws OpenXML4JException
- * Throws only if any other exceptions are thrown by inner
- * methods.
+ * @param in The input stream from which the part will be read.
+ * @return The part freshly read from the input stream.
+ * @throws InvalidFormatException If the data can not be interpreted
correctly
+ * @throws IOException if reading from the stream fails
*/
public PackagePart unmarshall(UnmarshallContext context, InputStream in)
throws InvalidFormatException, IOException;
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestContentType.java
Wed Dec 26 13:28:10 2018
@@ -17,9 +17,6 @@
package org.apache.poi.openxml4j.opc;
-import java.io.InputStream;
-import java.net.URL;
-
import org.apache.poi.ooxml.util.POIXMLConstants;
import org.apache.poi.openxml4j.OpenXML4JTestDataSamples;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
@@ -28,9 +25,13 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import static org.junit.Assert.*;
-
import javax.xml.parsers.DocumentBuilderFactory;
+import java.io.InputStream;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
/**
* Tests for content type (ContentType class).
@@ -169,67 +170,67 @@ public final class TestContentType {
*/
@Test
public void testFileWithContentTypeParams() throws Exception {
- InputStream is =
OpenXML4JTestDataSamples.openSampleStream("ContentTypeHasParameters.ooxml");
+ try (InputStream is =
OpenXML4JTestDataSamples.openSampleStream("ContentTypeHasParameters.ooxml");
+ OPCPackage p = OPCPackage.open(is)) {
- OPCPackage p = OPCPackage.open(is);
+ final String typeResqml = "application/x-resqml+xml";
- final String typeResqml = "application/x-resqml+xml";
-
- // Check the types on everything
- for (PackagePart part : p.getParts()) {
- final String contentType = part.getContentType();
- final ContentType details = part.getContentTypeDetails();
- final int length = details.getParameterKeys().length;
- final boolean hasParameters = details.hasParameters();
-
- // _rels type doesn't have any params
- if (part.isRelationshipPart()) {
- assertEquals(ContentTypes.RELATIONSHIPS_PART, contentType);
- assertEquals(ContentTypes.RELATIONSHIPS_PART,
details.toString());
- assertEquals(false, hasParameters);
- assertEquals(0, length);
- }
- // Core type doesn't have any params
- else if
(part.getPartName().toString().equals("/docProps/core.xml")) {
- assertEquals(ContentTypes.CORE_PROPERTIES_PART, contentType);
- assertEquals(ContentTypes.CORE_PROPERTIES_PART,
details.toString());
- assertEquals(false, hasParameters);
- assertEquals(0, length);
- }
- // Global Crs types do have params
- else if (part.getPartName().toString().equals("/global1dCrs.xml"))
{
- assertTrue(part.getContentType().startsWith(typeResqml));
- assertEquals(typeResqml, details.toString(false));
- assertEquals(true, hasParameters);
- assertContains("version=2.0", details.toString());
- assertContains("type=obj_global1dCrs", details.toString());
- assertEquals(2, length);
- assertEquals("2.0", details.getParameter("version"));
- assertEquals("obj_global1dCrs", details.getParameter("type"));
- } else if
(part.getPartName().toString().equals("/global2dCrs.xml")) {
- assertTrue(part.getContentType().startsWith(typeResqml));
- assertEquals(typeResqml, details.toString(false));
- assertEquals(true, hasParameters);
- assertContains("version=2.0", details.toString());
- assertContains("type=obj_global2dCrs", details.toString());
- assertEquals(2, length);
- assertEquals("2.0", details.getParameter("version"));
- assertEquals("obj_global2dCrs", details.getParameter("type"));
- }
- // Other thingy
- else if
(part.getPartName().toString().equals("/myTestingGuid.xml")) {
- assertTrue(part.getContentType().startsWith(typeResqml));
- assertEquals(typeResqml, details.toString(false));
- assertEquals(true, hasParameters);
- assertContains("version=2.0", details.toString());
- assertContains("type=obj_tectonicBoundaryFeature",
details.toString());
- assertEquals(2, length);
- assertEquals("2.0", details.getParameter("version"));
- assertEquals("obj_tectonicBoundaryFeature",
details.getParameter("type"));
- }
- // That should be it!
- else {
- fail("Unexpected part " + part);
+ // Check the types on everything
+ for (PackagePart part : p.getParts()) {
+ final String contentType = part.getContentType();
+ final ContentType details = part.getContentTypeDetails();
+ final int length = details.getParameterKeys().length;
+ final boolean hasParameters = details.hasParameters();
+
+ // _rels type doesn't have any params
+ if (part.isRelationshipPart()) {
+ assertEquals(ContentTypes.RELATIONSHIPS_PART, contentType);
+ assertEquals(ContentTypes.RELATIONSHIPS_PART,
details.toString());
+ assertFalse(hasParameters);
+ assertEquals(0, length);
+ }
+ // Core type doesn't have any params
+ else if
(part.getPartName().toString().equals("/docProps/core.xml")) {
+ assertEquals(ContentTypes.CORE_PROPERTIES_PART,
contentType);
+ assertEquals(ContentTypes.CORE_PROPERTIES_PART,
details.toString());
+ assertFalse(hasParameters);
+ assertEquals(0, length);
+ }
+ // Global Crs types do have params
+ else if
(part.getPartName().toString().equals("/global1dCrs.xml")) {
+ assertTrue(part.getContentType().startsWith(typeResqml));
+ assertEquals(typeResqml, details.toString(false));
+ assertTrue(hasParameters);
+ assertContains("version=2.0", details.toString());
+ assertContains("type=obj_global1dCrs", details.toString());
+ assertEquals(2, length);
+ assertEquals("2.0", details.getParameter("version"));
+ assertEquals("obj_global1dCrs",
details.getParameter("type"));
+ } else if
(part.getPartName().toString().equals("/global2dCrs.xml")) {
+ assertTrue(part.getContentType().startsWith(typeResqml));
+ assertEquals(typeResqml, details.toString(false));
+ assertTrue(hasParameters);
+ assertContains("version=2.0", details.toString());
+ assertContains("type=obj_global2dCrs", details.toString());
+ assertEquals(2, length);
+ assertEquals("2.0", details.getParameter("version"));
+ assertEquals("obj_global2dCrs",
details.getParameter("type"));
+ }
+ // Other thingy
+ else if
(part.getPartName().toString().equals("/myTestingGuid.xml")) {
+ assertTrue(part.getContentType().startsWith(typeResqml));
+ assertEquals(typeResqml, details.toString(false));
+ assertTrue(hasParameters);
+ assertContains("version=2.0", details.toString());
+ assertContains("type=obj_tectonicBoundaryFeature",
details.toString());
+ assertEquals(2, length);
+ assertEquals("2.0", details.getParameter("version"));
+ assertEquals("obj_tectonicBoundaryFeature",
details.getParameter("type"));
+ }
+ // That should be it!
+ else {
+ fail("Unexpected part " + part);
+ }
}
}
}
Modified:
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
(original)
+++
poi/trunk/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestFileHelper.java
Wed Dec 26 13:28:10 2018
@@ -17,7 +17,7 @@
package org.apache.poi.openxml4j.opc;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
import java.io.File;
import java.util.TreeMap;
@@ -52,7 +52,7 @@ public final class TestFileHelper {
//
assertTrue(expectedValue.get(filename).equalsIgnoreCase(f2.getAbsolutePath()));
// // This comparison is platform dependent. A
better approach is below
// }
- assertTrue(f1.equals(f2));
+ assertEquals(f1, f2);
}
}
}
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hslf/usermodel/TestBugs.java
Wed Dec 26 13:28:10 2018
@@ -579,20 +579,20 @@ public final class TestBugs {
@Test
public void bug47261() throws IOException {
- HSLFSlideShow ppt = open("bug47261.ppt");
- ppt.removeSlide(0);
- ppt.createSlide();
- HSLFTestDataSamples.writeOutAndReadBack(ppt).close();
- ppt.close();
+ try (HSLFSlideShow ppt = open("bug47261.ppt")) {
+ ppt.removeSlide(0);
+ ppt.createSlide();
+ HSLFTestDataSamples.writeOutAndReadBack(ppt).close();
+ }
}
@Test
public void bug56240() throws IOException {
- HSLFSlideShow ppt = open("bug56240.ppt");
- int slideCnt = ppt.getSlides().size();
- assertEquals(105, slideCnt);
- HSLFTestDataSamples.writeOutAndReadBack(ppt).close();
- ppt.close();
+ try (HSLFSlideShow ppt = open("bug56240.ppt")) {
+ int slideCnt = ppt.getSlides().size();
+ assertEquals(105, slideCnt);
+ HSLFTestDataSamples.writeOutAndReadBack(ppt).close();
+ }
}
@Test
Modified:
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
URL:
http://svn.apache.org/viewvc/poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java?rev=1849763&r1=1849762&r2=1849763&view=diff
==============================================================================
---
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
(original)
+++
poi/trunk/src/scratchpad/testcases/org/apache/poi/hwpf/usermodel/TestBug47563.java
Wed Dec 26 13:28:10 2018
@@ -69,7 +69,6 @@ public class TestBug47563 extends TestCa
row.sanityCheck();
table.sanityCheck();
range.sanityCheck();
-
}
}
@@ -77,7 +76,8 @@ public class TestBug47563 extends TestCa
int mustBeAfter = 0;
for (int i = 0; i < rows * columns; i++) {
int next = text.indexOf(Integer.toString(i),
mustBeAfter);
- assertTrue("Test with " + rows + "/" + columns + ":
Should not find " + i + " but found it at " + next + " in " + text,
+ assertTrue("Test with " + rows + "/" + columns + ":
Should not find " + i + " but found it at " + next + " with " + mustBeAfter + "
in " + text + "\n" +
+
text.indexOf(Integer.toString(i), mustBeAfter),
next != -1);
mustBeAfter = next;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
