X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Ftest%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneModificationDetectorTest.java;h=1fd52c896c3e741f4f1626e83e59880e540c25d7;hp=90f2935dda7bfe60177e5f471053b49386d82bb0;hb=62573c314957b1851f4fbe693b8746686caa940a;hpb=0ddcaceecf1d4de91b332f640fe65a1d26d746b2

diff --git a/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java b/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
index 90f2935..1fd52c8 100644
--- a/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
+++ b/src/test/java/net/pterodactylus/sone/core/SoneModificationDetectorTest.java
@@ -8,31 +8,34 @@ import static org.mockito.Mockito.when;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
-import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.core.SoneModificationDetector.LockableFingerprintProvider;
 
 import com.google.common.base.Ticker;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
  * Unit test for {@link SoneModificationDetector}.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
 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() {
-		when(sone.getFingerprint()).thenReturn("modified");
+		modifySone("");
+	}
+
+	private void modifySone(String uniqueValue) {
+		when(lockableFingerprintProvider.getFingerprint()).thenReturn("modified" + uniqueValue);
 	}
 
 	private void passTime(int seconds) {
@@ -40,21 +43,63 @@ public class SoneModificationDetectorTest {
 	}
 
 	private void lockSone() {
-		when(core.isLocked(sone)).thenReturn(true);
+		when(lockableFingerprintProvider.isLocked()).thenReturn(true);
+	}
+
+	private void unlockSone() {
+		when(lockableFingerprintProvider.isLocked()).thenReturn(false);
+	}
+
+	@Before
+	public void setupOriginalFingerprint() {
+	    soneModificationDetector.setFingerprint("original");
 	}
 
 	@Test
-	public void modifiedSoneIsEligibleAfter60Seconds() {
+	public void normalConstructorCanBeCalled() {
+		new SoneModificationDetector(lockableFingerprintProvider, insertionDelay);
+	}
+
+	@Test
+	public void sonesStartOutAsNotEligible() {
+		assertThat(soneModificationDetector.isModified(), is(false));
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+	}
+
+	@Test
+	public void originalFingerprintIsRetained() {
+		assertThat(soneModificationDetector.getLastInsertFingerprint(), is("original"));
+	}
+
+	@Test
+	public void modifiedSoneIsEligibleAfter60Seconds() {
 		modifySone();
+		assertThat(soneModificationDetector.isModified(), is(true));
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
 		passTime(100);
+		assertThat(soneModificationDetector.isModified(), is(true));
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(true));
 	}
 
 	@Test
-	public void modifiedSoneIsNotEligibleAfter30Seconds() {
+	public void modifiedAndRemodifiedSoneIsEligibleAfter90Seconds() {
+		modifySone();
+		assertThat(soneModificationDetector.isModified(), is(true));
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+		passTime(30);
+		modifySone("2");
+		assertThat(soneModificationDetector.isModified(), is(true));
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+		passTime(61);
+		assertThat(soneModificationDetector.isModified(), is(true));
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+		passTime(91);
+		assertThat(soneModificationDetector.isModified(), is(true));
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(true));
+	}
+
+	@Test
+	public void modifiedSoneIsNotEligibleAfter30Seconds() {
 		modifySone();
 		passTime(30);
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
@@ -71,8 +116,21 @@ public class SoneModificationDetectorTest {
 	}
 
 	@Test
-	public void settingFingerprintWillResetTheEligibility() {
+	public void lockingAndUnlockingASoneRestartsTheWaitPeriod() {
+		modifySone();
+		lockSone();
+		passTime(30);
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+		unlockSone();
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+		passTime(60);
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+		passTime(90);
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(true));
+	}
+
+	@Test
+	public void settingFingerprintWillResetTheEligibility() {
 		modifySone();
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
 		passTime(100);
@@ -83,7 +141,6 @@ public class SoneModificationDetectorTest {
 
 	@Test
 	public void changingInsertionDelayWillInfluenceEligibility() {
-		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
 		modifySone();
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
 		passTime(100);
@@ -92,4 +149,34 @@ public class SoneModificationDetectorTest {
 		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
 	}
 
+	@Test
+	public void soneWithoutOriginalFingerprintIsNotEligibleAfter59Seconds() {
+		SoneModificationDetector soneModificationDetector = createDetectorWithoutOriginalFingerprint();
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+		passTime(59);
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+	}
+
+	private SoneModificationDetector createDetectorWithoutOriginalFingerprint() {
+		return new SoneModificationDetector(ticker, new LockableFingerprintProvider() {
+			@Override
+			public boolean isLocked() {
+				return false;
+			}
+
+			@Override
+			public String getFingerprint() {
+				return "changed";
+			}
+		}, insertionDelay);
+	}
+
+	@Test
+	public void soneWithoutOriginalFingerprintIsEligibleAfter60Seconds() {
+		SoneModificationDetector soneModificationDetector = createDetectorWithoutOriginalFingerprint();
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(false));
+		passTime(60);
+		assertThat(soneModificationDetector.isEligibleForInsert(), is(true));
+	}
+
 }