zipdiff-cvs Mailing List for zipdiff (Page 2)
Status: Alpha
Brought to you by:
sullis
Menu
▾
▴
zipdiff-cvs — zipdiff CVS activity
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(50) |
Jul
(5) |
Aug
|
Sep
(1) |
Oct
|
Nov
|
Dec
|
|---|
|
From: Sean S. <su...@us...> - 2004-06-27 20:41:31
|
Update of /cvsroot/zipdiff/zipdiff/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2366/xdocs Modified Files: index.xml Log Message: Index: index.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/xdocs/index.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** index.xml 18 Apr 2004 01:44:12 -0000 1.14 --- index.xml 27 Jun 2004 20:41:23 -0000 1.15 *************** *** 26,30 **** <section name="Command line"> <source> ! java -jar zipdiff.jar -file1 foo.zip -file2 bar.zip [ -comparetimestamps ] [ -comparecrcvalues ] </source> </section> --- 26,30 ---- <section name="Command line"> <source> ! java -jar zipdiff.jar -file1 foo.zip -file2 bar.zip [ -outputfile diffs.html ] [ -comparetimestamps ] [ -comparecrcvalues ] </source> </section> |
|
From: Sean S. <su...@us...> - 2004-06-27 20:40:31
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2228 Modified Files: project.xml Log Message: Index: project.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/project.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** project.xml 19 Jun 2004 17:27:53 -0000 1.7 --- project.xml 27 Jun 2004 20:40:22 -0000 1.8 *************** *** 11,15 **** <name>zipdiff</name> <id>zipdiff</id> ! <currentVersion>0.2</currentVersion> <organization> <name>zipdiff.sourceforge.net</name> --- 11,15 ---- <name>zipdiff</name> <id>zipdiff</id> ! <currentVersion>0.3</currentVersion> <organization> <name>zipdiff.sourceforge.net</name> |
|
From: Sean S. <su...@us...> - 2004-06-27 20:40:00
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2076 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** build.xml 27 Jun 2004 18:16:22 -0000 1.11 --- build.xml 27 Jun 2004 20:39:51 -0000 1.12 *************** *** 16,20 **** <property name="javadoc.build.dir" value="${build.dir}/doc/api"/> <property name="classes.dir" value="${build.dir}/classes"/> ! <property name="distrib.name" value="zipdiff-0.2"/> <property name="distrib.jar.filename" value="zipdiff.jar"/> <property name="junit.jar" value="${basedir}/lib/junit.jar"/> --- 16,20 ---- <property name="javadoc.build.dir" value="${build.dir}/doc/api"/> <property name="classes.dir" value="${build.dir}/classes"/> ! <property name="distrib.name" value="zipdiff-0.3"/> <property name="distrib.jar.filename" value="zipdiff.jar"/> <property name="junit.jar" value="${basedir}/lib/junit.jar"/> |
|
From: Sean S. <su...@us...> - 2004-06-27 20:39:13
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1997/src/main/zipdiff/output Modified Files: HtmlBuilder.java Log Message: tweaked HTML formatting Index: HtmlBuilder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/HtmlBuilder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** HtmlBuilder.java 27 Jun 2004 20:30:49 -0000 1.4 --- HtmlBuilder.java 27 Jun 2004 20:39:05 -0000 1.5 *************** *** 33,37 **** pw.println(getStyleTag()); ! pw.print("File 1: "); String filename1 = d.getFilename1(); --- 33,37 ---- pw.println(getStyleTag()); ! pw.print("<p>First file: "); String filename1 = d.getFilename1(); *************** *** 42,46 **** pw.println("<br>"); ! pw.print("File 2: "); String filename2 = d.getFilename2(); --- 42,46 ---- pw.println("<br>"); ! pw.print("Second file: "); String filename2 = d.getFilename2(); *************** *** 50,54 **** } pw.print(filename2); ! pw.println("<br>"); writeAdded(pw, d.getAdded().keySet()); --- 50,54 ---- } pw.print(filename2); ! pw.println("</p>"); writeAdded(pw, d.getAdded().keySet()); *************** *** 80,84 **** pw.println("<TABLE CELLSPACING=\"1\" CELLPADDING=\"3\" WIDTH=\"100%\" BORDER=\"0\">"); pw.println("<tr>"); ! pw.println("<td class=\"diffs\" colspan=\"2\">" + name + "(" + s.size() + " entries)</td>"); pw.println("</tr>"); pw.println("<tr>"); --- 80,84 ---- pw.println("<TABLE CELLSPACING=\"1\" CELLPADDING=\"3\" WIDTH=\"100%\" BORDER=\"0\">"); pw.println("<tr>"); ! pw.println("<td class=\"diffs\" colspan=\"2\">" + name + " (" + s.size() + " entries)</td>"); pw.println("</tr>"); pw.println("<tr>"); |
|
From: Sean S. <su...@us...> - 2004-06-27 20:31:39
|
Update of /cvsroot/zipdiff/zipdiff/src/test/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv621/src/test/zipdiff Removed Files: package.html Log Message: --- package.html DELETED --- |
|
From: Sean S. <su...@us...> - 2004-06-27 20:31:19
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv590/src/main/zipdiff Modified Files: Main.java Log Message: improved command line options Index: Main.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/Main.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Main.java 27 Jun 2004 19:07:43 -0000 1.8 --- Main.java 27 Jun 2004 20:31:10 -0000 1.9 *************** *** 9,12 **** --- 9,14 ---- import java.util.Set; + import zipdiff.output.*; + import org.apache.commons.cli.*; *************** *** 24,27 **** --- 26,30 ---- private static final String OPTION_COMPARE_TIMESTAMPS = "comparetimestamps"; private static final String OPTION_IGNORE_CVS_FILES = "ignorecvsfiles"; + private static final String OPTION_OUTPUT_FILE = "outputfile"; private static final String OPTION_FILE1 = "file1"; private static final String OPTION_FILE2 = "file2"; *************** *** 49,52 **** --- 52,63 ---- file2.setRequired(true); + Option outputFileOption = + new Option( + OPTION_OUTPUT_FILE, + OPTION_OUTPUT_FILE, + true, + "output filename"); + outputFileOption.setRequired(false); + Option regex = new Option( *************** *** 87,90 **** --- 98,102 ---- options.addOption(exitWithError); options.addOption(dontShowDifferences); + options.addOption(outputFileOption); } *************** *** 109,112 **** --- 121,144 ---- } + private static void writeOutputFile(String filename, Differences d) + throws java.io.IOException + { + Builder builder = null; + if (filename.endsWith(".html")) + { + builder = new HtmlBuilder(); + } + else if (filename.endsWith(".xml")) + { + builder = new XmlBuilder(); + } + else + { + builder = new TextBuilder(); + } + builder.build(filename, d); + + } + /** * *************** *** 151,157 **** if (line.hasOption(OPTION_IGNORE_CVS_FILES)) { calc.setIgnoreCVSFiles(true); ! } ! else ! { calc.setIgnoreCVSFiles(false); } --- 183,187 ---- if (line.hasOption(OPTION_IGNORE_CVS_FILES)) { calc.setIgnoreCVSFiles(true); ! } else { calc.setIgnoreCVSFiles(false); } *************** *** 182,185 **** --- 212,224 ---- Differences d = calc.getDifferences(); + + + if (line.hasOption(OPTION_OUTPUT_FILE)) + { + String outputFilename = line.getOptionValue(OPTION_OUTPUT_FILE); + writeOutputFile(outputFilename, d); + } + + if (d.hasDifferences()) { if (!dontShowDifferences){ |
|
From: Sean S. <su...@us...> - 2004-06-27 20:30:59
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv495/src/main/zipdiff/output Modified Files: XmlBuilder.java TextBuilder.java Builder.java HtmlBuilder.java Log Message: improved output logic added abstract base class. Index: TextBuilder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/TextBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** TextBuilder.java 12 Apr 2004 19:24:14 -0000 1.1 --- TextBuilder.java 27 Jun 2004 20:30:49 -0000 1.2 *************** *** 15,19 **** * */ ! public class TextBuilder implements Builder { public void build(OutputStream out, Differences d) { PrintWriter pw = new PrintWriter(out); --- 15,19 ---- * */ ! public class TextBuilder extends AbstractBuilder { public void build(OutputStream out, Differences d) { PrintWriter pw = new PrintWriter(out); Index: XmlBuilder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/XmlBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** XmlBuilder.java 19 Jun 2004 20:28:17 -0000 1.3 --- XmlBuilder.java 27 Jun 2004 20:30:49 -0000 1.4 *************** *** 18,22 **** * */ ! public class XmlBuilder implements Builder { public void build(OutputStream out, Differences d) { --- 18,22 ---- * */ ! public class XmlBuilder extends AbstractBuilder { public void build(OutputStream out, Differences d) { Index: HtmlBuilder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/HtmlBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** HtmlBuilder.java 27 Jun 2004 19:45:27 -0000 1.3 --- HtmlBuilder.java 27 Jun 2004 20:30:49 -0000 1.4 *************** *** 19,23 **** * */ ! public class HtmlBuilder implements Builder { public void build(OutputStream out, Differences d) { --- 19,23 ---- * */ ! public class HtmlBuilder extends AbstractBuilder { public void build(OutputStream out, Differences d) { Index: Builder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/Builder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Builder.java 17 Apr 2004 05:35:19 -0000 1.2 --- Builder.java 27 Jun 2004 20:30:49 -0000 1.3 *************** *** 19,21 **** --- 19,22 ---- public interface Builder { public void build(OutputStream out, Differences d); + public void build(String filename, Differences d) throws java.io.IOException; } |
|
From: Sean S. <su...@us...> - 2004-06-27 20:30:46
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv471/src/main/zipdiff/output Added Files: AbstractBuilder.java Log Message: improved output logic added abstract base class. --- NEW FILE: AbstractBuilder.java --- /* * * */ package zipdiff.output; import zipdiff.Differences; import java.io.*; /** * * @author Sean C. Sullivan * * * */ public abstract class AbstractBuilder implements Builder { public void build(String filename, Differences d) throws IOException { FileOutputStream fos = null; fos = new FileOutputStream(filename); build(fos, d); } public abstract void build(OutputStream out, Differences d); } |
|
From: Sean S. <su...@us...> - 2004-06-27 19:45:37
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25872/src/main/zipdiff/output Modified Files: HtmlBuilder.java Log Message: improved HTML style and format Index: HtmlBuilder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/HtmlBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HtmlBuilder.java 9 Jun 2004 15:29:14 -0000 1.2 --- HtmlBuilder.java 27 Jun 2004 19:45:27 -0000 1.3 *************** *** 25,34 **** pw.println("<html>"); pw.println("<head>"); pw.println("<title>File differences</title>"); pw.println("</head>"); ! pw.println("<body>"); ! pw.print("File 1: "); String filename1 = d.getFilename1(); --- 25,36 ---- pw.println("<html>"); + pw.println("<META http-equiv=\"Content-Type\" content=\"text/html\">"); pw.println("<head>"); pw.println("<title>File differences</title>"); pw.println("</head>"); ! pw.println("<body text=\"#000000\" vlink=\"#000000\" alink=\"#000000\" link=\"#000000\">"); ! ! pw.println(getStyleTag()); pw.print("File 1: "); String filename1 = d.getFilename1(); *************** *** 64,107 **** protected void writeAdded(PrintWriter pw, Set added) { ! pw.println("<h3>Added</h3>"); ! if (added.size() > 0) { ! pw.println("<ul>"); ! Iterator iter = added.iterator(); ! while (iter.hasNext()) { ! String key = (String) iter.next(); ! pw.print("<li>"); ! pw.print(key); ! pw.println("</li>"); ! } ! pw.println("</ul>"); ! } else { ! pw.println("None"); ! } ! } protected void writeRemoved(PrintWriter pw, Set removed) { ! pw.println("<h3>Removed</h3>"); ! if (removed.size() > 0) { ! pw.println("<ul>"); ! Iterator iter = removed.iterator(); ! while (iter.hasNext()) { ! String key = (String) iter.next(); ! pw.print("<li>"); ! pw.print(key); ! pw.println("</li>"); ! } ! pw.println("</ul>"); ! } else { ! pw.println("None"); ! } ! } protected void writeChanged(PrintWriter pw, Set changed) { ! pw.println("<h3>Changed</h3>"); ! if (changed.size() > 0) { pw.println("<ul>"); ! Iterator iter = changed.iterator(); while (iter.hasNext()) { String key = (String) iter.next(); --- 66,92 ---- protected void writeAdded(PrintWriter pw, Set added) { ! writeDiffSet(pw, "Added", added); } protected void writeRemoved(PrintWriter pw, Set removed) { ! writeDiffSet(pw, "Removed", removed); } protected void writeChanged(PrintWriter pw, Set changed) { ! writeDiffSet(pw, "Changed", changed); ! } ! ! protected void writeDiffSet(PrintWriter pw, String name, Set s) { ! pw.println("<TABLE CELLSPACING=\"1\" CELLPADDING=\"3\" WIDTH=\"100%\" BORDER=\"0\">"); ! pw.println("<tr>"); ! pw.println("<td class=\"diffs\" colspan=\"2\">" + name + "(" + s.size() + " entries)</td>"); ! pw.println("</tr>"); ! pw.println("<tr>"); ! pw.println("<td width=\"20\">"); ! pw.println("</td>"); ! pw.println("<td>"); ! if (s.size() > 0) { pw.println("<ul>"); ! Iterator iter = s.iterator(); while (iter.hasNext()) { String key = (String) iter.next(); *************** *** 111,117 **** } pw.println("</ul>"); - } else { - pw.println("None"); } } --- 96,131 ---- } pw.println("</ul>"); } + pw.println("</td>"); + pw.println("</tr>"); + pw.println("</table>"); + + } + + protected String getStyleTag() + { + StringBuffer sb = new StringBuffer(); + + sb.append("<style type=\"text/css\">"); + sb.append(" body, p { "); + sb.append(" font-family: verdana,arial,helvetica; "); + sb.append(" font-size: 80%; "); + sb.append(" color:#000000; "); + sb.append(" } \n"); + sb.append(" .diffs { \n"); + sb.append(" font-family: verdana,arial,helvetica; \n"); + sb.append(" font-size: 80%; \n"); + sb.append(" font-weight: bold; \n"); + sb.append(" text-align:left; \n"); + sb.append(" background:#a6caf0; \n"); + sb.append(" } \n"); + sb.append(" tr, td { \n"); + sb.append(" font-family: verdana,arial,helvetica; \n"); + sb.append(" font-size: 80%; \n"); + sb.append(" background:#eeeee0; \n"); + sb.append(" } \n"); + sb.append(" </style>\n"); + + return sb.toString(); } |
|
From: Sean S. <su...@us...> - 2004-06-27 19:10:22
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19243/src/main/zipdiff/ant Modified Files: ZipDiffTask.java Log Message: Index: ZipDiffTask.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/ant/ZipDiffTask.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ZipDiffTask.java 9 Jun 2004 15:29:14 -0000 1.4 --- ZipDiffTask.java 27 Jun 2004 19:10:13 -0000 1.5 *************** *** 27,30 **** --- 27,31 ---- private String destfile; private boolean ignoreTimestamps = false; + private boolean ignoreCVSFiles = false; private boolean compareCRCValues = true; *************** *** 45,48 **** --- 46,58 ---- } + public void setIgnoreCVSFiles(boolean b) + { + ignoreCVSFiles = b; + } + + public boolean getIgnoreCVSFiles() { + return ignoreCVSFiles; + } + public void setCompareCRCValues(boolean b) { compareCRCValues = b; *************** *** 121,124 **** --- 131,135 ---- calculator.setCompareCRCValues(getCompareCRCValues()); calculator.setIgnoreTimestamps(getIgnoreTimestamps()); + calculator.setIgnoreCVSFiles(getIgnoreCVSFiles()); // todo : calculator.setFilenamesToIgnore(patterns); |
|
From: Sean S. <su...@us...> - 2004-06-27 19:07:51
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18816/src/main/zipdiff Modified Files: Main.java Log Message: Index: Main.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/Main.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Main.java 27 Jun 2004 19:06:52 -0000 1.7 --- Main.java 27 Jun 2004 19:07:43 -0000 1.8 *************** *** 110,115 **** /** ! * The command line interface to Zipdiff Utility * @param args The command line parameters */ public static void main(String[] args) { --- 110,118 ---- /** ! * ! * The command line interface to zipdiff utility ! * * @param args The command line parameters + * */ public static void main(String[] args) { |
|
From: Sean S. <su...@us...> - 2004-06-27 19:07:05
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18608/src/main/zipdiff Modified Files: Main.java Log Message: Index: Main.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/Main.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Main.java 9 Jun 2004 15:26:19 -0000 1.6 --- Main.java 27 Jun 2004 19:06:52 -0000 1.7 *************** *** 13,17 **** /** * ! * Provides a command line interface to Zipdiff * * @author Sean C. Sullivan, J.Stewart --- 13,17 ---- /** * ! * Provides a command line interface to zipdiff * * @author Sean C. Sullivan, J.Stewart *************** *** 23,26 **** --- 23,27 ---- private static final String OPTION_COMPARE_CRC_VALUES = "comparecrcvalues"; private static final String OPTION_COMPARE_TIMESTAMPS = "comparetimestamps"; + private static final String OPTION_IGNORE_CVS_FILES = "ignorecvsfiles"; private static final String OPTION_FILE1 = "file1"; private static final String OPTION_FILE2 = "file2"; *************** *** 54,59 **** true, "regular expression to match files to exclude e.g. (?i)meta-inf.*"); ! file2.setRequired(false); Option exitWithError = new Option( --- 55,68 ---- true, "regular expression to match files to exclude e.g. (?i)meta-inf.*"); ! regex.setRequired(false); + Option ignoreCVSFilesOption = + new Option( + OPTION_IGNORE_CVS_FILES, + OPTION_IGNORE_CVS_FILES, + false, + "ignore CVS files"); + ignoreCVSFilesOption.setRequired(false); + Option exitWithError = new Option( *************** *** 75,78 **** --- 84,88 ---- options.addOption(file2); options.addOption(regex); + options.addOption(ignoreCVSFilesOption); options.addOption(exitWithError); options.addOption(dontShowDifferences); *************** *** 136,139 **** --- 146,157 ---- } + if (line.hasOption(OPTION_IGNORE_CVS_FILES)) { + calc.setIgnoreCVSFiles(true); + } + else + { + calc.setIgnoreCVSFiles(false); + } + if (line.hasOption(OPTION_COMPARE_TIMESTAMPS)) { calc.setIgnoreTimestamps(false); *************** *** 176,180 **** System.err.println(pex.getMessage()); HelpFormatter formatter = new HelpFormatter(); ! formatter.printHelp("zipdiff [options] ", options); System.exit(EXITCODE_ERROR); } catch (Exception ex) { --- 194,198 ---- System.err.println(pex.getMessage()); HelpFormatter formatter = new HelpFormatter(); ! formatter.printHelp("zipdiff.Main [options] ", options); System.exit(EXITCODE_ERROR); } catch (Exception ex) { |
|
From: Sean S. <su...@us...> - 2004-06-27 19:06:50
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18536/src/main/zipdiff Modified Files: DifferenceCalculator.java Log Message: Index: DifferenceCalculator.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/DifferenceCalculator.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DifferenceCalculator.java 12 Jun 2004 14:57:24 -0000 1.3 --- DifferenceCalculator.java 27 Jun 2004 19:06:41 -0000 1.4 *************** *** 24,27 **** --- 24,28 ---- private ZipFile file2; private boolean ignoreTimestamps = false; + private boolean ignoreCVSFiles = false; private boolean compareCRCValues = true; private Pattern filesToIgnorePattern; *************** *** 99,108 **** /** * returns true if fileToIgnorePattern matches the filename given. * @param filename The name of the file to check to see if it should be ignored. * @return true if the file should be ignored. */ ! protected boolean ignoreThisFile(String filename) { if (filename == null) { return false; } else if (filesToIgnorePattern == null) { return false; --- 100,113 ---- /** * returns true if fileToIgnorePattern matches the filename given. + * @param filepath * @param filename The name of the file to check to see if it should be ignored. * @return true if the file should be ignored. */ ! protected boolean ignoreThisFile(String filepath, String filename) { if (filename == null) { return false; + } + else if (isCVSFile(filepath, filename) && (ignoreCVSFiles() ) ) { + return true; } else if (filesToIgnorePattern == null) { return false; *************** *** 117,120 **** --- 122,140 ---- } + protected boolean isCVSFile(String filepath, String filename) + { + if (filename == null) + { + return false; + } + else if ( (filepath.indexOf("CVS") != -1) || (filename.equals("CVS"))) + { + return true; + } + else + { + return false; + } + } /** * Ensure that the comparison checks against the CRCs of the entries. *************** *** 177,181 **** */ protected void processZipEntry(String prefix, ZipEntry zipEntry, InputStream is, Map zipEntryMap) throws IOException { ! if (ignoreThisFile(zipEntry.getName())) { logger.log(Level.FINE, "ignoring file: " + zipEntry.getName()); } else { --- 197,201 ---- */ protected void processZipEntry(String prefix, ZipEntry zipEntry, InputStream is, Map zipEntryMap) throws IOException { ! if (ignoreThisFile(prefix, zipEntry.getName())) { logger.log(Level.FINE, "ignoring file: " + zipEntry.getName()); } else { *************** *** 284,288 **** } } else { ! throw new IllegalStateException("todo"); } } --- 304,308 ---- } } else { ! throw new IllegalStateException("unexpected state"); } } *************** *** 325,328 **** --- 345,358 ---- } + public boolean ignoreCVSFiles() + { + return ignoreCVSFiles; + } + + public void setIgnoreCVSFiles(boolean b) + { + ignoreCVSFiles = b; + } + /** * |
|
From: Sean S. <su...@us...> - 2004-06-27 18:16:33
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9298 Modified Files: build.xml Log Message: updated comments Index: build.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** build.xml 19 Jun 2004 20:45:26 -0000 1.10 --- build.xml 27 Jun 2004 18:16:22 -0000 1.11 *************** *** 1,6 **** <!-- $Header$ --> <!-- ###################################################### --> ! <!-- This is an Ant build file for zipdiff see --> ! <!-- sourceforge.net --> <!-- For details, see http://ant.apache.org/ --> <!-- ###################################################### --> --- 1,6 ---- <!-- $Header$ --> <!-- ###################################################### --> ! <!-- This is an Ant build file --> ! <!-- --> <!-- For details, see http://ant.apache.org/ --> <!-- ###################################################### --> |
|
From: Sean S. <su...@us...> - 2004-06-19 20:45:35
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19954 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/build.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** build.xml 19 Jun 2004 20:39:07 -0000 1.9 --- build.xml 19 Jun 2004 20:45:26 -0000 1.10 *************** *** 94,97 **** --- 94,99 ---- <zipfileset dir="${build.dir}" prefix="${distrib.name}/build"> <include name="*.jar" /> + <exclude name="ant*.jar" /> + <exclude name="junit*.jar" /> </zipfileset> <zipfileset dir="${src.dir}" prefix="${distrib.name}/src"> |
|
From: Sean S. <su...@us...> - 2004-06-19 20:39:15
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14578 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/build.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.xml 19 Jun 2004 20:35:08 -0000 1.8 --- build.xml 19 Jun 2004 20:39:07 -0000 1.9 *************** *** 89,93 **** </target> ! <target name="zip-distrib" depends="init, project.jarfile, copylibraries"> <delete file="${build.dir}/${distrib.name}.zip" /> <zip destfile="${build.dir}/${distrib.name}.zip"> --- 89,93 ---- </target> ! <target name="distrib-archive" depends="init, project.jarfile, copylibraries, docs"> <delete file="${build.dir}/${distrib.name}.zip" /> <zip destfile="${build.dir}/${distrib.name}.zip"> *************** *** 141,145 **** </target> ! <target name="distrib" depends="init, zip-distrib"> </target> --- 141,145 ---- </target> ! <target name="distrib" depends="init, distrib-archive"> </target> |
|
From: Sean S. <su...@us...> - 2004-06-19 20:35:17
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9594 Modified Files: build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/build.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** build.xml 9 Jun 2004 15:26:19 -0000 1.7 --- build.xml 19 Jun 2004 20:35:08 -0000 1.8 *************** *** 18,22 **** <property name="distrib.name" value="zipdiff-0.2"/> <property name="distrib.jar.filename" value="zipdiff.jar"/> ! <property name="junit.jar" value="${basedir}/lib/junit-3.8.1.jar"/> <property name="junit.reports.dir" value="${basedir}/junit-reports"/> --- 18,22 ---- <property name="distrib.name" value="zipdiff-0.2"/> <property name="distrib.jar.filename" value="zipdiff.jar"/> ! <property name="junit.jar" value="${basedir}/lib/junit.jar"/> <property name="junit.reports.dir" value="${basedir}/junit-reports"/> |
|
From: Sean S. <su...@us...> - 2004-06-19 20:34:11
|
Update of /cvsroot/zipdiff/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7846 Modified Files: .classpath Log Message: Index: .classpath =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/.classpath,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** .classpath 19 Jun 2004 19:59:39 -0000 1.6 --- .classpath 19 Jun 2004 20:34:02 -0000 1.7 *************** *** 6,9 **** --- 6,10 ---- <classpathentry kind="lib" path="lib/commons-cli-1.0.jar"/> <classpathentry kind="lib" path="lib/junit.jar"/> + <classpathentry kind="lib" path="lib/ant.jar"/> <classpathentry kind="output" path="bin"/> </classpath> |
|
From: Sean S. <su...@us...> - 2004-06-19 20:33:24
|
Update of /cvsroot/zipdiff/zipdiff/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6149/lib Added Files: ant.jar Log Message: Apache Ant 1.6.1 http://ant.apache.org --- NEW FILE: ant.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Sean S. <su...@us...> - 2004-06-19 20:30:04
|
Update of /cvsroot/zipdiff/zipdiff/src/test/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2787/src/test/zipdiff Removed Files: AbstractTestCase.java Log Message: bye bye --- AbstractTestCase.java DELETED --- |
|
From: Sean S. <su...@us...> - 2004-06-19 20:28:42
|
Update of /cvsroot/zipdiff/zipdiff/src/test/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1140/src/test/zipdiff Modified Files: DifferenceCalculatorTest.java Log Message: Index: DifferenceCalculatorTest.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/test/zipdiff/DifferenceCalculatorTest.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DifferenceCalculatorTest.java 19 Jun 2004 20:21:59 -0000 1.5 --- DifferenceCalculatorTest.java 19 Jun 2004 20:28:28 -0000 1.6 *************** *** 1,9 **** /* ! * Created on Jun 9, 2004 * */ package zipdiff; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileNotFoundException; --- 1,11 ---- /* ! * * */ + package zipdiff; import java.io.BufferedOutputStream; + import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileNotFoundException; *************** *** 16,19 **** --- 18,25 ---- import zipdiff.DifferenceCalculator; import zipdiff.Differences; + import zipdiff.output.Builder; + import zipdiff.output.HtmlBuilder; + import zipdiff.output.TextBuilder; + import zipdiff.output.XmlBuilder; import junit.framework.TestCase; *************** *** 58,69 **** } - /** - * Constructor for DifferenceCalculatorTest. - * @param arg0 - */ - public DifferenceCalculatorTest(String arg0) { - super(arg0); - } - /** * Create a jar with only one entry in it. That entry being A --- 64,67 ---- *************** *** 192,195 **** --- 190,196 ---- Map changedEntries = differences.getChanged(); assertTrue(changedEntries.size() == 0); + + exerciseOutputBuilders(differences); + } *************** *** 209,212 **** --- 210,215 ---- Map changedEntries = differences.getChanged(); assertTrue(changedEntries.size() == 0); + + exerciseOutputBuilders(differences); } *************** *** 228,232 **** --- 231,239 ---- Map changedEntries = differences.getChanged(); assertTrue(changedEntries.size() == 0); + + exerciseOutputBuilders(differences); + } + /* *************** *** 247,251 **** --- 254,305 ---- Map changedEntries = differences.getChanged(); assertTrue(changedEntries.containsKey("A")); + + exerciseOutputBuilders(differences); + + } + + private void exerciseHtmlBuilder(Differences differences) + { + assertNotNull(differences); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + Builder b = new HtmlBuilder(); + b.build(baos, differences); + + assertTrue(baos.size() > 0); + } + + private void exerciseXmlBuilder(Differences differences) + { + assertNotNull(differences); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + Builder b = new XmlBuilder(); + b.build(baos, differences); + + assertTrue(baos.size() > 0); + } + + private void exerciseTextBuilder(Differences differences) + { + assertNotNull(differences); + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + + Builder b = new TextBuilder(); + b.build(baos, differences); + + assertTrue(baos.size() > 0); } + private void exerciseOutputBuilders(Differences differences) + { + assertNotNull(differences); + exerciseHtmlBuilder(differences); + exerciseXmlBuilder(differences); + exerciseTextBuilder(differences); + } + } |
|
From: Sean S. <su...@us...> - 2004-06-19 20:28:28
|
Update of /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv969/src/main/zipdiff/output Modified Files: XmlBuilder.java Log Message: Index: XmlBuilder.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/main/zipdiff/output/XmlBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** XmlBuilder.java 9 Jun 2004 15:29:14 -0000 1.2 --- XmlBuilder.java 19 Jun 2004 20:28:17 -0000 1.3 *************** *** 49,52 **** --- 49,53 ---- pw.println("</zipdiff>"); + pw.flush(); } |
|
From: Sean S. <su...@us...> - 2004-06-19 20:22:10
|
Update of /cvsroot/zipdiff/zipdiff/src/test/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27295/src/test/zipdiff Modified Files: DifferenceCalculatorTest.java Log Message: Index: DifferenceCalculatorTest.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/test/zipdiff/DifferenceCalculatorTest.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DifferenceCalculatorTest.java 19 Jun 2004 20:14:34 -0000 1.4 --- DifferenceCalculatorTest.java 19 Jun 2004 20:21:59 -0000 1.5 *************** *** 5,15 **** --- 5,21 ---- package zipdiff; + import java.io.BufferedOutputStream; + import java.io.File; import java.io.FileNotFoundException; + import java.io.FileOutputStream; import java.io.IOException; import java.util.Map; + import java.util.jar.JarEntry; + import java.util.jar.JarOutputStream; import zipdiff.DifferenceCalculator; import zipdiff.Differences; + import junit.framework.TestCase; /** *************** *** 18,22 **** * @author jastewart */ ! public class DifferenceCalculatorTest extends AbstractTestCase { --- 24,178 ---- * @author jastewart */ ! public class DifferenceCalculatorTest extends TestCase { ! private static String ENTRYA = "A"; ! private static String ENTRYB = "B"; ! private static String ENTRYC = "C"; ! public static final String SYSTEM_TMP_DIR_PROPERTY = "java.io.tmpdir"; ! public static final String TEST_DIR_POSTFIX = File.separator + "UnitTestsDifferenceCalculatorTest"; ! private static String testDirPathName; ! // naming convention The Capital letter denotes the entry so A will be the same as A ! // OneEntry denotes that the jar has one entry ! private static String testJarOneEmpty; ! private static String testJarTwoEmpty; ! private static String testJarOneEntryA1Filename; ! private static String testJarOneEntryA2Filename; ! private static String testJarOneEntryB1Filename; ! private static String testJarTwoEntryAB1Filename; ! private static String testJarTwoEntryAC2Filename; ! private static String testJarOneEntryAContentsChangedFilename; ! { ! testDirPathName = ! System.getProperty(System.getProperty(SYSTEM_TMP_DIR_PROPERTY)); ! if(testDirPathName == null) { ! testDirPathName = File.separator + "temp" + TEST_DIR_POSTFIX; ! } ! testJarOneEmpty = testDirPathName + File.separator + "testJarOneEmpty.jar"; ! testJarTwoEmpty = testDirPathName + File.separator + "testJarTwoEmpty.jar"; ! testJarOneEntryA1Filename = testDirPathName + File.separator + "testJarOneEntryA1Filename.jar"; ! testJarOneEntryA2Filename = testDirPathName + File.separator + "testJarOneEntryA2Filename.jar"; ! testJarOneEntryB1Filename = testDirPathName + File.separator + "testJarOneEntryB1Filename.jar"; ! testJarTwoEntryAB1Filename = testDirPathName + File.separator + "testJarTwoEntryAB1Filename.jar"; ! testJarTwoEntryAB1Filename = testDirPathName + File.separator + "testJarTwoEntryAB1Filename.jar"; ! testJarTwoEntryAC2Filename = testDirPathName + File.separator + "testJarTwoEntryAC2Filename.jar"; ! testJarOneEntryAContentsChangedFilename = testDirPathName + File.separator + "testJarOneEntryAContentsChangedFilename.jar"; ! } ! ! /** ! * Constructor for DifferenceCalculatorTest. ! * @param arg0 ! */ ! public DifferenceCalculatorTest(String arg0) { ! super(arg0); ! } ! ! /** ! * Create a jar with only one entry in it. That entry being A ! * @throws FileNotFoundException ! * @throws IOException ! */ ! public void createJarOneEntryA1() throws FileNotFoundException, IOException { ! // create a jar file with no duplicates ! File testDir = new File(testDirPathName); ! testDir.mkdirs(); ! JarOutputStream testJarOS = ! new JarOutputStream( ! new BufferedOutputStream( ! new FileOutputStream(testJarOneEntryA1Filename))); ! ! // ad an entry ! JarEntry entry1 = new JarEntry(ENTRYA); ! testJarOS.putNextEntry(entry1); ! byte data1[] = new byte[2048]; ! for (int i=0; i < data1.length; i++) { ! data1[i]='a'; ! } ! testJarOS.write(data1); ! ! testJarOS.flush(); ! testJarOS.close(); ! } ! ! /** ! * Create a jar with only one entry in it. That entry being A ! * @throws FileNotFoundException ! * @throws IOException ! */ ! public void createJarOneEntryA2() throws FileNotFoundException, IOException { ! // create a jar file with no duplicates ! File testDir = new File(testDirPathName); ! testDir.mkdirs(); ! JarOutputStream testJarOS = ! new JarOutputStream( ! new BufferedOutputStream( ! new FileOutputStream(testJarOneEntryA2Filename))); ! ! // ad an entry ! JarEntry entry1 = new JarEntry(ENTRYA); ! testJarOS.putNextEntry(entry1); ! byte data1[] = new byte[2048]; ! for (int i=0; i < data1.length; i++) { ! data1[i]='a'; ! } ! testJarOS.write(data1); ! ! testJarOS.flush(); ! testJarOS.close(); ! } ! ! /** ! * Create a jar with only one entry in it. That entry being A ! * @throws FileNotFoundException ! * @throws IOException ! */ ! public void createJarOneEntryAContentsChanged() throws FileNotFoundException, IOException { ! // create a jar file with no duplicates ! File testDir = new File(testDirPathName); ! testDir.mkdirs(); ! JarOutputStream testJarOS = ! new JarOutputStream( ! new BufferedOutputStream( ! new FileOutputStream(testJarOneEntryAContentsChangedFilename))); ! ! // ad an entry ! JarEntry entry1 = new JarEntry(ENTRYA); ! testJarOS.putNextEntry(entry1); ! byte data1[] = new byte[2048]; ! for (int i=0; i < data1.length; i++) { ! data1[i]='a'; ! } ! // set a different content so that it will come up as changed ! data1[data1.length-1] = 'b'; ! testJarOS.write(data1); ! ! testJarOS.flush(); ! testJarOS.close(); ! } ! ! /** ! * Create a jar with only one entry in it. That entry being A ! * @throws FileNotFoundException ! * @throws IOException ! */ ! public void createJarOneEntryB1() throws FileNotFoundException, IOException { ! // create a jar file with no duplicates ! File testDir = new File(testDirPathName); ! testDir.mkdirs(); ! JarOutputStream testJarOS = ! new JarOutputStream( ! new BufferedOutputStream( ! new FileOutputStream(testJarOneEntryB1Filename))); ! ! // ad an entry ! JarEntry entry1 = new JarEntry(ENTRYB); ! testJarOS.putNextEntry(entry1); ! byte data1[] = new byte[2048]; ! for (int i=0; i < data1.length; i++) { ! data1[i]='b'; ! } ! testJarOS.write(data1); ! ! testJarOS.flush(); ! testJarOS.close(); ! } *************** *** 36,40 **** Map changedEntries = differences.getChanged(); assertTrue(changedEntries.size() == 0); - } --- 192,195 ---- *************** *** 94,97 **** } - } --- 249,251 ---- |
|
From: Sean S. <su...@us...> - 2004-06-19 20:14:42
|
Update of /cvsroot/zipdiff/zipdiff/src/test/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18735/src/test/zipdiff Modified Files: DifferenceCalculatorTest.java Log Message: Index: DifferenceCalculatorTest.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/test/zipdiff/DifferenceCalculatorTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DifferenceCalculatorTest.java 19 Jun 2004 20:13:53 -0000 1.3 --- DifferenceCalculatorTest.java 19 Jun 2004 20:14:34 -0000 1.4 *************** *** 5,21 **** package zipdiff; - import java.io.BufferedOutputStream; - import java.io.File; import java.io.FileNotFoundException; - import java.io.FileOutputStream; import java.io.IOException; import java.util.Map; - import java.util.jar.JarEntry; - import java.util.jar.JarOutputStream; import zipdiff.DifferenceCalculator; import zipdiff.Differences; - import junit.framework.TestCase; /** --- 5,15 ---- |
|
From: Sean S. <su...@us...> - 2004-06-19 20:14:03
|
Update of /cvsroot/zipdiff/zipdiff/src/test/zipdiff In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17992/src/test/zipdiff Modified Files: DifferenceCalculatorTest.java Added Files: AbstractTestCase.java Log Message: --- NEW FILE: AbstractTestCase.java --- /* * Created on Jun 9, 2004 * */ package zipdiff; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.jar.JarEntry; import java.util.jar.JarOutputStream; import junit.framework.TestCase; /** * * * @author jastewart * @author Sean C. Sullivan * */ abstract class AbstractTestCase extends TestCase { protected static String ENTRYA = "A"; protected static String ENTRYB = "B"; protected static String ENTRYC = "C"; public static final String SYSTEM_TMP_DIR_PROPERTY = "java.io.tmpdir"; public static final String TEST_DIR_POSTFIX = File.separator + "UnitTestsDifferenceCalculatorTest"; protected static String testDirPathName; // naming convention The Capital letter denotes the entry so A will be the same as A // OneEntry denotes that the jar has one entry protected static String testJarOneEmpty; protected static String testJarTwoEmpty; protected static String testJarOneEntryA1Filename; protected static String testJarOneEntryA2Filename; protected static String testJarOneEntryB1Filename; protected static String testJarTwoEntryAB1Filename; protected static String testJarTwoEntryAC2Filename; protected static String testJarOneEntryAContentsChangedFilename; // // static initializer // static { testDirPathName = System.getProperty(System.getProperty(SYSTEM_TMP_DIR_PROPERTY)); if(testDirPathName == null) { testDirPathName = File.separator + "temp" + TEST_DIR_POSTFIX; } testJarOneEmpty = testDirPathName + File.separator + "testJarOneEmpty.jar"; testJarTwoEmpty = testDirPathName + File.separator + "testJarTwoEmpty.jar"; testJarOneEntryA1Filename = testDirPathName + File.separator + "testJarOneEntryA1Filename.jar"; testJarOneEntryA2Filename = testDirPathName + File.separator + "testJarOneEntryA2Filename.jar"; testJarOneEntryB1Filename = testDirPathName + File.separator + "testJarOneEntryB1Filename.jar"; testJarTwoEntryAB1Filename = testDirPathName + File.separator + "testJarTwoEntryAB1Filename.jar"; testJarTwoEntryAB1Filename = testDirPathName + File.separator + "testJarTwoEntryAB1Filename.jar"; testJarTwoEntryAC2Filename = testDirPathName + File.separator + "testJarTwoEntryAC2Filename.jar"; testJarOneEntryAContentsChangedFilename = testDirPathName + File.separator + "testJarOneEntryAContentsChangedFilename.jar"; } /** * Create a jar with only one entry in it. That entry being A * @throws FileNotFoundException * @throws IOException */ protected void createJarOneEntryA1() throws FileNotFoundException, IOException { // create a jar file with no duplicates File testDir = new File(testDirPathName); testDir.mkdirs(); JarOutputStream testJarOS = new JarOutputStream( new BufferedOutputStream( new FileOutputStream(testJarOneEntryA1Filename))); // ad an entry JarEntry entry1 = new JarEntry(ENTRYA); testJarOS.putNextEntry(entry1); byte data1[] = new byte[2048]; for (int i=0; i < data1.length; i++) { data1[i]='a'; } testJarOS.write(data1); testJarOS.flush(); testJarOS.close(); } /** * Create a jar with only one entry in it. That entry being A * @throws FileNotFoundException * @throws IOException */ protected void createJarOneEntryA2() throws FileNotFoundException, IOException { // create a jar file with no duplicates File testDir = new File(testDirPathName); testDir.mkdirs(); JarOutputStream testJarOS = new JarOutputStream( new BufferedOutputStream( new FileOutputStream(testJarOneEntryA2Filename))); // ad an entry JarEntry entry1 = new JarEntry(ENTRYA); testJarOS.putNextEntry(entry1); byte data1[] = new byte[2048]; for (int i=0; i < data1.length; i++) { data1[i]='a'; } testJarOS.write(data1); testJarOS.flush(); testJarOS.close(); } /** * Create a jar with only one entry in it. That entry being A * @throws FileNotFoundException * @throws IOException */ protected void createJarOneEntryAContentsChanged() throws FileNotFoundException, IOException { // create a jar file with no duplicates File testDir = new File(testDirPathName); testDir.mkdirs(); JarOutputStream testJarOS = new JarOutputStream( new BufferedOutputStream( new FileOutputStream(testJarOneEntryAContentsChangedFilename))); // ad an entry JarEntry entry1 = new JarEntry(ENTRYA); testJarOS.putNextEntry(entry1); byte data1[] = new byte[2048]; for (int i=0; i < data1.length; i++) { data1[i]='a'; } // set a different content so that it will come up as changed data1[data1.length-1] = 'b'; testJarOS.write(data1); testJarOS.flush(); testJarOS.close(); } /** * Create a jar with only one entry in it. That entry being A * @throws FileNotFoundException * @throws IOException */ protected void createJarOneEntryB1() throws FileNotFoundException, IOException { // create a jar file with no duplicates File testDir = new File(testDirPathName); testDir.mkdirs(); JarOutputStream testJarOS = new JarOutputStream( new BufferedOutputStream( new FileOutputStream(testJarOneEntryB1Filename))); // ad an entry JarEntry entry1 = new JarEntry(ENTRYB); testJarOS.putNextEntry(entry1); byte data1[] = new byte[2048]; for (int i=0; i < data1.length; i++) { data1[i]='b'; } testJarOS.write(data1); testJarOS.flush(); testJarOS.close(); } } Index: DifferenceCalculatorTest.java =================================================================== RCS file: /cvsroot/zipdiff/zipdiff/src/test/zipdiff/DifferenceCalculatorTest.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DifferenceCalculatorTest.java 12 Jun 2004 13:58:46 -0000 1.2 --- DifferenceCalculatorTest.java 19 Jun 2004 20:13:53 -0000 1.3 *************** *** 24,178 **** * @author jastewart */ ! public class DifferenceCalculatorTest extends TestCase { ! private static String ENTRYA = "A"; ! private static String ENTRYB = "B"; ! private static String ENTRYC = "C"; ! public static final String SYSTEM_TMP_DIR_PROPERTY = "java.io.tmpdir"; ! public static final String TEST_DIR_POSTFIX = File.separator + "UnitTestsDifferenceCalculatorTest"; ! private static String testDirPathName; ! // naming convention The Capital letter denotes the entry so A will be the same as A ! // OneEntry denotes that the jar has one entry ! private static String testJarOneEmpty; ! private static String testJarTwoEmpty; ! private static String testJarOneEntryA1Filename; ! private static String testJarOneEntryA2Filename; ! private static String testJarOneEntryB1Filename; ! private static String testJarTwoEntryAB1Filename; ! private static String testJarTwoEntryAC2Filename; ! private static String testJarOneEntryAContentsChangedFilename; ! { ! testDirPathName = ! System.getProperty(System.getProperty(SYSTEM_TMP_DIR_PROPERTY)); ! if(testDirPathName == null) { ! testDirPathName = File.separator + "temp" + TEST_DIR_POSTFIX; ! } ! testJarOneEmpty = testDirPathName + File.separator + "testJarOneEmpty.jar"; ! testJarTwoEmpty = testDirPathName + File.separator + "testJarTwoEmpty.jar"; ! testJarOneEntryA1Filename = testDirPathName + File.separator + "testJarOneEntryA1Filename.jar"; ! testJarOneEntryA2Filename = testDirPathName + File.separator + "testJarOneEntryA2Filename.jar"; ! testJarOneEntryB1Filename = testDirPathName + File.separator + "testJarOneEntryB1Filename.jar"; ! testJarTwoEntryAB1Filename = testDirPathName + File.separator + "testJarTwoEntryAB1Filename.jar"; ! testJarTwoEntryAB1Filename = testDirPathName + File.separator + "testJarTwoEntryAB1Filename.jar"; ! testJarTwoEntryAC2Filename = testDirPathName + File.separator + "testJarTwoEntryAC2Filename.jar"; ! testJarOneEntryAContentsChangedFilename = testDirPathName + File.separator + "testJarOneEntryAContentsChangedFilename.jar"; ! } ! ! /** ! * Constructor for DifferenceCalculatorTest. ! * @param arg0 ! */ ! public DifferenceCalculatorTest(String arg0) { ! super(arg0); ! } ! ! /** ! * Create a jar with only one entry in it. That entry being A ! * @throws FileNotFoundException ! * @throws IOException ! */ ! public void createJarOneEntryA1() throws FileNotFoundException, IOException { ! // create a jar file with no duplicates ! File testDir = new File(testDirPathName); ! testDir.mkdirs(); ! JarOutputStream testJarOS = ! new JarOutputStream( ! new BufferedOutputStream( ! new FileOutputStream(testJarOneEntryA1Filename))); ! ! // ad an entry ! JarEntry entry1 = new JarEntry(ENTRYA); ! testJarOS.putNextEntry(entry1); ! byte data1[] = new byte[2048]; ! for (int i=0; i < data1.length; i++) { ! data1[i]='a'; ! } ! testJarOS.write(data1); ! ! testJarOS.flush(); ! testJarOS.close(); ! } ! ! /** ! * Create a jar with only one entry in it. That entry being A ! * @throws FileNotFoundException ! * @throws IOException ! */ ! public void createJarOneEntryA2() throws FileNotFoundException, IOException { ! // create a jar file with no duplicates ! File testDir = new File(testDirPathName); ! testDir.mkdirs(); ! JarOutputStream testJarOS = ! new JarOutputStream( ! new BufferedOutputStream( ! new FileOutputStream(testJarOneEntryA2Filename))); ! ! // ad an entry ! JarEntry entry1 = new JarEntry(ENTRYA); ! testJarOS.putNextEntry(entry1); ! byte data1[] = new byte[2048]; ! for (int i=0; i < data1.length; i++) { ! data1[i]='a'; ! } ! testJarOS.write(data1); ! ! testJarOS.flush(); ! testJarOS.close(); ! } ! ! /** ! * Create a jar with only one entry in it. That entry being A ! * @throws FileNotFoundException ! * @throws IOException ! */ ! public void createJarOneEntryAContentsChanged() throws FileNotFoundException, IOException { ! // create a jar file with no duplicates ! File testDir = new File(testDirPathName); ! testDir.mkdirs(); ! JarOutputStream testJarOS = ! new JarOutputStream( ! new BufferedOutputStream( ! new FileOutputStream(testJarOneEntryAContentsChangedFilename))); ! ! // ad an entry ! JarEntry entry1 = new JarEntry(ENTRYA); ! testJarOS.putNextEntry(entry1); ! byte data1[] = new byte[2048]; ! for (int i=0; i < data1.length; i++) { ! data1[i]='a'; ! } ! // set a different content so that it will come up as changed ! data1[data1.length-1] = 'b'; ! testJarOS.write(data1); ! ! testJarOS.flush(); ! testJarOS.close(); ! } ! ! /** ! * Create a jar with only one entry in it. That entry being A ! * @throws FileNotFoundException ! * @throws IOException ! */ ! public void createJarOneEntryB1() throws FileNotFoundException, IOException { ! // create a jar file with no duplicates ! File testDir = new File(testDirPathName); ! testDir.mkdirs(); ! JarOutputStream testJarOS = ! new JarOutputStream( ! new BufferedOutputStream( ! new FileOutputStream(testJarOneEntryB1Filename))); ! ! // ad an entry ! JarEntry entry1 = new JarEntry(ENTRYB); ! testJarOS.putNextEntry(entry1); ! byte data1[] = new byte[2048]; ! for (int i=0; i < data1.length; i++) { ! data1[i]='b'; ! } ! testJarOS.write(data1); ! ! testJarOS.flush(); ! testJarOS.close(); ! } --- 24,28 ---- * @author jastewart */ ! public class DifferenceCalculatorTest extends AbstractTestCase { *************** *** 192,195 **** --- 42,46 ---- Map changedEntries = differences.getChanged(); assertTrue(changedEntries.size() == 0); + } *************** *** 249,251 **** --- 100,103 ---- } + } |
