From 4f658c9b76dcd783c3895f060c755702a6c251de Mon Sep 17 00:00:00 2001 From: Rainer Klute Date: Sun, 15 Aug 2004 13:40:22 +0000 Subject: [PATCH] Restored the functionality to use ALL files beginning with "Test" in src/testcases/org/apache/poi/hpsf/data as test data. Each of these files is read and rewritten. The result is compared with the original and must be equal to it. git-svn-id: https://svn.apache.org/repos/asf/jakarta/poi/trunk@353582 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/poi/hpsf/basic/TestWrite.java | 63 ++++++++++--------- 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java index 2113f6eb4..6c0e97a74 100644 --- a/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java +++ b/src/testcases/org/apache/poi/hpsf/basic/TestWrite.java @@ -396,22 +396,38 @@ public class TestWrite extends TestCase check(Variant.VT_I2, new Integer(27), codepage); check(Variant.VT_I4, new Long(28), codepage); check(Variant.VT_FILETIME, new Date(), codepage); - check(Variant.VT_LPSTR, "", codepage); - check(Variant.VT_LPSTR, "\u00e4", codepage); - check(Variant.VT_LPSTR, "\u00e4\u00f6", codepage); - check(Variant.VT_LPSTR, "\u00e4\u00f6\u00fc", codepage); - check(Variant.VT_LPSTR, "\u00e4\u00f6\u00fc\u00c4", codepage); - check(Variant.VT_LPSTR, "\u00e4\u00f6\u00fc\u00c4\u00d6", codepage); - check(Variant.VT_LPSTR, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc", codepage); - check(Variant.VT_LPSTR, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df", codepage); - check(Variant.VT_LPWSTR, "", codepage); - check(Variant.VT_LPWSTR, "\u00e4", codepage); - check(Variant.VT_LPWSTR, "\u00e4\u00f6", codepage); - check(Variant.VT_LPWSTR, "\u00e4\u00f6\u00fc", codepage); - check(Variant.VT_LPWSTR, "\u00e4\u00f6\u00fc\u00c4", codepage); - check(Variant.VT_LPWSTR, "\u00e4\u00f6\u00fc\u00c4\u00d6", codepage); - check(Variant.VT_LPWSTR, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc", codepage); - check(Variant.VT_LPWSTR, "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df", codepage); + check(Variant.VT_LPSTR, + "", codepage); + check(Variant.VT_LPSTR, + "\u00e4", codepage); + check(Variant.VT_LPSTR, + "\u00e4\u00f6", codepage); + check(Variant.VT_LPSTR, + "\u00e4\u00f6\u00fc", codepage); + check(Variant.VT_LPSTR, + "\u00e4\u00f6\u00fc\u00c4", codepage); + check(Variant.VT_LPSTR, + "\u00e4\u00f6\u00fc\u00c4\u00d6", codepage); + check(Variant.VT_LPSTR, + "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc", codepage); + check(Variant.VT_LPSTR, + "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df", codepage); + check(Variant.VT_LPWSTR, + "", codepage); + check(Variant.VT_LPWSTR, + "\u00e4", codepage); + check(Variant.VT_LPWSTR, + "\u00e4\u00f6", codepage); + check(Variant.VT_LPWSTR, + "\u00e4\u00f6\u00fc", codepage); + check(Variant.VT_LPWSTR, + "\u00e4\u00f6\u00fc\u00c4", codepage); + check(Variant.VT_LPWSTR, + "\u00e4\u00f6\u00fc\u00c4\u00d6", codepage); + check(Variant.VT_LPWSTR, + "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc", codepage); + check(Variant.VT_LPWSTR, + "\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df", codepage); } catch (Exception ex) { @@ -637,23 +653,11 @@ public class TestWrite extends TestCase { final File dataDir = new File(System.getProperty("HPSF.testdata.path")); - String[] filesToTest = new String[]{ - "Test0313rur.adm", - "TestChineseProperties.doc", - "TestCorel.shw", - "TestEditTime.doc", - "TestGermanWord90.doc", - "TestMickey.doc", - "TestSectionDictionary.doc", - "TestUnicode.xls" - - }; - final java.util.List listFilesToTest = Arrays.asList(filesToTest); final File[] fileList = dataDir.listFiles(new FileFilter() { public boolean accept(final File f) { - return listFilesToTest.contains(f.getName()); + return f.getName().startsWith("Test"); } }); for (int i = 0; i < fileList.length; i++) @@ -670,6 +674,7 @@ public class TestWrite extends TestCase */ private void testRecreate(final File f) { + System.out.println("Recreating file \"" + f + "\""); try { /* Read the POI filesystem's property set streams: */