cdchamber-cvscommit Mailing List for CDChamber (Page 2)

Status: Pre-Alpha

Brought to you by: crystal_y, simon_lei

cdchamber-cvscommit — Mailing list for CVS commit messages.

You can subscribe to this list here.

2002	_Jan	_Feb	_Mar	_Apr	_May	_Jun (111)	_Jul (258)	_Aug (21)	_Sep	_Oct	_Nov	_Dec
2003	_Jan	_Feb	_Mar	_Apr (1)	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

Flat | Threaded

<< < 1 2 3 4 .. 16 > >> (Page 2 of 16)

[CDChamber-cvscommit] CDChamber build.xml,1.36,1.37

From: <cry...@us...> - 2002-07-31 06:49:08

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv13183

Modified Files:
	build.xml 
Log Message:
use memory string.equal to check if file is different


Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** build.xml	31 Jul 2002 05:31:33 -0000	1.36
--- build.xml	31 Jul 2002 06:49:03 -0000	1.37
***************
*** 64,72 ****
                 </uptodate>
          </condition>
-         <condition property="testsuite_gen.notRequired">
-                <uptodate targetfile="${test.src}/AllTests.java">
-                    <srcfiles dir="${test.src}" includes="**/*Test.java"/>
-                </uptodate>
-         </condition>
      </target>
  
--- 64,67 ----
***************
*** 102,106 ****
      </target>
  
!     <target name="testsuite.gen" depends="compile" description="Generate the test suite" unless="testsuite_gen.notRequired" >
          <java classname="org.cdchamber.util.testtools.AllTestsGenerator" fork="true" dir="${basedir}">
              <classpath>
--- 97,101 ----
      </target>
  
!     <target name="testsuite.gen" depends="compile" description="Generate the test suite">
          <java classname="org.cdchamber.util.testtools.AllTestsGenerator" fork="true" dir="${basedir}">
              <classpath>

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/gui FilesTable.java,1.2,1.3

From: <sim...@us...> - 2002-07-31 06:09:07

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv3450/src/org/cdchamber/gui

Modified Files:
	FilesTable.java 
Log Message:
Set the table value when focus lost.

Index: FilesTable.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/FilesTable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** FilesTable.java	30 Jul 2002 05:12:13 -0000	1.2
--- FilesTable.java	31 Jul 2002 06:09:02 -0000	1.3
***************
*** 9,16 ****
  import javax.swing.table.*;
  import java.awt.*;
! import java.awt.event.MouseEvent;
! import java.awt.event.MouseAdapter;
  
