propagate from branch 'i2p.i2p' (head 3002b47d5d20180f84fb6a4f161823bc751989be)

to branch 'i2p.i2p.unittests' (head 97dc8de19916c3d0c7ec42790800c1e23f9ce9e8)
This commit is contained in:
str4d
2012-03-30 05:10:53 +00:00
13 changed files with 434 additions and 139 deletions

View File

@@ -5,9 +5,6 @@
<target name="builddep">
<!-- run from top level build.xml to get dependencies built -->
</target>
<target name="builddeptest">
<ant dir="../../core/java/" target="jarTest" />
</target>
<condition property="depend.available">
<typefound name="depend" />
</condition>
@@ -42,17 +39,6 @@
</javac>
</target>
<target name="compileTest" depends="builddeptest">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<!-- junit classes are in ant runtime -->
<javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
includeAntRuntime="true"
destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
<target name="listChangedFiles" if="mtn.available" >
<exec executable="mtn" outputproperty="workspace.changes" errorproperty="mtn.error2" failifexecutionfails="false" >
<arg value="list" />
@@ -89,9 +75,6 @@
</uptodate>
</target>
<target name="jarTest" depends="compileTest">
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
<target name="javadoc">
<mkdir dir="./build" />
<mkdir dir="./build/javadoc" />
@@ -102,41 +85,76 @@
splitindex="true"
windowtitle="I2P Router" />
</target>
<target name="test" depends="compileTest">
<junit printsummary="on" fork="yes">
<classpath>
<pathelement path="${classpath}" />
<pathelement location="./build/obj" />
<pathelement location="../../core/java/build/i2ptest.jar" />
<pathelement location="../../installer/lib/jbigi/jbigi.jar" />
<pathelement path="${ant.home}/lib/clover.jar"/>
</classpath>
<batchtest>
<fileset dir="./test/">
<include name="**/*Test.java" />
</fileset>
</batchtest>
<formatter type="xml"/>
</junit>
<mkdir dir="../../reports/" />
<mkdir dir="../../reports/router/" />
<!-- unit tests -->
<target name="builddeptest">
<ant dir="../../core/java/" target="jarTest" />
</target>
<target name="compileTest" depends="builddeptest">
<mkdir dir="./build" />
<mkdir dir="./build/obj" />
<!-- junit classes are in ant runtime -->
<javac srcdir="./src:./test" debug="true" source="1.5" target="1.5" deprecation="on"
includeAntRuntime="true"
destdir="./build/obj" classpath="../../core/java/build/i2ptest.jar" >
<compilerarg line="${javac.compilerargs}" />
</javac>
</target>
<target name="jarTest" depends="compileTest">
<jar destfile="./build/routertest.jar" basedir="./build/obj" includes="**/*.class" />
</target>
<!-- preparation of code coverage tool of choice -->
<target name="prepareClover" depends="compileTest" if="with.clover">
<taskdef resource="clovertasks"/>
<mkdir dir="../../reports/router/clover" />
<clover-setup initString="../../reports/router/clover/coverage.db"/>
</target>
<target name="prepareCobertura" depends="compileTest" if="with.cobertura">
<taskdef classpath="${with.cobertura}" resource="tasks.properties" onerror="report" />
<mkdir dir="./build/obj_cobertura" />
<delete file="./cobertura.ser" />
<cobertura-instrument todir="./build/obj_cobertura">
<fileset dir="./build/obj">
<include name="**/*.class"/>
<exclude name="**/*Test.class" />
</fileset>
</cobertura-instrument>
</target>
<target name="prepareTest" depends="prepareClover, prepareCobertura" />
<!-- end preparation of code coverage tool -->
<target name="test" depends="clean, compileTest, prepareTest">
<mkdir dir="../../reports/router/junit/" />
<delete>
<fileset dir="../../reports/router/junit">
<include name="TEST-*.xml"/>
</fileset>
</delete>
<copy todir="../../reports/router/junit">
<fileset dir=".">
<include name="TEST-*.xml"/>
</fileset>
</copy>
<delete>
<fileset dir=".">
<include name="TEST-*.xml"/>
</fileset>
</delete>
<junit printsummary="on" fork="yes">
<sysproperty key="net.sourceforge.cobertura.datafile" file="./cobertura.ser" />
<classpath>
<pathelement path="${classpath}" />
<pathelement location="./build/obj_cobertura" />
<pathelement location="./build/obj" />
<pathelement location="../../core/java/build/i2ptest.jar" />
<pathelement location="../../build/jbigi.jar" />
<pathelement location="${with.clover}" />
<pathelement location="${with.cobertura}" />
</classpath>
<batchtest todir="../../reports/router/junit/">
<fileset dir="./test/">
<include name="**/*Test.java" />
</fileset>
</batchtest>
<formatter type="xml"/>
</junit>
<!-- fetch the real hostname of this machine -->
<exec executable="hostname" outputproperty="host.name"/>
<!-- set if unset -->
<property name="host.fakename" value="i2ptester" />
<!-- replace hostname that junit inserts into reports with fake one -->
<replace dir="../../reports/router/junit/" token="${host.name}" value="${host.fakename}"/>
</target>
<!-- test reports -->
<target name="junit.report">
<junitreport todir="../../reports/router/junit">
<fileset dir="../../reports/router/junit">
@@ -145,28 +163,25 @@
<report format="frames" todir="../../reports/router/html/junit"/>
</junitreport>
</target>
<target name="clover.report">
<taskdef resource="clovertasks"/>
<mkdir dir="../../reports/" />
<mkdir dir="../../reports/router" />
<mkdir dir="../../reports/router/clover" />
<clover-setup initString="../../reports/router/clover/coverage.db"/>
<target name="clover.report" depends="test" if="with.clover">
<clover-report>
<current outfile="../../reports/router/html/clover">
<format type="html"/>
</current>
</clover-report>
</target>
<target name="test.report" depends="junit.report, clover.report"/>
<target name="useclover">
<taskdef resource="clovertasks"/>
<mkdir dir="../../reports/" />
<mkdir dir="../../reports/router/" />
<mkdir dir="../../reports/router/clover" />
<clover-setup initString="../../reports/router/clover/coverage.db"/>
<target name="cobertura.report" depends="test" if="with.cobertura">
<mkdir dir="../../reports/router/cobertura" />
<cobertura-report format="xml" srcdir="./src" destdir="../../reports/router/cobertura" />
<mkdir dir="../../reports/router/html/cobertura" />
<cobertura-report format="html" srcdir="./src" destdir="../../reports/router/html/cobertura" />
<delete file="./cobertura.ser" />
</target>
<target name="fulltest" depends="cleandep, builddeptest, jarTest, test, junit.report" />
<target name="fullclovertest" depends="cleandep, builddeptest, useclover, jarTest, test, test.report" />
<target name="test.report" depends="junit.report, clover.report, cobertura.report"/>
<!-- end test reports -->
<target name="fulltest" depends="cleandep, builddeptest, jarTest, test, test.report" />
<!-- end unit tests -->
<target name="clean">
<delete dir="./build" />
</target>

