From 1d5928be46e16d1ef10fc36682f6558340a334eb Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Thu, 3 Jan 2013 21:57:03 +0000
Subject: [PATCH] Fixed a long-broken test (the return type of a method had
changed).
---
.../src/net/sf/briar/db/H2DatabaseTest.java | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java b/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
index e1a6ec5ca9..d31ac8a8fd 100644
--- a/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
+++ b/briar-tests/src/net/sf/briar/db/H2DatabaseTest.java
@@ -1005,7 +1005,8 @@ public class H2DatabaseTest extends BriarTestCase {
properties.put("foo", "foo");
properties.put("bar", "bar");
db.mergeLocalProperties(txn, transportId, properties);
- assertEquals(Collections.singletonList(properties),
+ Transport transport = new Transport(transportId, properties);
+ assertEquals(Collections.singletonList(transport),
db.getLocalTransports(txn));
// Update one of the properties and add another
@@ -1013,11 +1014,12 @@ public class H2DatabaseTest extends BriarTestCase {
properties1.put("bar", "baz");
properties1.put("bam", "bam");
db.mergeLocalProperties(txn, transportId, properties1);
- TransportProperties expected = new TransportProperties();
- expected.put("foo", "foo");
- expected.put("bar", "baz");
- expected.put("bam", "bam");
- assertEquals(Collections.singletonList(expected),
+ TransportProperties merged = new TransportProperties();
+ merged.put("foo", "foo");
+ merged.put("bar", "baz");
+ merged.put("bam", "bam");
+ Transport transport1 = new Transport(transportId, merged);
+ assertEquals(Collections.singletonList(transport1),
db.getLocalTransports(txn));
db.commitTransaction(txn);
--
GitLab