From fd99dd7573c1c12a89ba90fac0c1050373e3ec89 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Fri, 29 Jan 2016 15:35:25 +0000
Subject: [PATCH] Updated a unit test for storing settings.
---
briar-tests/src/org/briarproject/db/H2DatabaseTest.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
index 5fe90fdd13..cce4c88347 100644
--- a/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
+++ b/briar-tests/src/org/briarproject/db/H2DatabaseTest.java
@@ -514,21 +514,20 @@ public class H2DatabaseTest extends BriarTestCase {
Database<Connection> db = open(false);
Connection txn = db.startTransaction();
- // Add a transport to the database
- db.addTransport(txn, transportId, 123);
-
- // Set the transport config
+ // Store some settings
Settings s = new Settings();
s.put("foo", "foo");
s.put("bar", "bar");
db.mergeSettings(txn, s, "test");
assertEquals(s, db.getSettings(txn, "test"));
- // Update one of the properties and add another
+ // Update one of the settings and add another
Settings s1 = new Settings();
s1.put("bar", "baz");
s1.put("bam", "bam");
db.mergeSettings(txn, s1, "test");
+
+ // Check that the settings were merged
Settings merged = new Settings();
merged.put("foo", "foo");
merged.put("bar", "baz");
--
GitLab