X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneModificationDetectorTest.java;h=d70cc5c2b27e3d1ab072e071830732df278fdb1b;hb=2b47186b72e30460a6710f95a76e4a99c305909a;hp=9d1cc5955c62afd938fc019d1ae9020fff963c9f;hpb=e46a5f6ff2861bd37d515bfb1f8e7241c6ae8618;p=Sone.git

diff --git a/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java b/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
index 9d1cc59..d70cc5c 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
@@ -8,9 +8,11 @@ import static org.mockito.Mockito.when;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
+import net.pterodactylus.sone.core.SoneModificationDetector.LockableFingerprintProvider;
 import net.pterodactylus.sone.data.Sone;
 
 import com.google.common.base.Ticker;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -21,14 +23,14 @@ import org.junit.Test;
 public class SoneModificationDetectorTest {
 
 	private final Ticker ticker = mock(Ticker.class);
-	private final Sone sone = mock(Sone.class);
-	private final Core core = mock(Core.class);
 	private final AtomicInteger insertionDelay = new AtomicInteger(60);
 	private final SoneModificationDetector soneModificationDetector;
+	private final LockableFingerprintProvider lockableFingerprintProvider = mock(LockableFingerprintProvider.class);
 
 	public SoneModificationDetectorTest() {
-		when(sone.getFingerprint()).thenReturn("original");
-		soneModificationDetector = new SoneModificationDetector(ticker, core, sone, insertionDelay);
+		when(lockableFingerprintProvider.getFingerprint()).thenReturn("original");
+		when(lockableFingerprintProvider.isLocked()).thenReturn(false);
+		soneModificationDetector = new SoneModificationDetector(ticker, lockableFingerprintProvider, insertionDelay);
 	}
 
 	private void modifySone() {
@@ -36,7 +38,7 @@ public class SoneModificationDetectorTest {
 	}
 
 	private void modifySone(String uniqueValue) {
-		when(sone.getFingerprint()).thenReturn("modified" + uniqueValue);
+		when(lockableFingerprintProvider.getFingerprint()).thenReturn("modified" + uniqueValue);
 	}
 
 	private void passTime(int seconds) {
@@ -44,11 +46,21 @@ public class SoneModificationDetectorTest {
 	}
 
 	private void lockSone() {
-		when(core.isLocked(sone)).thenReturn(true);
+		when(lockableFingerprintProvider.isLocked()).thenReturn(true);
 	}
 
 	private void unlockSone() {
-		when(core.isLocked(sone)).thenReturn(false);
+		when(lockableFingerprintProvider.isLocked()).thenReturn(false);
+	}
+
+	@Before
+	public void setupOriginalFingerprint() {
+	    soneModificationDetector.setFingerprint("original");
+	}
+
+	@Test
+	public void normalConstructorCanBeCalled() {
+		new SoneModificationDetector(lockableFingerprintProvider, insertionDelay);
 	}
 
 	@Test
@@ -58,6 +70,11 @@ public class SoneModificationDetectorTest {
 	}
 
 	@Test
+	public void originalFingerprintIsRetained() {
+		assertThat(soneModificationDetector.getOriginalFingerprint(), is("original"));
+	}
+
+	@Test
 	public void modifiedSoneIsEligibleAfter60Seconds() {
 		modifySone();
 		assertThat(soneModificationDetector.isModified(), is(true));