Author: toad
Date: 2008-11-13 19:37:41 +0000 (Thu, 13 Nov 2008)
New Revision: 23535
Removed:
branches/db4o/freenet/test/freenet/support/compress/CompressorTest.java
Modified:
branches/db4o/freenet/build.xml
branches/db4o/freenet/src/freenet/node/Version.java
Log:
Merge 1167 into trunk: 23117 to 23166
Modified: branches/db4o/freenet/build.xml
===================================================================
--- branches/db4o/freenet/build.xml 2008-11-13 19:34:01 UTC (rev 23534)
+++ branches/db4o/freenet/build.xml 2008-11-13 19:37:41 UTC (rev 23535)
@@ -75,7 +75,7 @@
<!-- Create the build directory structure used by compile -->
- <javac srcdir="${src}" destdir="${build}" debug="on"
optimize="on" source="1.5">
+ <javac srcdir="${src}" destdir="${build}" debug="on"
optimize="on" source="1.5" target="1.5">
<classpath>
<pathelement
location="${freenet-ext.location}"/>
<pathelement location="gnu-crypto.jar"/>
@@ -132,7 +132,7 @@
<delete dir="${build-test}"/>
<mkdir dir="${build-test}"/>
- <javac srcdir="${test}" destdir="${build-test}" debug="on"
optimize="on" source="1.5">
+ <javac srcdir="${test}" destdir="${build-test}" debug="on"
optimize="on" source="1.5" target="1.5">
<classpath>
<pathelement path="${build}"/>
<pathelement
location="${freenet-ext.location}"/>
Modified: branches/db4o/freenet/src/freenet/node/Version.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/Version.java 2008-11-13 19:34:01 UTC
(rev 23534)
+++ branches/db4o/freenet/src/freenet/node/Version.java 2008-11-13 19:37:41 UTC
(rev 23535)
@@ -24,7 +24,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- private static final int buildNumber = 1166;
+ private static final int buildNumber = 1167;
/** Oldest build of Fred we will talk to */
private static final int oldLastGoodBuild = 1165;
Deleted: branches/db4o/freenet/test/freenet/support/compress/CompressorTest.java
===================================================================
--- branches/db4o/freenet/test/freenet/support/compress/CompressorTest.java
2008-11-13 19:34:01 UTC (rev 23534)
+++ branches/db4o/freenet/test/freenet/support/compress/CompressorTest.java
2008-11-13 19:37:41 UTC (rev 23535)
@@ -1,52 +0,0 @@
-/*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package freenet.support.compress;
-
-import junit.framework.TestCase;
-
-/**
- * Test case for [EMAIL PROTECTED] freenet.support.compress.Compressor} class.
- *
- * @author stuart martin <[EMAIL PROTECTED]>
- */
-public class CompressorTest extends TestCase {
-
- /**
- * test abstract class and accessors for logical consistency
- */
- public void testCompressor(){
-
- // force us to notice when we modify the number of supported
compressors
- int algos = Compressor.countCompressAlgorithms();
- assertEquals(1, algos);
-
- for(int i = 0; i < algos; i++){
- Compressor compressorByDifficulty =
-
Compressor.getCompressionAlgorithmByDifficulty(i); // FIXME: int vs.
short
- Compressor compressorByMetadataId =
-
Compressor.getCompressionAlgorithmByMetadataID((short)i); // FIXME: int vs.
short
-
- // check the codec number equals the index into the
algorithm list
-
assertEquals(i,compressorByDifficulty.codecNumberForMetadata());
-
- // check that the compressor obtained by difficulty
index is the same
- // as the compressor obtained by metadata id
- assertEquals(compressorByDifficulty,
compressorByMetadataId);
- }
- }
-
-}
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
