From 7a0e22d44c14fb36e62fe9a254ea9d8fd6225abf Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 7 Sep 2012 12:47:05 +0100
Subject: [PATCH] Renamed clock API package and fixed a test.
---
api/net/sf/briar/{ => api}/clock/Clock.java | 2 +-
api/net/sf/briar/{ => api}/clock/SystemClock.java | 2 +-
components/net/sf/briar/clock/ClockModule.java | 3 +++
components/net/sf/briar/db/DatabaseComponentImpl.java | 2 +-
components/net/sf/briar/db/DatabaseModule.java | 2 +-
components/net/sf/briar/db/H2Database.java | 2 +-
components/net/sf/briar/db/JdbcDatabase.java | 2 +-
.../net/sf/briar/plugins/bluetooth/BluetoothPlugin.java | 2 +-
.../sf/briar/plugins/bluetooth/BluetoothPluginFactory.java | 2 +-
test/net/sf/briar/db/DatabaseComponentImplTest.java | 2 +-
test/net/sf/briar/db/H2DatabaseTest.java | 6 ++++--
.../net/sf/briar/plugins/bluetooth/BluetoothClientTest.java | 2 +-
.../net/sf/briar/plugins/bluetooth/BluetoothServerTest.java | 2 +-
13 files changed, 18 insertions(+), 13 deletions(-)
rename api/net/sf/briar/{ => api}/clock/Clock.java (87%)
rename api/net/sf/briar/{ => api}/clock/SystemClock.java (83%)
diff --git a/api/net/sf/briar/clock/Clock.java b/api/net/sf/briar/api/clock/Clock.java
similarity index 87%
rename from api/net/sf/briar/clock/Clock.java
rename to api/net/sf/briar/api/clock/Clock.java
index 701d11412b..c2258c0647 100644
--- a/api/net/sf/briar/clock/Clock.java
+++ b/api/net/sf/briar/api/clock/Clock.java
@@ -1,4 +1,4 @@
-package net.sf.briar.clock;
+package net.sf.briar.api.clock;
/**
* An interface for time-related system functions that allows them to be
diff --git a/api/net/sf/briar/clock/SystemClock.java b/api/net/sf/briar/api/clock/SystemClock.java
similarity index 83%
rename from api/net/sf/briar/clock/SystemClock.java
rename to api/net/sf/briar/api/clock/SystemClock.java
index 460b147e89..a0610355f6 100644
--- a/api/net/sf/briar/clock/SystemClock.java
+++ b/api/net/sf/briar/api/clock/SystemClock.java
@@ -1,4 +1,4 @@
-package net.sf.briar.clock;
+package net.sf.briar.api.clock;
/** Default clock implementation. */
public class SystemClock implements Clock {
diff --git a/components/net/sf/briar/clock/ClockModule.java b/components/net/sf/briar/clock/ClockModule.java
index 42ad9217f9..f394211cc3 100644
--- a/components/net/sf/briar/clock/ClockModule.java
+++ b/components/net/sf/briar/clock/ClockModule.java
@@ -1,5 +1,8 @@
package net.sf.briar.clock;
+import net.sf.briar.api.clock.Clock;
+import net.sf.briar.api.clock.SystemClock;
+
import com.google.inject.AbstractModule;
public class ClockModule extends AbstractModule {
diff --git a/components/net/sf/briar/db/DatabaseComponentImpl.java b/components/net/sf/briar/db/DatabaseComponentImpl.java
index ad21a135f0..408d415095 100644
--- a/components/net/sf/briar/db/DatabaseComponentImpl.java
+++ b/components/net/sf/briar/db/DatabaseComponentImpl.java
@@ -25,6 +25,7 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.Rating;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
+import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
@@ -61,7 +62,6 @@ import net.sf.briar.api.protocol.TransportIndex;
import net.sf.briar.api.protocol.TransportUpdate;
import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionWindow;
-import net.sf.briar.clock.Clock;
import net.sf.briar.util.ByteUtils;
import com.google.inject.Inject;
diff --git a/components/net/sf/briar/db/DatabaseModule.java b/components/net/sf/briar/db/DatabaseModule.java
index 9c2b4b0210..bb51aa89c0 100644
--- a/components/net/sf/briar/db/DatabaseModule.java
+++ b/components/net/sf/briar/db/DatabaseModule.java
@@ -4,6 +4,7 @@ import java.io.File;
import java.sql.Connection;
import java.util.concurrent.Executor;
+import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.Password;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DatabaseDirectory;
@@ -15,7 +16,6 @@ import net.sf.briar.api.protocol.GroupFactory;
import net.sf.briar.api.protocol.PacketFactory;
import net.sf.briar.api.transport.ConnectionContextFactory;
import net.sf.briar.api.transport.ConnectionWindowFactory;
-import net.sf.briar.clock.Clock;
import net.sf.briar.util.BoundedExecutor;
import com.google.inject.AbstractModule;
diff --git a/components/net/sf/briar/db/H2Database.java b/components/net/sf/briar/db/H2Database.java
index 42bc5622d0..ed1dd1d47e 100644
--- a/components/net/sf/briar/db/H2Database.java
+++ b/components/net/sf/briar/db/H2Database.java
@@ -8,6 +8,7 @@ import java.sql.SQLException;
import java.util.Arrays;
import java.util.Properties;
+import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.Password;
import net.sf.briar.api.db.DatabaseDirectory;
import net.sf.briar.api.db.DatabaseMaxSize;
@@ -16,7 +17,6 @@ import net.sf.briar.api.db.DbException;
import net.sf.briar.api.protocol.GroupFactory;
import net.sf.briar.api.transport.ConnectionContextFactory;
import net.sf.briar.api.transport.ConnectionWindowFactory;
-import net.sf.briar.clock.Clock;
import org.apache.commons.io.FileSystemUtils;
diff --git a/components/net/sf/briar/db/JdbcDatabase.java b/components/net/sf/briar/db/JdbcDatabase.java
index 8d5d87eaeb..b3a42ac5e5 100644
--- a/components/net/sf/briar/db/JdbcDatabase.java
+++ b/components/net/sf/briar/db/JdbcDatabase.java
@@ -24,6 +24,7 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.Rating;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
+import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
import net.sf.briar.api.db.Status;
@@ -42,7 +43,6 @@ import net.sf.briar.api.transport.ConnectionContext;
import net.sf.briar.api.transport.ConnectionContextFactory;
import net.sf.briar.api.transport.ConnectionWindow;
import net.sf.briar.api.transport.ConnectionWindowFactory;
-import net.sf.briar.clock.Clock;
import net.sf.briar.util.FileUtils;
/**
diff --git a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
index 2d295bc939..10f7057ca2 100644
--- a/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
+++ b/components/net/sf/briar/plugins/bluetooth/BluetoothPlugin.java
@@ -26,13 +26,13 @@ import javax.microedition.io.StreamConnectionNotifier;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportProperties;
+import net.sf.briar.api.clock.Clock;
import net.sf.briar.api.crypto.PseudoRandom;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexTransportConnection;
import net.sf.briar.api.protocol.TransportId;
-import net.sf.briar.clock.Clock;
import net.sf.briar.util.OsUtils;
import net.sf.briar.util.StringUtils;
diff --git a/components/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java b/components/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java
index c1b49e2431..e5c165209f 100644
--- a/components/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java
+++ b/components/net/sf/briar/plugins/bluetooth/BluetoothPluginFactory.java
@@ -2,11 +2,11 @@ package net.sf.briar.plugins.bluetooth;
import java.util.concurrent.Executor;
+import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.plugins.PluginExecutor;
import net.sf.briar.api.plugins.duplex.DuplexPlugin;
import net.sf.briar.api.plugins.duplex.DuplexPluginCallback;
import net.sf.briar.api.plugins.duplex.DuplexPluginFactory;
-import net.sf.briar.clock.SystemClock;
public class BluetoothPluginFactory implements DuplexPluginFactory {
diff --git a/test/net/sf/briar/db/DatabaseComponentImplTest.java b/test/net/sf/briar/db/DatabaseComponentImplTest.java
index 474be1e37a..389bb46a63 100644
--- a/test/net/sf/briar/db/DatabaseComponentImplTest.java
+++ b/test/net/sf/briar/db/DatabaseComponentImplTest.java
@@ -5,11 +5,11 @@ import static net.sf.briar.db.DatabaseConstants.MIN_FREE_SPACE;
import java.util.Collections;
+import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.db.DatabaseComponent;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.lifecycle.ShutdownManager;
import net.sf.briar.api.protocol.PacketFactory;
-import net.sf.briar.clock.SystemClock;
import net.sf.briar.db.DatabaseCleaner.Callback;
import org.jmock.Expectations;
diff --git a/test/net/sf/briar/db/H2DatabaseTest.java b/test/net/sf/briar/db/H2DatabaseTest.java
index 2c743f7b72..0451fe9f5b 100644
--- a/test/net/sf/briar/db/H2DatabaseTest.java
+++ b/test/net/sf/briar/db/H2DatabaseTest.java
@@ -24,6 +24,7 @@ import net.sf.briar.api.ContactId;
import net.sf.briar.api.Rating;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
+import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.api.crypto.Password;
import net.sf.briar.api.db.DbException;
import net.sf.briar.api.db.MessageHeader;
@@ -42,7 +43,7 @@ import net.sf.briar.api.transport.ConnectionContextFactory;
import net.sf.briar.api.transport.ConnectionWindow;
import net.sf.briar.api.transport.ConnectionWindowFactory;
import net.sf.briar.api.transport.TransportConstants;
-import net.sf.briar.clock.SystemClock;
+import net.sf.briar.clock.ClockModule;
import net.sf.briar.crypto.CryptoModule;
import net.sf.briar.lifecycle.LifecycleModule;
import net.sf.briar.protocol.ProtocolModule;
@@ -94,7 +95,8 @@ public class H2DatabaseTest extends BriarTestCase {
public H2DatabaseTest() throws Exception {
super();
- Injector i = Guice.createInjector(new CryptoModule(),
+ // FIXME: Use mocks for the factories rather than building the whole app
+ Injector i = Guice.createInjector(new ClockModule(), new CryptoModule(),
new DatabaseModule(), new LifecycleModule(),
new ProtocolModule(), new SerialModule(),
new SimplexProtocolModule(), new TransportModule(),
diff --git a/test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java b/test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java
index 39c9d4331d..402b9509f1 100644
--- a/test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java
+++ b/test/net/sf/briar/plugins/bluetooth/BluetoothClientTest.java
@@ -9,7 +9,7 @@ import java.util.concurrent.Executors;
import net.sf.briar.api.ContactId;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
-import net.sf.briar.clock.SystemClock;
+import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.plugins.DuplexClientTest;
// This is not a JUnit test - it has to be run manually while the server test
diff --git a/test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java b/test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java
index 8bd8eef571..d59dda8f59 100644
--- a/test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java
+++ b/test/net/sf/briar/plugins/bluetooth/BluetoothServerTest.java
@@ -7,7 +7,7 @@ import java.util.concurrent.Executors;
import net.sf.briar.api.TransportConfig;
import net.sf.briar.api.TransportProperties;
-import net.sf.briar.clock.SystemClock;
+import net.sf.briar.api.clock.SystemClock;
import net.sf.briar.plugins.DuplexServerTest;
// This is not a JUnit test - it has to be run manually while the client test
--
GitLab