From: <be...@us...> - 2006-10-16 13:45:10
|
Revision: 57 http://svn.sourceforge.net/pzfilereader/?rev=57&view=rev Author: benoitx Date: 2006-10-16 06:44:42 -0700 (Mon, 16 Oct 2006) Log Message: ----------- Added unit tests in pzfilereader (quite limited). Modified Paths: -------------- trunk/PZFileReader/.classpath trunk/PZFileReader/.project trunk/PZFileReader/project.xml trunk/PZFileReader/qalab.xml trunk/PZFileReader/src/test/java/com/test/AllJunitTests.java trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/DelimitedColumnNamesInFile.java trunk/PZFileReader/src/test/java/com/test/delim/tab/TabDelimited.java trunk/PZFileReaderSamples/.classpath trunk/PZFileReaderSamples/.project Added Paths: ----------- trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/DelimitedColumnNamesInFileTest.java trunk/PZFileReader/src/test/java/com/test/delim/multiLine/TestCSVPerformance.java trunk/PZFileReader/src/test/java/com/test/delim/tab/TabDelimitedTest.java trunk/PZFileReaderSamples/maven.xml trunk/PZFileReaderSamples/project.xml trunk/PZFileReaderSamples/qalab.xml Removed Paths: ------------- trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/TestDelimitedColumnNamesInFile.java trunk/PZFileReader/src/test/java/com/test/delim/multiLine/CSVPerformanceTest.java trunk/PZFileReader/src/test/java/com/test/delim/tab/TestTabDelimited.java Property Changed: ---------------- trunk/PZFileReaderSamples/ Modified: trunk/PZFileReader/.classpath =================================================================== --- trunk/PZFileReader/.classpath 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/.classpath 2006-10-16 13:44:42 UTC (rev 57) @@ -1,9 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <classpathentry kind="src" path=""/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="include/jdom.jar"/> - <classpathentry kind="lib" path="include/junit.jar"/> - <classpathentry kind="lib" path="include/jxl.jar"/> - <classpathentry kind="output" path=""/> -</classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"></classpathentry> + <classpathentry excluding="" kind="src" path="src/main/java"></classpathentry> + <classpathentry output="target/test-classes" kind="src" path="src/test/java"></classpathentry> + <classpathentry path="MAVEN_REPO/junit/jars/junit-3.8.2.jar" kind="var"></classpathentry> + <classpathentry path="MAVEN_REPO/jdom/jars/jdom-1.0.jar" kind="var"></classpathentry> + <classpathentry path="MAVEN_REPO/jexcelapi/jars/jxl-2.4.2.jar" kind="var"></classpathentry> + <classpathentry kind="output" path="target/classes"></classpathentry> +</classpath> \ No newline at end of file Modified: trunk/PZFileReader/.project =================================================================== --- trunk/PZFileReader/.project 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/.project 2006-10-16 13:44:42 UTC (rev 57) @@ -1,22 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>PZFileReader</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.ibm.sse.model.structuredbuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>pzfilereader</name> + <comment>Simple Java delimited and fixed width file parser. Handles CSV, Excel CSV, Tab, Pipe delimiters, just to name a few. Maps column positions in the file to user friendly names via XML. See PZFileReader Feature List under News for complete feature list.</comment> + <projects></projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments></arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: trunk/PZFileReader/project.xml =================================================================== --- trunk/PZFileReader/project.xml 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/project.xml 2006-10-16 13:44:42 UTC (rev 57) @@ -47,7 +47,7 @@ <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory> <unitTest> <includes> - <include>**/*NOTest.java</include> + <include>**/*Test.java</include> </includes> <excludes> <exclude>**/Abstract*.java</exclude> Modified: trunk/PZFileReader/qalab.xml =================================================================== --- trunk/PZFileReader/qalab.xml 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/qalab.xml 2006-10-16 13:44:42 UTC (rev 57) @@ -19,13 +19,17 @@ <summary> <summaryresult date="2006-10-16" filecount="18" statvalue="469" type="checkstyle"/> <summaryresult date="2006-10-16" filecount="2" statvalue="4" type="pmd"/> - <summaryresult date="2006-10-16" filecount="7" statvalue="18" type="findbugs"/> + <summaryresult date="2006-10-16" filecount="7" statvalue="16" type="findbugs"/> <summaryresult date="2006-10-16" filecount="3" statvalue="170" type="simian"/> + <summaryresult date="2006-10-16" filecount="13" statvalue="17" type="cobertura-line"/> + <summaryresult date="2006-10-16" filecount="13" statvalue="26" type="cobertura-branch"/> </summary> <file id="com_pz_reader_util_ParserUtils.java" path="com/pz/reader/util/ParserUtils.java"> <result date="2006-10-16" statvalue="25" type="checkstyle"/> <result date="2006-10-16" statvalue="3" type="pmd"/> <result date="2006-10-16" statvalue="3" type="findbugs"/> + <result date="2006-10-16" statvalue="37" type="cobertura-line"/> + <result date="2006-10-16" statvalue="48" type="cobertura-branch"/> </file> <file id="com_pz_reader_xml_PZMapParser.java" path="com/pz/reader/xml/PZMapParser.java"> <result date="2006-10-16" statvalue="158" type="checkstyle"/> @@ -38,11 +42,13 @@ id="C:_project_pzfilereader_PZFileReader_src_test_java_com_test_delim_tab_TabDelimited.java" path="C:/project/pzfilereader/PZFileReader/src/test/java/com/test/delim/tab/TabDelimited.java"/> <file id="com_pz_reader_DataSet.java" path="com/pz/reader/DataSet.java"> <result date="2006-10-16" statvalue="103" type="checkstyle"/> - <result date="2006-10-16" statvalue="3" type="findbugs"/> + <result date="2006-10-16" statvalue="2" type="findbugs"/> + <result date="2006-10-16" statvalue="20" type="cobertura-line"/> + <result date="2006-10-16" statvalue="25" type="cobertura-branch"/> </file> <file id="com_pz_reader_LargeDataSet.java" path="com/pz/reader/LargeDataSet.java"> <result date="2006-10-16" statvalue="63" type="checkstyle"/> - <result date="2006-10-16" statvalue="3" type="findbugs"/> + <result date="2006-10-16" statvalue="2" type="findbugs"/> </file> <file id="com_pz_reader_ordering_OrderBy.java" path="com/pz/reader/ordering/OrderBy.java"> <result date="2006-10-16" statvalue="12" type="checkstyle"/> @@ -55,6 +61,7 @@ <file id="com_pz_reader_structure_Row.java" path="com/pz/reader/structure/Row.java"> <result date="2006-10-16" statvalue="2" type="checkstyle"/> <result date="2006-10-16" statvalue="1" type="findbugs"/> + <result date="2006-10-16" statvalue="44" type="cobertura-line"/> </file> <file id="com_pz_reader_DataError.java" path="com/pz/reader/DataError.java"> <result date="2006-10-16" statvalue="5" type="checkstyle"/> @@ -65,6 +72,7 @@ </file> <file id="com_pz_reader_structure_ColumnMetaData.java" path="com/pz/reader/structure/ColumnMetaData.java"> <result date="2006-10-16" statvalue="66" type="checkstyle"/> + <result date="2006-10-16" statvalue="50" type="cobertura-line"/> <result date="2006-10-16" statvalue="100" type="cobertura-branch"/> </file> <file id="com_pz_reader_xml_XMLRecordElement.java" path="com/pz/reader/xml/XMLRecordElement.java"> Modified: trunk/PZFileReader/src/test/java/com/test/AllJunitTests.java =================================================================== --- trunk/PZFileReader/src/test/java/com/test/AllJunitTests.java 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/src/test/java/com/test/AllJunitTests.java 2006-10-16 13:44:42 UTC (rev 57) @@ -16,8 +16,8 @@ public static Test suite() { TestSuite suite = new TestSuite("Test For All PZFileReader Functionality"); //$JUnit-BEGIN$ - suite.addTest(new TestSuite(com.test.delim.columnInFile.TestDelimitedColumnNamesInFile.class)); - suite.addTest(new TestSuite(com.test.delim.tab.TestTabDelimited.class)); + suite.addTest(new TestSuite(com.test.delim.columnInFile.DelimitedColumnNamesInFileTest.class)); + suite.addTest(new TestSuite(com.test.delim.tab.TabDelimitedTest.class)); //$JUnit-END$ return suite; } Modified: trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/DelimitedColumnNamesInFile.java =================================================================== --- trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/DelimitedColumnNamesInFile.java 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/DelimitedColumnNamesInFile.java 2006-10-16 13:44:42 UTC (rev 57) @@ -3,7 +3,7 @@ /* * Created on Nov 27, 2005 * - */ + */ import java.io.File; @@ -25,21 +25,21 @@ DataSet ds = null; String[] colNames = null; OrderBy orderby = null; - - + + //delimited by a comma //text qualified by double quotes //ignore first record ds = new DataSet(new File("com/test/delim/columnInFile/PEOPLE-CommaDelimitedWithQualifier.txt"),",","\"",false); - + //re order the data set by last name orderby = new OrderBy(); orderby.addOrderColumn(new OrderColumn("CITY",false)); orderby.addOrderColumn(new OrderColumn("LASTNAME",true)); ds.orderRows(orderby); - + colNames = ds.getColumns(); - + while (ds.next()){ for (int i = 0; i < colNames.length; i++){ System.out.println("COLUMN NAME: " + colNames[i] + " VALUE: " + ds.getString(colNames[i])); @@ -47,8 +47,8 @@ System.out.println("==========================================================================="); } - - + + if (ds.getErrors() != null && ds.getErrors().size() > 0){ System.out.println("FOUND ERRORS IN FILE...."); for (int i = 0; i < ds.getErrors().size(); i++){ @@ -56,16 +56,16 @@ System.out.println("Error: " + de.getErrorDesc() + " Line: " + de.getLineNo()); } } - + //clear out the DataSet object for the JVM to collect ds.freeMemory(); - + } - - + + //used for Junit test - + public DataSet getDsForTest() throws Exception{ - return new DataSet(new File("com/test/delim/columnInFile/PEOPLE-CommaDelimitedWithQualifier.txt"),",","\"",false); + return new DataSet(new File("src/test/java/com/test/delim/columnInFile/PEOPLE-CommaDelimitedWithQualifier.txt"),",","\"",false); } } Copied: trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/DelimitedColumnNamesInFileTest.java (from rev 56, trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/TestDelimitedColumnNamesInFile.java) =================================================================== --- trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/DelimitedColumnNamesInFileTest.java (rev 0) +++ trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/DelimitedColumnNamesInFileTest.java 2006-10-16 13:44:42 UTC (rev 57) @@ -0,0 +1,94 @@ +/* + * Created on Feb 26, 2006 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package com.test.delim.columnInFile; + +import com.pz.reader.DataSet; + +import junit.framework.TestCase; + +/** + * @author zepernick + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class DelimitedColumnNamesInFileTest extends TestCase { + public DelimitedColumnNamesInFileTest( + String name) { + super(name); + } + + //tests to make sure we have 0 errors + public void testErrorCount() { + DataSet ds = null; + + try{ + DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile(); + + ds = testDelimted.getDsForTest(); + + //check that we had no errors + assertEquals(0, ds.getErrors().size()); + + + }catch(Exception ex){ + ex.printStackTrace(); + }finally{ + if (ds != null) ds.freeMemory(); + } + } + + //test to make sure we parsed the correct number + //of rows in the file + public void testRowCount(){ + DataSet ds = null; + + try{ + DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile(); + + ds = testDelimted.getDsForTest(); + + //check that we parsed in the right amount of rows + assertEquals(6, ds.rows.size()); + + + + }catch(Exception ex){ + ex.printStackTrace(); + }finally{ + if (ds != null) ds.freeMemory(); + } + } + + + //test to make sure we have the right number of column names from the file + public void testColumnNameCount(){ + DataSet ds = null; + + try{ + DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile(); + + ds = testDelimted.getDsForTest(); + + //check that we parsed in the right amount of column names + assertEquals(6, ds.getColumns().length); + + + + }catch(Exception ex){ + ex.printStackTrace(); + }finally{ + if (ds != null) ds.freeMemory(); + } + } + + + public static void main(String[] args) { + junit.textui.TestRunner.run( + DelimitedColumnNamesInFileTest.class); + } +} Deleted: trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/TestDelimitedColumnNamesInFile.java =================================================================== --- trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/TestDelimitedColumnNamesInFile.java 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/src/test/java/com/test/delim/columnInFile/TestDelimitedColumnNamesInFile.java 2006-10-16 13:44:42 UTC (rev 57) @@ -1,94 +0,0 @@ -/* - * Created on Feb 26, 2006 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package com.test.delim.columnInFile; - -import com.pz.reader.DataSet; - -import junit.framework.TestCase; - -/** - * @author zepernick - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class TestDelimitedColumnNamesInFile extends TestCase { - public TestDelimitedColumnNamesInFile( - String name) { - super(name); - } - - //tests to make sure we have 0 errors - public void testErrorCount() { - DataSet ds = null; - - try{ - DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile(); - - ds = testDelimted.getDsForTest(); - - //check that we had no errors - assertEquals(0, ds.getErrors().size()); - - - }catch(Exception ex){ - ex.printStackTrace(); - }finally{ - if (ds != null) ds.freeMemory(); - } - } - - //test to make sure we parsed the correct number - //of rows in the file - public void testRowCount(){ - DataSet ds = null; - - try{ - DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile(); - - ds = testDelimted.getDsForTest(); - - //check that we parsed in the right amount of rows - assertEquals(6, ds.rows.size()); - - - - }catch(Exception ex){ - ex.printStackTrace(); - }finally{ - if (ds != null) ds.freeMemory(); - } - } - - - //test to make sure we have the right number of column names from the file - public void testColumnNameCount(){ - DataSet ds = null; - - try{ - DelimitedColumnNamesInFile testDelimted = new DelimitedColumnNamesInFile(); - - ds = testDelimted.getDsForTest(); - - //check that we parsed in the right amount of column names - assertEquals(6, ds.getColumns().length); - - - - }catch(Exception ex){ - ex.printStackTrace(); - }finally{ - if (ds != null) ds.freeMemory(); - } - } - - - public static void main(String[] args) { - junit.textui.TestRunner.run( - TestDelimitedColumnNamesInFile.class); - } -} Deleted: trunk/PZFileReader/src/test/java/com/test/delim/multiLine/CSVPerformanceTest.java =================================================================== --- trunk/PZFileReader/src/test/java/com/test/delim/multiLine/CSVPerformanceTest.java 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/src/test/java/com/test/delim/multiLine/CSVPerformanceTest.java 2006-10-16 13:44:42 UTC (rev 57) @@ -1,100 +0,0 @@ -package com.test.delim.multiLine; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileReader; -import java.util.HashMap; -import java.util.Map; - -import com.pz.reader.DataError; -import com.pz.reader.LargeDataSet; - - - -/* - * Created on Dec 1, 2005 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ - -/** - * @author zepernick - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class CSVPerformanceTest { - - public static void main(String[] args) { - - LargeDataSet ds = null; - String[] colNames = null; - - try{ - - - - //delimited by a comma - //text qualified by double quotes - //ignore first record - long timeStarted = System.currentTimeMillis(); - ds = new LargeDataSet(new File("com/test/delim/multiLine/PEOPLE-CommaDelimitedWithQualifier.txt"),",","\"",false); - long timeFinished = System.currentTimeMillis(); - - - String timeMessage = ""; - - if (timeFinished - timeStarted < 1000){ - timeMessage = (timeFinished - timeStarted) + " Milleseconds..." ; - }else{ - timeMessage = ((timeFinished - timeStarted) / 1000) + " Seconds..."; - } - - System.out.println(""); - System.out.println("********FILE PARSED IN: " + timeMessage + " ******"); - Thread.sleep(2000); //sleep for a couple seconds to the message above can be read - - timeStarted = System.currentTimeMillis(); - - int times = 0; - while (ds.next()) { - colNames = ds.getColumns(); - for (int i = 0; i < colNames.length; i++){ - System.out.println("COLUMN NAME: " + colNames[i] + " VALUE: " + ds.getString(colNames[i])); - } - - System.out.println("==========================================================================="); - times++; - } - timeFinished = System.currentTimeMillis(); - - if (timeFinished - timeStarted < 1000){ - timeMessage = (timeFinished - timeStarted) + " Milleseconds..." ; - }else{ - timeMessage = ((timeFinished - timeStarted) / 1000) + " Seconds..."; - } - - System.out.println(""); - System.out.println("********Displayed Data To Console In: " + timeMessage + " ******"); - - - - if (ds.getErrors() != null && ds.getErrors().size() > 0){ - System.out.println("FOUND ERRORS IN FILE...."); - for (int i = 0; i < ds.getErrors().size(); i++){ - DataError de = (DataError)ds.getErrors().get(i); - System.out.println("Error: " + de.getErrorDesc() + " Line: " + de.getLineNo()); - } - } - - //clear out the DataSet object for the JVM to collect - ds.freeMemory(); - }catch(Exception ex){ - ex.printStackTrace(); - } - - - } - - -} Copied: trunk/PZFileReader/src/test/java/com/test/delim/multiLine/TestCSVPerformance.java (from rev 56, trunk/PZFileReader/src/test/java/com/test/delim/multiLine/CSVPerformanceTest.java) =================================================================== --- trunk/PZFileReader/src/test/java/com/test/delim/multiLine/TestCSVPerformance.java (rev 0) +++ trunk/PZFileReader/src/test/java/com/test/delim/multiLine/TestCSVPerformance.java 2006-10-16 13:44:42 UTC (rev 57) @@ -0,0 +1,96 @@ +package com.test.delim.multiLine; +import java.io.File; + +import com.pz.reader.DataError; +import com.pz.reader.LargeDataSet; + + + +/* + * Created on Dec 1, 2005 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ + +/** + * @author zepernick + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class TestCSVPerformance { + + public static void main(String[] args) { + + LargeDataSet ds = null; + String[] colNames = null; + + try{ + + + + //delimited by a comma + //text qualified by double quotes + //ignore first record + long timeStarted = System.currentTimeMillis(); + ds = new LargeDataSet(new File("com/test/delim/multiLine/PEOPLE-CommaDelimitedWithQualifier.txt"),",","\"",false); + long timeFinished = System.currentTimeMillis(); + + + String timeMessage = ""; + + if (timeFinished - timeStarted < 1000){ + timeMessage = (timeFinished - timeStarted) + " Milleseconds..." ; + }else{ + timeMessage = ((timeFinished - timeStarted) / 1000) + " Seconds..."; + } + + System.out.println(""); + System.out.println("********FILE PARSED IN: " + timeMessage + " ******"); + Thread.sleep(2000); //sleep for a couple seconds to the message above can be read + + timeStarted = System.currentTimeMillis(); + + int times = 0; + while (ds.next()) { + colNames = ds.getColumns(); + for (int i = 0; i < colNames.length; i++){ + System.out.println("COLUMN NAME: " + colNames[i] + " VALUE: " + ds.getString(colNames[i])); + } + + System.out.println("==========================================================================="); + times++; + } + timeFinished = System.currentTimeMillis(); + + if (timeFinished - timeStarted < 1000){ + timeMessage = (timeFinished - timeStarted) + " Milleseconds..." ; + }else{ + timeMessage = ((timeFinished - timeStarted) / 1000) + " Seconds..."; + } + + System.out.println(""); + System.out.println("********Displayed Data To Console In: " + timeMessage + " ******"); + + + + if (ds.getErrors() != null && ds.getErrors().size() > 0){ + System.out.println("FOUND ERRORS IN FILE...."); + for (int i = 0; i < ds.getErrors().size(); i++){ + DataError de = (DataError)ds.getErrors().get(i); + System.out.println("Error: " + de.getErrorDesc() + " Line: " + de.getLineNo()); + } + } + + //clear out the DataSet object for the JVM to collect + ds.freeMemory(); + }catch(Exception ex){ + ex.printStackTrace(); + } + + + } + + +} Modified: trunk/PZFileReader/src/test/java/com/test/delim/tab/TabDelimited.java =================================================================== --- trunk/PZFileReader/src/test/java/com/test/delim/tab/TabDelimited.java 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/src/test/java/com/test/delim/tab/TabDelimited.java 2006-10-16 13:44:42 UTC (rev 57) @@ -5,12 +5,9 @@ */ import java.io.File; -import java.io.FileInputStream; import com.pz.reader.DataError; import com.pz.reader.DataSet; -import com.pz.reader.ordering.OrderBy; -import com.pz.reader.ordering.OrderColumn; @@ -24,10 +21,9 @@ public static void main(String[] args)throws Exception{ DataSet ds = null; String[] colNames = null; - OrderBy orderby = null; File tmpFile = null; - - + + //delimited by a comma //text qualified by double quotes //ignore first record @@ -35,15 +31,15 @@ System.out.println("tmp file path: " + tmpFile); //ds = new DataSet(new FileInputStream(tmpFile),"\t","",true); ds = new DataSet(tmpFile,"\t","\"",true); - + //re order the data set by last name /* orderby = new OrderBy(); orderby.addOrderColumn(new OrderColumn("CITY",false)); orderby.addOrderColumn(new OrderColumn("LASTNAME",true)); ds.orderRows(orderby);*/ - + colNames = ds.getColumns(); - + while (ds.next()){ for (int i = 0; i < colNames.length; i++){ System.out.println("COLUMN NAME: " + colNames[i] + " VALUE: " + ds.getString(colNames[i])); @@ -51,8 +47,8 @@ System.out.println("==========================================================================="); } - - + + if (ds.getErrors() != null && ds.getErrors().size() > 0){ System.out.println("FOUND ERRORS IN FILE...."); for (int i = 0; i < ds.getErrors().size(); i++){ @@ -60,16 +56,16 @@ System.out.println("Error: " + de.getErrorDesc() + " Line: " + de.getLineNo()); } } - + //clear out the DataSet object for the JVM to collect ds.freeMemory(); - + } - - + + //used for Junit test - + public DataSet getDsForTest() throws Exception{ - return new DataSet(new File("com/test/delim/tab/PEOPLE-TabDelimitedWithQualifier.txt"),"\t","\"",true); + return new DataSet(new File("src/test/java/com/test/delim/tab/PEOPLE-TabDelimitedWithQualifier.txt"),"\t","\"",true); } } Copied: trunk/PZFileReader/src/test/java/com/test/delim/tab/TabDelimitedTest.java (from rev 56, trunk/PZFileReader/src/test/java/com/test/delim/tab/TestTabDelimited.java) =================================================================== --- trunk/PZFileReader/src/test/java/com/test/delim/tab/TabDelimitedTest.java (rev 0) +++ trunk/PZFileReader/src/test/java/com/test/delim/tab/TabDelimitedTest.java 2006-10-16 13:44:42 UTC (rev 57) @@ -0,0 +1,94 @@ +/* + * Created on Feb 26, 2006 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package com.test.delim.tab; + +import com.pz.reader.DataSet; + +import junit.framework.TestCase; + +/** + * @author zepernick + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class TabDelimitedTest extends TestCase { + public TabDelimitedTest( + String name) { + super(name); + } + + //tests to make sure we have 0 errors + public void testErrorCount() { + DataSet ds = null; + + try{ + TabDelimited testTab = new TabDelimited(); + + ds = testTab.getDsForTest(); + + //check that we had no errors + assertEquals(0, ds.getErrors().size()); + + + }catch(Exception ex){ + ex.printStackTrace(); + }finally{ + if (ds != null) ds.freeMemory(); + } + } + + //test to make sure we parsed the correct number + //of rows in the file + public void testRowCount(){ + DataSet ds = null; + + try{ + TabDelimited testTab = new TabDelimited(); + + ds = testTab.getDsForTest(); + + //check that we parsed in the right amount of rows + assertEquals(2, ds.rows.size()); + + + + }catch(Exception ex){ + ex.printStackTrace(); + }finally{ + if (ds != null) ds.freeMemory(); + } + } + + + //test to make sure we have the right number of column names from the file + public void testColumnNameCount(){ + DataSet ds = null; + + try{ + TabDelimited testTab = new TabDelimited(); + + ds = testTab.getDsForTest(); + + //check that we parsed in the right amount of column names + assertEquals(5, ds.getColumns().length); + + + + }catch(Exception ex){ + ex.printStackTrace(); + }finally{ + if (ds != null) ds.freeMemory(); + } + } + + + public static void main(String[] args) { + junit.textui.TestRunner.run( + TabDelimitedTest.class); + } +} Deleted: trunk/PZFileReader/src/test/java/com/test/delim/tab/TestTabDelimited.java =================================================================== --- trunk/PZFileReader/src/test/java/com/test/delim/tab/TestTabDelimited.java 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReader/src/test/java/com/test/delim/tab/TestTabDelimited.java 2006-10-16 13:44:42 UTC (rev 57) @@ -1,94 +0,0 @@ -/* - * Created on Feb 26, 2006 - * - * TODO To change the template for this generated file go to - * Window - Preferences - Java - Code Style - Code Templates - */ -package com.test.delim.tab; - -import com.pz.reader.DataSet; - -import junit.framework.TestCase; - -/** - * @author zepernick - * - * TODO To change the template for this generated type comment go to - * Window - Preferences - Java - Code Style - Code Templates - */ -public class TestTabDelimited extends TestCase { - public TestTabDelimited( - String name) { - super(name); - } - - //tests to make sure we have 0 errors - public void testErrorCount() { - DataSet ds = null; - - try{ - TabDelimited testTab = new TabDelimited(); - - ds = testTab.getDsForTest(); - - //check that we had no errors - assertEquals(0, ds.getErrors().size()); - - - }catch(Exception ex){ - ex.printStackTrace(); - }finally{ - if (ds != null) ds.freeMemory(); - } - } - - //test to make sure we parsed the correct number - //of rows in the file - public void testRowCount(){ - DataSet ds = null; - - try{ - TabDelimited testTab = new TabDelimited(); - - ds = testTab.getDsForTest(); - - //check that we parsed in the right amount of rows - assertEquals(2, ds.rows.size()); - - - - }catch(Exception ex){ - ex.printStackTrace(); - }finally{ - if (ds != null) ds.freeMemory(); - } - } - - - //test to make sure we have the right number of column names from the file - public void testColumnNameCount(){ - DataSet ds = null; - - try{ - TabDelimited testTab = new TabDelimited(); - - ds = testTab.getDsForTest(); - - //check that we parsed in the right amount of column names - assertEquals(5, ds.getColumns().length); - - - - }catch(Exception ex){ - ex.printStackTrace(); - }finally{ - if (ds != null) ds.freeMemory(); - } - } - - - public static void main(String[] args) { - junit.textui.TestRunner.run( - TestTabDelimited.class); - } -} Property changes on: trunk/PZFileReaderSamples ___________________________________________________________________ Name: svn:ignore + target Modified: trunk/PZFileReaderSamples/.classpath =================================================================== --- trunk/PZFileReaderSamples/.classpath 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReaderSamples/.classpath 2006-10-16 13:44:42 UTC (rev 57) @@ -1,7 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> + <classpath> - <classpathentry kind="src" path=""/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="src" path="/PZFileReader"/> - <classpathentry kind="output" path=""/> -</classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"></classpathentry> + <classpathentry excluding="" kind="src" path="src/main/java"></classpathentry> + <classpathentry path="MAVEN_REPO/com.pz.reader/jars/pzfilereader-2.2.0.jar" kind="var"></classpathentry> + <classpathentry path="MAVEN_REPO/jdom/jars/jdom-1.0.jar" kind="var"></classpathentry> + <classpathentry path="MAVEN_REPO/jexcelapi/jars/jxl-2.4.2.jar" kind="var"></classpathentry> + <classpathentry kind="output" path="target/classes"></classpathentry> +</classpath> \ No newline at end of file Modified: trunk/PZFileReaderSamples/.project =================================================================== --- trunk/PZFileReaderSamples/.project 2006-10-16 12:59:13 UTC (rev 56) +++ trunk/PZFileReaderSamples/.project 2006-10-16 13:44:42 UTC (rev 57) @@ -1,22 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> + <projectDescription> - <name>PZFileReaderSamples</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.ibm.sse.model.structuredbuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> + <name>pzfilereader-examples</name> + <comment>Simple Java delimited and fixed width file parser. Handles CSV, Excel CSV, Tab, Pipe delimiters, just to name a few. Maps column positions in the file to user friendly names via XML. See PZFileReader Feature List under News for complete feature list.</comment> + <projects></projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments></arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> \ No newline at end of file Added: trunk/PZFileReaderSamples/maven.xml =================================================================== --- trunk/PZFileReaderSamples/maven.xml (rev 0) +++ trunk/PZFileReaderSamples/maven.xml 2006-10-16 13:44:42 UTC (rev 57) @@ -0,0 +1,18 @@ +<?xml version="1.0"?> + +<!-- + /* + * ======================================================================== + * ObjectLab Financial Ltd, proud sponsor of PZFileReader. + * ======================================================================== + */ +--> + +<project xmlns:j="jelly:core" xmlns:core="jelly:core" + xmlns:maven="jelly:maven" xmlns:ant="jelly:ant" + xmlns:define="jelly:define" xmlns:doc="doc" xmlns:util="jelly:util" + xmlns:log="jelly:log"> + + <goal name="pz:build" prereqs="jar:install" /> + <goal name="pz:rebuild" prereqs="clean,kit:build" /> +</project> Added: trunk/PZFileReaderSamples/project.xml =================================================================== --- trunk/PZFileReaderSamples/project.xml (rev 0) +++ trunk/PZFileReaderSamples/project.xml 2006-10-16 13:44:42 UTC (rev 57) @@ -0,0 +1,65 @@ +<?xml version="1.0"?> + +<!-- + /* + * ======================================================================== + * $Id: project.xml 167 2006-09-12 15:11:43Z benoitx $ + * + * Copyright 2006 the original author or authors. + * + * 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. + * ======================================================================== + */ +--> + +<project> + <extend>../common-build/project.xml</extend> + <name>PZFileReader Examples</name> + <artifactId>pzfilereader-examples</artifactId> + <package>com.pz.reader</package> + <shortDescription>PZFileReader </shortDescription> + <description> + Simple Java delimited and fixed width file parser. Handles CSV, Excel CSV, Tab, Pipe delimiters, just to name a few. + Maps column positions in the file to user friendly names via XML. See PZFileReader Feature List under News for complete feature list. + </description> + <repository> + <connection> + scm:svn:https://svn.sourceforge.net/svnroot/pzfilereader/trunk/PZFileReader + </connection> + <developerConnection> + scm:svn:https://svn.sourceforge.net/svnroot/pzfilereader/trunk/PZFileReader + </developerConnection> + </repository> + <dependencies> + <dependency> + <groupId>com.pz.reader</groupId> + <artifactId>pzfilereader</artifactId> + <version>${pom.currentVersion}</version> + <type>jar</type> + </dependency> + </dependencies> + + <build> + <sourceDirectory>src/main/java</sourceDirectory> + <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory> + <unitTest> + <includes> + <include>**/*NOTest.java</include> + </includes> + <excludes> + <exclude>**/Abstract*.java</exclude> + </excludes> + </unitTest> + </build> + +</project> Added: trunk/PZFileReaderSamples/qalab.xml =================================================================== --- trunk/PZFileReaderSamples/qalab.xml (rev 0) +++ trunk/PZFileReaderSamples/qalab.xml 2006-10-16 13:44:42 UTC (rev 57) @@ -0,0 +1,148 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE qalab [<!ELEMENT qalab (summary,file*)> +<!ATTLIST qalab version CDATA #REQUIRED> +<!ELEMENT summary (summaryresult*)> +<!ELEMENT file (result+)> +<!ATTLIST file id ID #REQUIRED> +<!ATTLIST file path CDATA #REQUIRED> +<!ELEMENT result EMPTY> +<!ATTLIST result date CDATA #REQUIRED> +<!ATTLIST result statvalue CDATA #REQUIRED> +<!ATTLIST result type CDATA #REQUIRED> +<!ELEMENT summaryresult EMPTY> +<!ATTLIST summaryresult date CDATA #REQUIRED> +<!ATTLIST summaryresult statvalue CDATA #REQUIRED> +<!ATTLIST summaryresult filecount CDATA #REQUIRED> +<!ATTLIST summaryresult type CDATA #REQUIRED> +]> +<qalab version="1.1"> + <summary> + <summaryresult date="2006-10-16" filecount="30" statvalue="223" type="checkstyle"/> + <summaryresult date="2006-10-16" filecount="6" statvalue="12" type="pmd"/> + <summaryresult date="2006-10-16" filecount="4" statvalue="5" type="findbugs"/> + <summaryresult date="2006-10-16" filecount="4" statvalue="70" type="simian"/> + </summary> + <file id="com_pz_reader_examples_numericsanddates_package.html" path="com/pz/reader/examples/numericsanddates/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file id="com_pz_reader_examples_exporttoexcel_package.html" path="com/pz/reader/examples/exporttoexcel/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file id="com_pz_reader_examples_csvperformancetest_package.html" path="com/pz/reader/examples/csvperformancetest/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_largedataset_fixedlengthdynamiccolumns_package.html" path="com/pz/reader/examples/largedataset/fixedlengthdynamiccolumns/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file id="com_pz_reader_examples_lowlevelparse_package.html" path="com/pz/reader/examples/lowlevelparse/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_largedataset_largecsvperformancetest_package.html" path="com/pz/reader/examples/largedataset/largecsvperformancetest/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_multilinedelimitedrecord_package.html" path="com/pz/reader/examples/multilinedelimitedrecord/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_delimitedcolumnnamesinfile_package.html" path="com/pz/reader/examples/delimitedcolumnnamesinfile/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file id="com_pz_reader_examples_csvheaderandtrailer_package.html" path="com/pz/reader/examples/csvheaderandtrailer/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_largedataset_delimiteddynamiccolumns_package.html" path="com/pz/reader/examples/largedataset/delimiteddynamiccolumns/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_fixedlengthdynamiccolumns_package.html" path="com/pz/reader/examples/fixedlengthdynamiccolumns/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file id="com_pz_reader_examples_createsamplecsv_package.html" path="com/pz/reader/examples/createsamplecsv/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_delimiteddynamiccolumnswitherrors_package.html" path="com/pz/reader/examples/delimiteddynamiccolumnswitherrors/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_delimiteddynamiccolumns_package.html" path="com/pz/reader/examples/delimiteddynamiccolumns/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_fixedlengthheaderandtrailer_package.html" path="com/pz/reader/examples/fixedlengthheaderandtrailer/package.html"> + <result date="2006-10-16" statvalue="1" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_createsamplecsv_CSVTestFileCreator.java" path="com/pz/reader/examples/createsamplecsv/CSVTestFileCreator.java"> + <result date="2006-10-16" statvalue="9" type="checkstyle"/> + <result date="2006-10-16" statvalue="1" type="pmd"/> + <result date="2006-10-16" statvalue="1" type="findbugs"/> + </file> + <file + id="com_pz_reader_examples_csvheaderandtrailer_CSVHeaderAndTrailer.java" path="com/pz/reader/examples/csvheaderandtrailer/CSVHeaderAndTrailer.java"> + <result date="2006-10-16" statvalue="20" type="checkstyle"/> + <result date="2006-10-16" statvalue="3" type="pmd"/> + </file> + <file + id="com_pz_reader_examples_csvperformancetest_CSVPerformanceTest.java" path="com/pz/reader/examples/csvperformancetest/CSVPerformanceTest.java"> + <result date="2006-10-16" statvalue="57" type="checkstyle"/> + <result date="2006-10-16" statvalue="1" type="findbugs"/> + </file> + <file + id="com_pz_reader_examples_delimitedcolumnnamesinfile_DelimitedColumnNamesInFile.java" path="com/pz/reader/examples/delimitedcolumnnamesinfile/DelimitedColumnNamesInFile.java"> + <result date="2006-10-16" statvalue="5" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_delimiteddynamiccolumns_DelimitedWithPZMap.java" path="com/pz/reader/examples/delimiteddynamiccolumns/DelimitedWithPZMap.java"> + <result date="2006-10-16" statvalue="4" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_delimiteddynamiccolumnswitherrors_DelimitedWithPZMapErrors.java" path="com/pz/reader/examples/delimiteddynamiccolumnswitherrors/DelimitedWithPZMapErrors.java"> + <result date="2006-10-16" statvalue="5" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_exporttoexcel_DelimitedFileExportToExcel.java" path="com/pz/reader/examples/exporttoexcel/DelimitedFileExportToExcel.java"> + <result date="2006-10-16" statvalue="2" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_fixedlengthdynamiccolumns_FixedLengthWithPZMap.java" path="com/pz/reader/examples/fixedlengthdynamiccolumns/FixedLengthWithPZMap.java"> + <result date="2006-10-16" statvalue="3" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_fixedlengthheaderandtrailer_FixedLengthHeaderAndTrailer.java" path="com/pz/reader/examples/fixedlengthheaderandtrailer/FixedLengthHeaderAndTrailer.java"> + <result date="2006-10-16" statvalue="17" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_largedataset_delimiteddynamiccolumns_DelimitedWithPZMap.java" path="com/pz/reader/examples/largedataset/delimiteddynamiccolumns/DelimitedWithPZMap.java"> + <result date="2006-10-16" statvalue="9" type="checkstyle"/> + <result date="2006-10-16" statvalue="2" type="pmd"/> + </file> + <file + id="com_pz_reader_examples_largedataset_fixedlengthdynamiccolumns_FixedLengthWithPZMap.java" path="com/pz/reader/examples/largedataset/fixedlengthdynamiccolumns/FixedLengthWithPZMap.java"> + <result date="2006-10-16" statvalue="4" type="checkstyle"/> + </file> + <file + id="com_pz_reader_examples_largedataset_largecsvperformancetest_CSVLarge.java" path="com/pz/reader/examples/largedataset/largecsvperformancetest/CSVLarge.java"> + <result date="2006-10-16" statvalue="33" type="checkstyle"/> + <result date="2006-10-16" statvalue="1" type="findbugs"/> + </file> + <file id="com_pz_reader_examples_lowlevelparse_LowLevelParse.java" path="com/pz/reader/examples/lowlevelparse/LowLevelParse.java"> + <result date="2006-10-16" statvalue="24" type="checkstyle"/> + <result date="2006-10-16" statvalue="2" type="pmd"/> + <result date="2006-10-16" statvalue="2" type="findbugs"/> + </file> + <file + id="com_pz_reader_examples_multilinedelimitedrecord_DelimitedMultiLine.java" path="com/pz/reader/examples/multilinedelimitedrecord/DelimitedMultiLine.java"> + <result date="2006-10-16" statvalue="8" type="checkstyle"/> + <result date="2006-10-16" statvalue="2" type="pmd"/> + </file> + <file + id="com_pz_reader_examples_numericsanddates_NumericsAndDates.java" path="com/pz/reader/examples/numericsanddates/NumericsAndDates.java"> + <result date="2006-10-16" statvalue="8" type="checkstyle"/> + <result date="2006-10-16" statvalue="2" type="pmd"/> + </file> +</qalab> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |