Upgraded Spongy Castle to 1.53, fixed tests. #146

This commit is contained in:
akwizgran
2015-12-03 11:12:16 +00:00
parent 427efdc7d6
commit 8ae3fb3e35
14 changed files with 22 additions and 48 deletions

View File

@@ -12,6 +12,6 @@
<classpathentry kind="lib" path="libs/jmock-2.5.1.jar"/>
<classpathentry kind="lib" path="libs/junit-4.9b3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
<classpathentry kind="lib" path="/briar-core/libs/lcrypto-jdk15on-152.jar"/>
<classpathentry kind="lib" path="/briar-core/libs/spongy-core-1.53.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

View File

@@ -13,7 +13,7 @@
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
@@ -30,8 +30,8 @@
<orderEntry type="module" module-name="briar-desktop" exported="" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" />
<orderEntry type="library" exported="" name="h2small-1.4.190.jar" level="project" />
<orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
<orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_h2small_1_3_170_jar" level="project" />
<orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_lcrypto_jdk15on_152_jar" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="bluecove-2.1.1-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="jna-4.1.0" level="project" />

View File

@@ -27,7 +27,7 @@ public class BasicH2Test extends BriarTestCase {
private final File testDir = TestUtils.getTestDirectory();
private final File db = new File(testDir, "db");
private final String url = "jdbc:h2:" + db.getPath();
private final String url = "jdbc:h2:" + db.getAbsolutePath();
private Connection connection = null;
@@ -106,19 +106,19 @@ public class BasicH2Test extends BriarTestCase {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, -128
0, 0, 0, 0, 0, 0, 0, 0
};
byte[] second = new byte[] {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0
0, 0, 0, 0, 0, 0, 0, 127
};
byte[] third = new byte[] {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 127
0, 0, 0, 0, 0, 0, 0, (byte) 255
};
// Create the table
createTable(connection);