View File

@@ -0,0 +1,49 @@
package net.i2p.router.transport.crypto;
/*
* free (adj.): unencumbered; not under the control of others
* Written by jrandom in 2003 and released into the public domain
* with no warranty of any kind, either expressed or implied.
* It probably won't make your computer catch on fire, or eat
* your children, but it might. Use at your own risk.
*
*/
import java.math.BigInteger;
import junit.framework.TestCase;
import net.i2p.I2PAppContext;
import net.i2p.data.SessionKey;
import net.i2p.util.RandomSource;
public class DHSessionKeyBuilderTest extends TestCase {
public void testDHSessionKeyBuilder(){
I2PAppContext ctx = new I2PAppContext();
for (int i = 0; i < 5; i++) {
DHSessionKeyBuilder builder1 = new DHSessionKeyBuilder();
DHSessionKeyBuilder builder2 = new DHSessionKeyBuilder();
BigInteger pub1 = builder1.getMyPublicValue();
BigInteger pub2 = builder2.getMyPublicValue();
try {
builder2.setPeerPublicValue(pub1);
builder1.setPeerPublicValue(pub2);
} catch (DHSessionKeyBuilder.InvalidPublicParameterException ippe) {
assertTrue(ippe.getMessage(), true);
}
SessionKey key1 = builder1.getSessionKey();
SessionKey key2 = builder2.getSessionKey();
assertEquals(key1, key2);
byte iv[] = new byte[16];
RandomSource.getInstance().nextBytes(iv);
String origVal = "1234567890123456"; // 16 bytes max using AESEngine
byte enc[] = new byte[16];
byte dec[] = new byte[16];
ctx.aes().encrypt(origVal.getBytes(), 0, enc, 0, key1, iv, 16);
ctx.aes().decrypt(enc, 0, dec, 0, key2, iv, 16);
String tranVal = new String(dec);
assertEquals(origVal, tranVal);
}
}
}