! public class FilesTable extends JTable {
  
      public FilesTable() {
--- 9,15 ----
  import javax.swing.table.*;
  import java.awt.*;
! import java.awt.event.*;
  
! public class FilesTable extends JTable implements FocusListener {
  
      public FilesTable() {
***************
*** 24,29 ****
--- 23,44 ----
          header.addMouseListener(new ColumnListener( this));
          header.setReorderingAllowed(true);
+         this.addFocusListener( this);
+     }
  
+     public void focusGained(FocusEvent e) {
      }
+ 
+     public void focusLost(FocusEvent e) {
+         if ( isEditing()) {
+             int c = getEditingColumn();
+             int r = getEditingRow();
+             CellEditor ce = getCellEditor(r, c);
+             ce.stopCellEditing();
+             Object o = ce.getCellEditorValue();
+             getModel().setValueAt( o, r, c);
+         }
+ 
+     }
+ 
  
      public void setModel(TableModel dataModel) {

[CDChamber-cvscommit] CDChamber TODO.txt,1.19,1.20

From: <sim...@us...> - 2002-07-31 06:09:07

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv3450

Modified Files:
	TODO.txt 
Log Message:
Set the table value when focus lost.

Index: TODO.txt
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/TODO.txt,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** TODO.txt	31 Jul 2002 02:16:22 -0000	1.19
--- TODO.txt	31 Jul 2002 06:09:02 -0000	1.20
***************
*** 18,23 ****
  x : Release one alpha version
  x : Can't deal with large bad zip file. :(
  + : Add status bar.
- + : Add Save All.
  + : Use different color to indicate modified or not.
  + : Add notify when modified not saved.
--- 18,24 ----
  x : Release one alpha version
  x : Can't deal with large bad zip file. :(
+ x : Add Save All.
+ x : Add cancel edit when table focus lost.
  + : Add status bar.
  + : Use different color to indicate modified or not.
  + : Add notify when modified not saved.

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/util/testtools AllTestsGenerator.java,1.2,1.3 FileComparator.java,1.3,1.4

From: <sim...@us...> - 2002-07-31 06:02:08

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/testtools
In directory usw-pr-cvs1:/tmp/cvs-serv1793/src/org/cdchamber/util/testtools

Modified Files:
	AllTestsGenerator.java FileComparator.java 
Log Message:
Bug fix, I use wrong file comparator.

Index: AllTestsGenerator.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/testtools/AllTestsGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AllTestsGenerator.java	31 Jul 2002 05:48:20 -0000	1.2
--- AllTestsGenerator.java	31 Jul 2002 06:02:05 -0000	1.3
***************
*** 23,27 ****
          allTest.close();
  
!         if ( FileComparator.same( targetFile, tmpFile)) delete( tmpFile);
          else {
              delete( targetFile);
--- 23,27 ----
          allTest.close();
  
!         if ( !FileComparator.diff( targetFile, tmpFile)) delete( tmpFile);
          else {
              delete( targetFile);
***************
*** 38,42 ****
      static void delete( String fileName) {
          File file = new File( fileName);
!         file.delete();
      }
  
--- 38,42 ----
      static void delete( String fileName) {
          File file = new File( fileName);
!         System.out.println( file.delete());
      }
  

Index: FileComparator.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/testtools/FileComparator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** FileComparator.java	27 Jun 2002 07:48:47 -0000	1.3
--- FileComparator.java	31 Jul 2002 06:02:06 -0000	1.4
***************
*** 35,41 ****
--- 35,54 ----
              sb.append( "\n>>>>>>>\n");
              sb.append( line2);
+             reader1.close();
+             reader2.close();
              throw new FileComparatorException( sb.toString());
          } while ( (line1 != null) && (line2 !=null));
+         reader1.close();
+         reader2.close();
          return;
+     }
+ 
+     public static boolean diff( String file1, String file2) {
+         try {
+             diff( new File( file1), new File( file2));
+         } catch ( Exception e) {
+             return true;
+         }
+         return false;
      }

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/util/testtools AllTestsGenerator.java,1.1,1.2

From: <sim...@us...> - 2002-07-31 05:48:24

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/testtools
In directory usw-pr-cvs1:/tmp/cvs-serv30230/src/org/cdchamber/util/testtools

Modified Files:
	AllTestsGenerator.java 
Log Message:
Judge whether regenerate testsuite in Generator.

Index: AllTestsGenerator.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/testtools/AllTestsGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AllTestsGenerator.java	31 Jul 2002 05:17:35 -0000	1.1
--- AllTestsGenerator.java	31 Jul 2002 05:48:20 -0000	1.2
***************
*** 10,18 ****
  
  public class AllTestsGenerator {
!     static String testSrc = DirPath.BaseDir + DirPath.SEP + "test" + DirPath.SEP + "src";
      static PrintWriter allTest;
  
      public static void main( String[] args) throws IOException {
!         allTest = new PrintWriter( new FileWriter(testSrc + DirPath.SEP + "AllTests.java"));
          File testsDir = new File( DirPath.BaseDir + DirPath.SEP + "test" + DirPath.SEP + "src");
          prefix();
--- 10,20 ----
  
  public class AllTestsGenerator {
!     static String testSrc = DirPath.BaseDir + DirPath.SEP + "test" + DirPath.SEP + "src" + DirPath.SEP ;
      static PrintWriter allTest;
+     static String tmpFile = testSrc + "AllTests.java2";
+     static String targetFile = testSrc + "AllTests.java";
  
      public static void main( String[] args) throws IOException {
!         allTest = new PrintWriter( new FileWriter( tmpFile));
          File testsDir = new File( DirPath.BaseDir + DirPath.SEP + "test" + DirPath.SEP + "src");
          prefix();
***************
*** 20,23 ****
--- 22,42 ----
          postfix();
          allTest.close();
+ 
+         if ( FileComparator.same( targetFile, tmpFile)) delete( tmpFile);
+         else {
+             delete( targetFile);
+             rename();
+         }
+     }
+ 
+     static void rename( ) {
+         File file = new File( tmpFile);
+         File target = new File( targetFile);
+         file.renameTo( target);
+     }
+ 
+     static void delete( String fileName) {
+         File file = new File( fileName);
+         file.delete();
      }

[CDChamber-cvscommit] CDChamber build.xml,1.35,1.36

From: <sim...@us...> - 2002-07-31 05:31:36

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv26171

Modified Files:
	build.xml 
Log Message:
Check whethere it need to generate the testsuites

Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** build.xml	31 Jul 2002 04:21:01 -0000	1.35
--- build.xml	31 Jul 2002 05:31:33 -0000	1.36
***************
*** 64,67 ****
--- 64,72 ----
                 </uptodate>
          </condition>
+         <condition property="testsuite_gen.notRequired">
+                <uptodate targetfile="${test.src}/AllTests.java">
+                    <srcfiles dir="${test.src}" includes="**/*Test.java"/>
+                </uptodate>
+         </condition>
      </target>
  
***************
*** 97,101 ****
      </target>
  
!     <target name="test.compile" depends="compile">
          <javac srcdir="${test.src}" destdir="${test.classes}">
              <classpath>
--- 102,114 ----
      </target>
  
!     <target name="testsuite.gen" depends="compile" description="Generate the test suite" unless="testsuite_gen.notRequired" >
!         <java classname="org.cdchamber.util.testtools.AllTestsGenerator" fork="true" dir="${basedir}">
!             <classpath>
!                 <path refid="classpath" />
!             </classpath>
!         </java>
!     </target>
! 
!     <target name="test.compile" depends="testsuite.gen">
          <javac srcdir="${test.src}" destdir="${test.classes}">
              <classpath>
***************
*** 134,138 ****
              <formatter type="plain" usefile="false"/>
  			<test name="AllTests"/>
!   
  <!--             <batchtest todir="${junit.results}"> -->
  <!--                 <fileset dir="${test.classes}" includes="**/*Test.class"/> -->
--- 147,151 ----
              <formatter type="plain" usefile="false"/>
  			<test name="AllTests"/>
! 
  <!--             <batchtest todir="${junit.results}"> -->
  <!--                 <fileset dir="${test.classes}" includes="**/*Test.class"/> -->

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/util/testtools AllTestsGenerator.java,NONE,1.1

From: <sim...@us...> - 2002-07-31 05:17:39

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/util/testtools
In directory usw-pr-cvs1:/tmp/cvs-serv23454/src/org/cdchamber/util/testtools

Added Files:
	AllTestsGenerator.java 
Log Message:
Add testsuite auto generator

--- NEW FILE: AllTestsGenerator.java ---
/*
 * User: Simon
 * $Id: AllTestsGenerator.java,v 1.1 2002/07/31 05:17:35 simon_lei Exp $
 */
package org.cdchamber.util.testtools;

import org.cdchamber.util.DirPath;

import java.io.*;

public class AllTestsGenerator {
    static String testSrc = DirPath.BaseDir + DirPath.SEP + "test" + DirPath.SEP + "src";
    static PrintWriter allTest;

    public static void main( String[] args) throws IOException {
        allTest = new PrintWriter( new FileWriter(testSrc + DirPath.SEP + "AllTests.java"));
        File testsDir = new File( DirPath.BaseDir + DirPath.SEP + "test" + DirPath.SEP + "src");
        prefix();
        generate( testsDir, "");
        postfix();
        allTest.close();
    }

    static void generate( File testsDir, String packageName) {
        File[] files = testsDir.listFiles();
        for ( int i=0; i< files.length; i++) {
            File file = files[i];
            if ( file.isDirectory()) generate( file, getPackageName( packageName, file.getName()));
            if ( file.getName().endsWith( "Test.java")) {
                int point = file.getName().lastIndexOf('.');
                String name = file.getName().substring( 0, point);
                allTest.print( "        suite.addTest(new TestSuite(");
                allTest.print( packageName+"."+ name);
                allTest.println( ".class));");
            }

        }
    }

    static String getPackageName( String packageName, String fileName) {
        if ( "".equals( packageName)) return fileName;

        return packageName + "." + fileName;
    }

    static void prefix() {
        allTest.println( "import junit.framework.*;");
        allTest.println( "public class AllTests {");
        allTest.println( "    public static void main (String[] args) {");
        allTest.println( "        junit.textui.TestRunner.run (suite());");
        allTest.println( "    }");
        allTest.println( "    public static Test suite ( ) {");
        allTest.println( "        TestSuite suite= new TestSuite(\"All CDChamber Tests\");");
    }

    static void postfix() {
        allTest.println( "        return suite;");
        allTest.println( "    }");
        allTest.println( "}");
    }
}

[CDChamber-cvscommit] CDChamber/test/src AllTests.java,1.2,1.3

From: <sim...@us...> - 2002-07-31 05:17:39

Update of /cvsroot/cdchamber/CDChamber/test/src
In directory usw-pr-cvs1:/tmp/cvs-serv23454/test/src

Modified Files:
	AllTests.java 
Log Message:
Add testsuite auto generator

Index: AllTests.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/AllTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AllTests.java	31 Jul 2002 04:23:06 -0000	1.2
--- AllTests.java	31 Jul 2002 05:17:35 -0000	1.3
***************
*** 1,32 ****
- // 	$Id$	
  import junit.framework.*;
- 
  public class AllTests {
! 
!   public static void main (String[] args) {
! 	junit.textui.TestRunner.run (suite());
!   }
!   public static Test suite ( ) {
! 	TestSuite suite= new TestSuite("All CDChamber Tests");
! 	suite.addTest(new TestSuite(org.cdchamber.gui.CDCMainFrameTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.gui.CDCMainFrameControllerTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.gui.FileTreeTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.gui.FilesTableTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.gui.MyDateChooserTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.gui.SearchDialogTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.searcher.AdvanceQueryTest.class	));
! 	suite.addTest(new TestSuite(org.cdchamber.searcher.DateQueryTest.class		));
! 	suite.addTest(new TestSuite(org.cdchamber.searcher.ScopeQueryTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.searcher.SearcherTest.class				 ));
! 	suite.addTest(new TestSuite(org.cdchamber.searcher.SizeQueryTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.searcher.StandardQueryTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.elements.CVSFileFilterTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.elements.CompressedFileTypeTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.elements.DirectoryTypeTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.elements.FileFiltersTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.elements.FileTypeFactoryTest.class));
! 	suite.addTest(new TestSuite(org.cdchamber.elements.FileTypeTest.class	));
! 	suite.addTest(new TestSuite(org.cdchamber.util.testtools.FileComparatorTest.class));
! 	return suite;
!   }
  }
--- 1,29 ----
  import junit.framework.*;
  public class AllTests {
!     public static void main (String[] args) {
!         junit.textui.TestRunner.run (suite());
!     }
!     public static Test suite ( ) {
!         TestSuite suite= new TestSuite("All CDChamber Tests");
!         suite.addTest(new TestSuite(org.cdchamber.util.testtools.FileComparatorTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.elements.FileTypeTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.elements.DirectoryTypeTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.elements.CVSFileFilterTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.elements.FileFiltersTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.elements.CompressedFileTypeTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.elements.FileTypeFactoryTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.gui.FileTreeTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.gui.MyDateChooserTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.gui.SearchDialogTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.gui.FilesTableTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.gui.CDCMainFrameTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.gui.CDCMainFrameControllerTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.searcher.ScopeQueryTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.searcher.AdvanceQueryTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.searcher.StandardQueryTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.searcher.DateQueryTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.searcher.SizeQueryTest.class));
!         suite.addTest(new TestSuite(org.cdchamber.searcher.SearcherTest.class));
!         return suite;
!     }
  }

[CDChamber-cvscommit] CDChamber/data result.badxml,NONE,1.1

From: <sim...@us...> - 2002-07-31 05:17:39

Update of /cvsroot/cdchamber/CDChamber/data
In directory usw-pr-cvs1:/tmp/cvs-serv23454/data

Added Files:
	result.badxml 
Log Message:
Add testsuite auto generator

--- NEW FILE: result.badxml ---
<?xml version="1.0" encoding="UTF-8"?>
<CDRomType valid="true" date="1025147775000" files-count="3" size="9525"><files files-count="2" date="1025069812000" size="9525" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>testtools</name><files files-count="2" date="1025149792000" size="4763" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>difffiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2382" valid="true"><name>file2.txt</name></files><content></content></files><files files-count="2" date="1025069812000" size="4762" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>samefiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2381" valid="true"><name>file2.txt</name></files><content></content></files><content></content><desc>3</desc></files><files date="1024999342000" size="0" valid="true"><name>nullFile</name></files><files files-count="0" date="1025086602000" size="0" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>nulldir</name><content></content><desc>fff</desc></files><name>testcase</name><desc>zzz</desc><content></content><data-file-name>D:\work\CDChamber\data\result.badxml</data-file-name></CDRomType>

[CDChamber-cvscommit] CDChamber/test/src AllTests.java,1.1,1.2

From: <cry...@us...> - 2002-07-31 04:23:14

Update of /cvsroot/cdchamber/CDChamber/test/src
In directory usw-pr-cvs1:/tmp/cvs-serv10986

Modified Files:
	AllTests.java 
Log Message:
remove jarentryparser test
must have some method to generate this file


Index: AllTests.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/AllTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AllTests.java	31 Jul 2002 04:18:47 -0000	1.1
--- AllTests.java	31 Jul 2002 04:23:06 -0000	1.2
***************
*** 27,31 ****
  	suite.addTest(new TestSuite(org.cdchamber.elements.FileTypeFactoryTest.class));
  	suite.addTest(new TestSuite(org.cdchamber.elements.FileTypeTest.class	));
- 	suite.addTest(new TestSuite(org.cdchamber.elements.JarEntryParserTest.class));
  	suite.addTest(new TestSuite(org.cdchamber.util.testtools.FileComparatorTest.class));
  	return suite;
--- 27,30 ----

[CDChamber-cvscommit] CDChamber build.xml,1.34,1.35

From: <cry...@us...> - 2002-07-31 04:21:04

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv10481

Modified Files:
	build.xml 
Log Message:
use AllTests to speed unit test


Index: build.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/build.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** build.xml	30 Jul 2002 12:51:05 -0000	1.34
--- build.xml	31 Jul 2002 04:21:01 -0000	1.35
***************
*** 133,139 ****
              </classpath>
              <formatter type="plain" usefile="false"/>
!             <batchtest todir="${junit.results}">
!                 <fileset dir="${test.classes}" includes="**/*Test.class"/>
!             </batchtest>
          </junit>
      </target>
--- 133,141 ----
              </classpath>
              <formatter type="plain" usefile="false"/>
! 			<test name="AllTests"/>
!   
! <!--             <batchtest todir="${junit.results}"> -->
! <!--                 <fileset dir="${test.classes}" includes="**/*Test.class"/> -->
! <!--             </batchtest> -->
          </junit>
      </target>

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/gui CDCMainFrameControllerTest.java,1.18,1.19

From: <cry...@us...> - 2002-07-31 04:20:25

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv10314

Modified Files:
	CDCMainFrameControllerTest.java 
Log Message:
not using System.currentTimeMillis to compare file's lastModified


Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** CDCMainFrameControllerTest.java	31 Jul 2002 03:38:43 -0000	1.18
--- CDCMainFrameControllerTest.java	31 Jul 2002 04:20:22 -0000	1.19
***************
*** 158,170 ****
      public void testSaveAllCDRomAction() throws Exception {
          Action action = controller.getSaveAllAction();
!         long beforeTime = System.currentTimeMillis();
          action.actionPerformed( null);
  
-         DefaultMutableTreeNode root = (DefaultMutableTreeNode)frame.treeModel.getRoot();
          for ( int i=0; i<root.getChildCount(); i++) {
              DefaultMutableTreeNode child = (DefaultMutableTreeNode)frame.treeModel.getChild( root, i);
              CDRomType cdrom = (CDRomType) child.getUserObject();
              File file = new File( cdrom.getDataFileName());
!             assertTrue( "Should have act the save action" + file.getName(), beforeTime < file.lastModified());
          }
      }
--- 158,177 ----
      public void testSaveAllCDRomAction() throws Exception {
          Action action = controller.getSaveAllAction();
!         Vector beforeTime = new Vector();//System.currentTimeMillis();
!         DefaultMutableTreeNode root = (DefaultMutableTreeNode)frame.treeModel.getRoot();
!         for ( int i=0; i<root.getChildCount(); i++) {
!             DefaultMutableTreeNode child = (DefaultMutableTreeNode)frame.treeModel.getChild( root, i);
!             CDRomType cdrom = (CDRomType) child.getUserObject();
!             File file = new File( cdrom.getDataFileName());
! 			beforeTime.add(new Long(file.lastModified()));
!         }
! 
          action.actionPerformed( null);
  
          for ( int i=0; i<root.getChildCount(); i++) {
              DefaultMutableTreeNode child = (DefaultMutableTreeNode)frame.treeModel.getChild( root, i);
              CDRomType cdrom = (CDRomType) child.getUserObject();
              File file = new File( cdrom.getDataFileName());
!             assertTrue( "Should have act the save action " + file.getName(), ((Long)beforeTime.get(i)).longValue() <= file.lastModified());
          }
      }
***************
*** 255,257 ****
      }
  
! }
\ No newline at end of file
--- 262,264 ----
      }
  
! }

[CDChamber-cvscommit] CDChamber/test/src AllTests.java,NONE,1.1

From: <cry...@us...> - 2002-07-31 04:18:51

Update of /cvsroot/cdchamber/CDChamber/test/src
In directory usw-pr-cvs1:/tmp/cvs-serv9843

Added Files:
	AllTests.java 
Log Message:
add AllTests.java to speed unit test


--- NEW FILE: AllTests.java ---
// 	$Id: AllTests.java,v 1.1 2002/07/31 04:18:47 crystal_y Exp $	
import junit.framework.*;

public class AllTests {

  public static void main (String[] args) {
	junit.textui.TestRunner.run (suite());
  }
  public static Test suite ( ) {
	TestSuite suite= new TestSuite("All CDChamber Tests");
	suite.addTest(new TestSuite(org.cdchamber.gui.CDCMainFrameTest.class));
	suite.addTest(new TestSuite(org.cdchamber.gui.CDCMainFrameControllerTest.class));
	suite.addTest(new TestSuite(org.cdchamber.gui.FileTreeTest.class));
	suite.addTest(new TestSuite(org.cdchamber.gui.FilesTableTest.class));
	suite.addTest(new TestSuite(org.cdchamber.gui.MyDateChooserTest.class));
	suite.addTest(new TestSuite(org.cdchamber.gui.SearchDialogTest.class));
	suite.addTest(new TestSuite(org.cdchamber.searcher.AdvanceQueryTest.class	));
	suite.addTest(new TestSuite(org.cdchamber.searcher.DateQueryTest.class		));
	suite.addTest(new TestSuite(org.cdchamber.searcher.ScopeQueryTest.class));
	suite.addTest(new TestSuite(org.cdchamber.searcher.SearcherTest.class				 ));
	suite.addTest(new TestSuite(org.cdchamber.searcher.SizeQueryTest.class));
	suite.addTest(new TestSuite(org.cdchamber.searcher.StandardQueryTest.class));
	suite.addTest(new TestSuite(org.cdchamber.elements.CVSFileFilterTest.class));
	suite.addTest(new TestSuite(org.cdchamber.elements.CompressedFileTypeTest.class));
	suite.addTest(new TestSuite(org.cdchamber.elements.DirectoryTypeTest.class));
	suite.addTest(new TestSuite(org.cdchamber.elements.FileFiltersTest.class));
	suite.addTest(new TestSuite(org.cdchamber.elements.FileTypeFactoryTest.class));
	suite.addTest(new TestSuite(org.cdchamber.elements.FileTypeTest.class	));
	suite.addTest(new TestSuite(org.cdchamber.elements.JarEntryParserTest.class));
	suite.addTest(new TestSuite(org.cdchamber.util.testtools.FileComparatorTest.class));
	return suite;
  }
}

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/gui CDCMainFrameControllerTest.java,1.17,1.18 CDCMainFrameTest.java,1.16,1.17

From: <sim...@us...> - 2002-07-31 03:38:46

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv1749/test/src/org/cdchamber/gui

Modified Files:
	CDCMainFrameControllerTest.java CDCMainFrameTest.java 
Log Message:
Ignore non xml file in data directory.

Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** CDCMainFrameControllerTest.java	31 Jul 2002 02:52:18 -0000	1.17
--- CDCMainFrameControllerTest.java	31 Jul 2002 03:38:43 -0000	1.18
***************
*** 188,191 ****
--- 188,198 ----
      }
  
+     public void testDoNotLoadNonXmlFile() throws Exception {
+         for ( int i=0; i<controller.roots.getFilesCount(); i++) {
+             CDRomType cdrom = (CDRomType) controller.roots.getFiles(i);
+             if ( cdrom.getDataFileName().endsWith(".badxml")) fail( "Should not add this file in.");
+         }
+     }
+ 
  }
  

Index: CDCMainFrameTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CDCMainFrameTest.java	30 Jul 2002 08:05:36 -0000	1.16
--- CDCMainFrameTest.java	31 Jul 2002 03:38:43 -0000	1.17
***************
*** 63,66 ****
--- 63,67 ----
          File[] rootFiles = dataDir.listFiles();
          for ( int i=0; i<rootFiles.length; i++) {
+             if ( !rootFiles[i].getName().toLowerCase().endsWith( ".xml")) continue;
              try {
                  dirs.add( DirectoryType.unmarshalDirectoryType( new FileReader( rootFiles[i])));

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/gui CDCMainFrameController.java,1.22,1.23

From: <sim...@us...> - 2002-07-31 03:38:46

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv1749/src/org/cdchamber/gui

Modified Files:
	CDCMainFrameController.java 
Log Message:
Ignore non xml file in data directory.

Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** CDCMainFrameController.java	31 Jul 2002 02:52:17 -0000	1.22
--- CDCMainFrameController.java	31 Jul 2002 03:38:43 -0000	1.23
***************
*** 43,47 ****
          File[] rootFiles = dataDir.listFiles();
          for (int i = 0; i < rootFiles.length; i++) {
!             if (rootFiles[i].isDirectory()) continue;
              try {
                  CDRomType cdrom = CDRomType.unmarshalCDRomType(new FileReader(rootFiles[i]));
--- 43,48 ----
          File[] rootFiles = dataDir.listFiles();
          for (int i = 0; i < rootFiles.length; i++) {
!             if ( rootFiles[i].isDirectory()) continue;
!             if ( !rootFiles[i].getName().toLowerCase().endsWith( ".xml")) continue;
              try {
                  CDRomType cdrom = CDRomType.unmarshalCDRomType(new FileReader(rootFiles[i]));

[CDChamber-cvscommit] CDChamber/images saveAll.png,NONE,1.1

From: <sim...@us...> - 2002-07-31 02:57:13

Update of /cvsroot/cdchamber/CDChamber/images
In directory usw-pr-cvs1:/tmp/cvs-serv25025/images

Added Files:
	saveAll.png 
Log Message:
Add the save all icon

--- NEW FILE: saveAll.png ---
(This appears to be a binary file; contents omitted.)

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/gui CDCMainFrameControllerTest.java,1.16,1.17

From: <sim...@us...> - 2002-07-31 02:52:23

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv24010/test/src/org/cdchamber/gui

Modified Files:
	CDCMainFrameControllerTest.java 
Log Message:
Add Save all action

Index: CDCMainFrameControllerTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/gui/CDCMainFrameControllerTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** CDCMainFrameControllerTest.java	29 Jul 2002 08:42:36 -0000	1.16
--- CDCMainFrameControllerTest.java	31 Jul 2002 02:52:18 -0000	1.17
***************
*** 156,159 ****
--- 156,173 ----
      }
  
+     public void testSaveAllCDRomAction() throws Exception {
+         Action action = controller.getSaveAllAction();
+         long beforeTime = System.currentTimeMillis();
+         action.actionPerformed( null);
+ 
+         DefaultMutableTreeNode root = (DefaultMutableTreeNode)frame.treeModel.getRoot();
+         for ( int i=0; i<root.getChildCount(); i++) {
+             DefaultMutableTreeNode child = (DefaultMutableTreeNode)frame.treeModel.getChild( root, i);
+             CDRomType cdrom = (CDRomType) child.getUserObject();
+             File file = new File( cdrom.getDataFileName());
+             assertTrue( "Should have act the save action" + file.getName(), beforeTime < file.lastModified());
+         }
+     }
+ 
      public void testSearchAction() throws Exception {
          JTree jTree = new JTree();

[CDChamber-cvscommit] CDChamber/src/org/cdchamber/gui CDCMainFrame.java,1.24,1.25 CDCMainFrameController.java,1.21,1.22

From: <sim...@us...> - 2002-07-31 02:52:23

Update of /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui
In directory usw-pr-cvs1:/tmp/cvs-serv24010/src/org/cdchamber/gui

Modified Files:
	CDCMainFrame.java CDCMainFrameController.java 
Log Message:
Add Save all action

Index: CDCMainFrame.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrame.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CDCMainFrame.java	30 Jul 2002 05:12:12 -0000	1.24
--- CDCMainFrame.java	31 Jul 2002 02:52:17 -0000	1.25
***************
*** 26,29 ****
--- 26,30 ----
      JMenuItem cdromDeleteMenuItem = new JMenuItem();
      JMenuItem cdromSaveMenuItem = new JMenuItem();
+     JMenuItem cdromSaveAllMenuItem = new JMenuItem();
      JMenuItem cdromSearchMenuItem = new JMenuItem();
      JMenu helpMenu = new JMenu();
***************
*** 89,94 ****
          toolBar.add( controller.getCreateNewCDRomAction());
          toolBar.add( controller.getImportCDRomAction());
-         toolBar.add( controller.getSaveCDRomAction());
          toolBar.add( controller.getDeleteCDRomAction());
          toolBar.addSeparator();
          toolBar.add( controller.getSearchCDRomAction());
--- 90,96 ----
          toolBar.add( controller.getCreateNewCDRomAction());
          toolBar.add( controller.getImportCDRomAction());
          toolBar.add( controller.getDeleteCDRomAction());
+         toolBar.add( controller.getSaveCDRomAction());
+         toolBar.add( controller.getSaveAllAction());
          toolBar.addSeparator();
          toolBar.add( controller.getSearchCDRomAction());
***************
*** 119,122 ****
--- 121,125 ----
          cdromDeleteMenuItem.setAction( controller.getDeleteCDRomAction());
          cdromSaveMenuItem.setAction( controller.getSaveCDRomAction());
+         cdromSaveAllMenuItem.setAction( controller.getSaveAllAction());
          cdromSearchMenuItem.setAction( controller.getSearchCDRomAction());
          helpMenu.setMnemonic('H');
***************
*** 136,139 ****
--- 139,143 ----
          cdromMenu.add(cdromDeleteMenuItem);
          cdromMenu.add(cdromSaveMenuItem);
+         cdromMenu.add(cdromSaveAllMenuItem);
          cdromMenu.add(cdromSearchMenuItem);
          helpMenu.add(helpAboutMenuItem);

Index: CDCMainFrameController.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/src/org/cdchamber/gui/CDCMainFrameController.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** CDCMainFrameController.java	30 Jul 2002 07:32:18 -0000	1.21
--- CDCMainFrameController.java	31 Jul 2002 02:52:17 -0000	1.22
***************
*** 126,129 ****
--- 126,133 ----
      }
  
+     public Action getSaveAllAction() {
+         return new SaveAllAction();
+     }
+ 
      public class TableMouseAdapter extends MouseAdapter {
          public void mouseClicked(MouseEvent e) {
***************
*** 248,251 ****
--- 252,276 ----
          }
      }
+ 
+     public class SaveAllAction extends AbstractAction {
+         public SaveAllAction() {
+             putValue(Action.NAME, "SaveAll");
+             putValue(Action.MNEMONIC_KEY, new Integer('A'));
+             putValue( Action.SHORT_DESCRIPTION, "Save all CDRoms");
+             putValue( Action.SMALL_ICON, new ImageIcon( DirPath.getIconPath( "saveAll.png")));
+         }
+ 
+         public void actionPerformed(ActionEvent e) {
+             for ( int i=0; i<roots.getFilesCount(); i++) {
+                 CDRomType cdrom = (CDRomType) (roots.getFiles(i));
+                 try {
+                     cdrom.marshal();
+                 } catch (Exception e1) {
+                     frame.dealWithActionException("Can't save cdrom file.", e1);
+                 }
+             }
+         }
+     }
+ 
  
      public class SearchCDRomAction extends AbstractAction {

[CDChamber-cvscommit] CDChamber/data repository.xml,1.3,1.4 result.xml,1.2,1.3

From: <sim...@us...> - 2002-07-31 02:52:23

Update of /cvsroot/cdchamber/CDChamber/data
In directory usw-pr-cvs1:/tmp/cvs-serv24010/data

Modified Files:
	repository.xml result.xml 
Log Message:
Add Save all action

Index: repository.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/data/repository.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** repository.xml	29 Jul 2002 09:26:45 -0000	1.3
--- repository.xml	31 Jul 2002 02:52:17 -0000	1.4
***************
*** 1,2 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <CDRomType valid="true" date="1025685715000" files-count="2" size="2"><files files-count="1" date="1025685715000" size="1" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>bar</name><files date="1025685715000" size="1" valid="true"><name>world</name><desc>sssssssssssssss</desc></files><content></content></files><files date="1025685715000" size="1" valid="true"><name>hello</name></files><name>foo</name><content></content><data-file-name>/u/yangjing/program/java/CDChamber/data/repository.xml</data-file-name></CDRomType>
\ No newline at end of file
--- 1,2 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <CDRomType valid="true" date="1025685715000" files-count="2" size="2"><files files-count="1" date="1025685715000" size="1" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>bar</name><files date="1025685715000" size="1" valid="true"><name>world</name><desc>sssssssssssssss</desc></files><content></content><desc>5</desc></files><files date="1025685715000" size="1" valid="true"><name>hello</name><desc>6</desc></files><name>foo</name><content></content><data-file-name>D:\work\CDChamber\data\repository.xml</data-file-name></CDRomType>
\ No newline at end of file

Index: result.xml
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/data/result.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** result.xml	21 Jul 2002 13:23:58 -0000	1.2
--- result.xml	31 Jul 2002 02:52:17 -0000	1.3
***************
*** 1,2 ****
  <?xml version="1.0" encoding="UTF-8"?>
! <CDRomType valid="true" date="1025147775000" files-count="3" size="9525"><files files-count="2" date="1025069812000" size="9525" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>testtools</name><files files-count="2" date="1025149792000" size="4763" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>difffiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2382" valid="true"><name>file2.txt</name></files><content></content></files><files files-count="2" date="1025069812000" size="4762" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>samefiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2381" valid="true"><name>file2.txt</name></files><content></content></files><content></content></files><files date="1024999342000" size="0" valid="true"><name>nullFile</name></files><files files-count="0" date="1025086602000" size="0" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>nulldir</name><content></content></files><name>testcase</name><desc>zzz</desc><content></content><data-file-name>D:\work\CDChamber\data\result.xml</data-file-name></CDRomType>
\ No newline at end of file
--- 1,2 ----
  <?xml version="1.0" encoding="UTF-8"?>
! <CDRomType valid="true" date="1025147775000" files-count="3" size="9525"><files files-count="2" date="1025069812000" size="9525" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>testtools</name><files files-count="2" date="1025149792000" size="4763" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>difffiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2382" valid="true"><name>file2.txt</name></files><content></content></files><files files-count="2" date="1025069812000" size="4762" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType"><name>samefiles</name><files date="1024728070000" size="2381" valid="true"><name>file1.txt</name></files><files date="1024728070000" size="2381" valid="true"><name>file2.txt</name></files><content></content></files><content></content><desc>3</desc></files><files date="1024999342000" size="0" valid="true"><name>nullFile</name></files><files files-count="0" date="1025086602000" size="0" valid="true" xsi:type="java:org.cdchamber.elements.DirectoryType" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"><name>nulldir</name><content></content><desc>fff</desc></files><name>testcase</name><desc>zzz</desc><content></content><data-file-name>D:\work\CDChamber\data\result.xml</data-file-name></CDRomType>
\ No newline at end of file

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/elements JarEntryParserTest.java,1.6,NONE

From: <sim...@us...> - 2002-07-31 02:16:25

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv16594/test/src/org/cdchamber/elements

Removed Files:
	JarEntryParserTest.java 
Log Message:
Remove the unnecessary testcase

--- JarEntryParserTest.java DELETED ---

[CDChamber-cvscommit] CDChamber TODO.txt,1.18,1.19

From: <sim...@us...> - 2002-07-31 02:16:25

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv16594

Modified Files:
	TODO.txt 
Log Message:
Remove the unnecessary testcase

Index: TODO.txt
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/TODO.txt,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** TODO.txt	31 Jul 2002 01:58:14 -0000	1.18
--- TODO.txt	31 Jul 2002 02:16:22 -0000	1.19
***************
*** 17,20 ****
--- 17,21 ----
  x : Let the table can be sorted.
  x : Release one alpha version
+ x : Can't deal with large bad zip file. :(
  + : Add status bar.
  + : Add Save All.
***************
*** 23,25 ****
  + : Add password protect.
  + : Add data file encrypt
- + : Can't deal with large bad zip file. :(
\ No newline at end of file
--- 24,25 ----

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/elements FileTypeFactoryTest.java,NONE,1.1

From: <cry...@us...> - 2002-07-31 02:10:17

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv14968

Added Files:
	FileTypeFactoryTest.java 
Log Message:
add test for FileTypeFactory's factory method


--- NEW FILE: FileTypeFactoryTest.java ---
// 	$Id: FileTypeFactoryTest.java,v 1.1 2002/07/31 02:10:12 crystal_y Exp $	
package org.cdchamber.elements;

import junit.framework.*;
import org.cdchamber.parser.FileParseException;
import org.cdchamber.util.DirPath;
import java.io.File;


public class FileTypeFactoryTest extends TestCase {

	public FileTypeFactoryTest(String name) {
		super(name);
	}

	public void setUp() {

	}

	public void tearDown() {

	}

	public void testFileType() {
		File file = new File(DirPath.TestCaseDir + DirPath.SEP + "nullFile");
		try {
			FileType fileType = FileTypeFactory.createFileType(file);
			if ( !(fileType instanceof FileType )) {
				fail("should return a FileType instance");
			} // end of if ()
			 
		} catch (FileParseException e) {
			fail("should no exception throwed out)");
		} // end of try-catch
		
		
	}

	public void testDirType() {
		File file = new File(DirPath.TestCaseDir + DirPath.SEP + "nulldir");
		try {
			FileType fileType = FileTypeFactory.createFileType(file);
			if ( !(fileType instanceof DirectoryType )) {
				fail("should return a DirectoryType instance");
			} // end of if ()
			 
		} catch (FileParseException e) {
			fail("should no exception throwed out)");
		} // end of try-catch
	}

	public void testCompressType() {
		File file = new File(DirPath.TestCaseDir + DirPath.SEP + "testcase.zip");
		try {
			FileType fileType = FileTypeFactory.createFileType(file);
			if ( !(fileType instanceof CompressedFileType )) {
				fail("should return a CompressedFileType instance");
			} // end of if ()
			 
		} catch (FileParseException e) {
			fail("should no exception throwed out)");
		} // end of try-catch
	}

	public void testBadCompressType() {
		File file = new File(DirPath.TestCaseDir + DirPath.SEP + "bad.zip");
		try {
			FileType fileType = FileTypeFactory.createFileType(file);
			if ( !(fileType instanceof FileType )) {
				fail("should return a FileType instance");
			} // end of if ()
			 
		} catch (FileParseException e) {
			fail("should no exception throwed out)");
		} // end of try-catch
		
		
	}

}

[CDChamber-cvscommit] CDChamber/test/src/org/cdchamber/elements JarEntryParserTest.java,1.5,1.6

From: <sim...@us...> - 2002-07-31 01:58:17

Update of /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv12233/test/src/org/cdchamber/elements

Modified Files:
	JarEntryParserTest.java 
Log Message:
Bug fix for take a long time to read large bad zipfile.

Index: JarEntryParserTest.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/test/src/org/cdchamber/elements/JarEntryParserTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JarEntryParserTest.java	29 Jul 2002 09:42:46 -0000	1.5
--- JarEntryParserTest.java	31 Jul 2002 01:58:14 -0000	1.6
***************
*** 8,16 ****
  
  import java.util.jar.JarFile;
  
  import org.cdchamber.util.DirPath;
  import org.cdchamber.elements.EntryParser;
  import org.cdchamber.elements.DirectoryType;
! import net.sf.jazzlib.ZipFile;
  
  public class JarEntryParserTest extends TestCase {
--- 8,17 ----
  
  import java.util.jar.JarFile;
+ import java.io.FileInputStream;
  
  import org.cdchamber.util.DirPath;
  import org.cdchamber.elements.EntryParser;
  import org.cdchamber.elements.DirectoryType;
! import net.sf.jazzlib.ZipInputStream;
  
  public class JarEntryParserTest extends TestCase {
***************
*** 37,41 ****
  
      public void testZipParser() throws Exception {
!         ZipFile zipFile = new ZipFile( DirPath.TestCaseDir + DirPath.SEP + "testcase.zip");
          DirectoryType dir = new DirectoryType();
          EntryParser parser = new EntryParser( dir, EntryWrapper.getEntryWrapper(zipFile));
--- 38,42 ----
  
      public void testZipParser() throws Exception {
!         ZipInputStream zipFile = new ZipInputStream( new FileInputStream( DirPath.TestCaseDir + DirPath.SEP + "testcase.zip"));
          DirectoryType dir = new DirectoryType();
          EntryParser parser = new EntryParser( dir, EntryWrapper.getEntryWrapper(zipFile));

[CDChamber-cvscommit] CDChamber TODO.txt,1.17,1.18

From: <sim...@us...> - 2002-07-31 01:58:17

Update of /cvsroot/cdchamber/CDChamber
In directory usw-pr-cvs1:/tmp/cvs-serv12233

Modified Files:
	TODO.txt 
Log Message:
Bug fix for take a long time to read large bad zipfile.

Index: TODO.txt
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/TODO.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** TODO.txt	30 Jul 2002 05:12:12 -0000	1.17
--- TODO.txt	31 Jul 2002 01:58:14 -0000	1.18
***************
*** 16,19 ****
  x : GUI need to be made more beautiful and friendly.
  x : Let the table can be sorted.
  + : Add status bar.
! + : Release one alpha version
\ No newline at end of file
--- 16,25 ----
  x : GUI need to be made more beautiful and friendly.
  x : Let the table can be sorted.
+ x : Release one alpha version
  + : Add status bar.
! + : Add Save All.
! + : Use different color to indicate modified or not.
! + : Add notify when modified not saved.
! + : Add password protect.
! + : Add data file encrypt
! + : Can't deal with large bad zip file. :(
\ No newline at end of file

[CDChamber-cvscommit] CDChamber/aspect/gen/org/cdchamber/elements CompressedFileTypeWrapper.java,1.5,1.6 EntryParser.java,1.2,1.3 EntryWrapper.java,1.1,1.2

From: <sim...@us...> - 2002-07-31 01:58:17

Update of /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements
In directory usw-pr-cvs1:/tmp/cvs-serv12233/aspect/gen/org/cdchamber/elements

Modified Files:
	CompressedFileTypeWrapper.java EntryParser.java 
	EntryWrapper.java 
Log Message:
Bug fix for take a long time to read large bad zipfile.

Index: CompressedFileTypeWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/CompressedFileTypeWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CompressedFileTypeWrapper.java	28 Jul 2002 13:41:27 -0000	1.5
--- CompressedFileTypeWrapper.java	31 Jul 2002 01:58:14 -0000	1.6
***************
*** 12,17 ****
--- 12,19 ----
  import java.io.IOException;
  import java.io.File;
+ import java.io.FileInputStream;
  import net.sf.jazzlib.ZipFile;
  import net.sf.jazzlib.ZipEntry;
+ import net.sf.jazzlib.ZipInputStream;
  
  public aspect CompressedFileTypeWrapper{
***************
*** 29,33 ****
              EntryWrapper entryWrapper;
              if ( fileName.endsWith(".jar")) entryWrapper = EntryWrapper.getEntryWrapper(new JarFile( fileName));
!             else entryWrapper = EntryWrapper.getEntryWrapper(new ZipFile( fileName));
              EntryParser entryParser= new EntryParser(this, entryWrapper);
              entryParser.parseEntries();
--- 31,35 ----
              EntryWrapper entryWrapper;
              if ( fileName.endsWith(".jar")) entryWrapper = EntryWrapper.getEntryWrapper(new JarFile( fileName));
!             else entryWrapper = EntryWrapper.getEntryWrapper(new ZipInputStream( new FileInputStream(fileName)));
              EntryParser entryParser= new EntryParser(this, entryWrapper);
              entryParser.parseEntries();

Index: EntryParser.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/EntryParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** EntryParser.java	29 Jul 2002 08:54:21 -0000	1.2
--- EntryParser.java	31 Jul 2002 01:58:14 -0000	1.3
***************
*** 28,32 ****
      }
  
!     public void parseEntries() {
  
          while ( entryWrapper.hasMoreElements()) {
--- 28,32 ----
      }
  
!     public void parseEntries() throws IOException {
  
          while ( entryWrapper.hasMoreElements()) {

Index: EntryWrapper.java
===================================================================
RCS file: /cvsroot/cdchamber/CDChamber/aspect/gen/org/cdchamber/elements/EntryWrapper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EntryWrapper.java	28 Jul 2002 13:41:27 -0000	1.1
--- EntryWrapper.java	31 Jul 2002 01:58:14 -0000	1.2
***************
*** 5,10 ****
  package org.cdchamber.elements;
  
! import net.sf.jazzlib.ZipFile;
! import net.sf.jazzlib.ZipEntry;
  
  import java.util.jar.JarFile;
--- 5,9 ----
  package org.cdchamber.elements;
  
! import net.sf.jazzlib.*;
  
  import java.util.jar.JarFile;
***************
*** 18,22 ****
          if ( obj instanceof JarFile ) {
              return new JarFileWrapper( (JarFile)obj);
!         } return new ZipFileWrapper( (ZipFile)obj);
      }
  
--- 17,21 ----
          if ( obj instanceof JarFile ) {
              return new JarFileWrapper( (JarFile)obj);
!         } return new ZipFileWrapper( (ZipInputStream)obj);
      }
  
***************
*** 25,29 ****
      public abstract void nextElement();
  
!     public abstract boolean hasMoreElements();
  
      public abstract String getName();
--- 24,28 ----
      public abstract void nextElement();
  
!     public abstract boolean hasMoreElements() throws IOException;
  
      public abstract String getName();
***************
*** 35,49 ****
  
  class ZipFileWrapper extends EntryWrapper {
!     private ZipFile zipFile;
!     private Enumeration enu;
      private ZipEntry entry;
  
!     public ZipFileWrapper( ZipFile zipFile) {
!         this.zipFile = zipFile;
!         enu = zipFile.entries();
      }
  
      public void close() throws IOException {
!         zipFile.close();
      }
  
--- 34,46 ----
  
  class ZipFileWrapper extends EntryWrapper {
!     private ZipInputStream zis;
      private ZipEntry entry;
  
!     public ZipFileWrapper( ZipInputStream zis) {
!         this.zis = zis;
      }
  
      public void close() throws IOException {
!         zis.close();
      }
  
***************
*** 60,71 ****
      }
  
!     public boolean hasMoreElements() {
!         return enu.hasMoreElements();
      }
  
      public void nextElement() {
-         entry = (ZipEntry)enu.nextElement();
      }
- 
  }
  
--- 57,67 ----
      }
  
!     public boolean hasMoreElements() throws IOException {
!         entry = zis.getNextEntry();
!         return entry!=null;
      }
  
      public void nextElement() {
      }
  }

Flat | Threaded

<< < 1 2 3 4 .. 16 > >> (Page 2 of 16)

2002	Jan	Feb	Mar	Apr	May	Jun (111)	Jul (258)	Aug (21)	Sep	Oct	Nov	Dec
2003	Jan	Feb	Mar	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec