import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
+import java.net.MalformedURLException;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.freenet.wot.OwnIdentity;
import net.pterodactylus.sone.main.SonePlugin;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.service.AbstractService;
long insertTime = currentTimeMillis();
eventBus.post(new SoneInsertingEvent(sone));
Stopwatch stopwatch = Stopwatch.createStarted();
- FreenetURI finalUri = freenetInterface.insertDirectory(sone.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
+ FreenetURI finalUri = freenetInterface.insertDirectory(getSoneInsertUri(sone), insertInformation.generateManifestEntries(), "index.html");
stopwatch.stop();
soneInsertDurationHistogram.update(stopwatch.elapsed(MICROSECONDS));
eventBus.post(new SoneInsertedEvent(sone, stopwatch.elapsed(MILLISECONDS), insertInformation.getFingerprint()));
setInsertionDelay(insertionDelayChangedEvent.getInsertionDelay());
}
+ private FreenetURI getSoneInsertUri(Sone sone) throws MalformedURLException {
+ return new FreenetURI(((OwnIdentity) sone.getIdentity()).getInsertUri())
+ .setKeyType("USK")
+ .setDocName("Sone")
+ .setMetaString(new String[0])
+ .setSuggestedEdition(sone.getLatestEdition());
+ }
+
/**
* Container for information that are required to insert a Sone. This
* container merely exists to copy all relevant data without holding a lock
import net.pterodactylus.sone.core.SoneInserter.*
import net.pterodactylus.sone.core.event.*
import net.pterodactylus.sone.data.*
+import net.pterodactylus.sone.freenet.wot.*
import net.pterodactylus.sone.main.*
import net.pterodactylus.sone.test.*
import org.hamcrest.MatcherAssert.*
}
private fun createSone(insertUri: FreenetURI, fingerprint: String = "fingerprint"): Sone {
+ val ownIdentity = DefaultOwnIdentity("", "", "", insertUri.toString())
val sone = mock<Sone>()
- whenever(sone.insertUri).thenReturn(insertUri)
+ whenever(sone.identity).thenReturn(ownIdentity)
whenever(sone.fingerprint).thenReturn(fingerprint)
whenever(sone.rootAlbum).thenReturn(mock())
whenever(core.getSone(anyString())).thenReturn(sone)
@Test
fun `sone inserter inserts a sone if it is eligible`() {
- val insertUri = mock<FreenetURI>()
val finalUri = mock<FreenetURI>()
val sone = createSone(insertUri)
val soneModificationDetector = mock<SoneModificationDetector>()
whenever(soneModificationDetector.isEligibleForInsert).thenReturn(true)
- whenever(freenetInterface.insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenReturn(finalUri)
+ whenever(freenetInterface.insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenReturn(finalUri)
val soneInserter = SoneInserter(core, eventBus, freenetInterface, metricRegistry, "SoneId", soneModificationDetector, 1)
doAnswer {
soneInserter.stop()
}.whenever(core).touchConfiguration()
soneInserter.serviceRun()
val soneEvents = ArgumentCaptor.forClass(SoneEvent::class.java)
- verify(freenetInterface).insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))
+ verify(freenetInterface).insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))
verify(eventBus, times(2)).post(soneEvents.capture())
assertThat(soneEvents.allValues[0], instanceOf(SoneInsertingEvent::class.java))
assertThat(soneEvents.allValues[0].sone, equalTo(sone))
@Test
fun `sone inserter bails out if it is stopped while inserting`() {
- val insertUri = mock<FreenetURI>()
val finalUri = mock<FreenetURI>()
val sone = createSone(insertUri)
val soneModificationDetector = mock<SoneModificationDetector>()
whenever(soneModificationDetector.isEligibleForInsert).thenReturn(true)
val soneInserter = SoneInserter(core, eventBus, freenetInterface, metricRegistry, "SoneId", soneModificationDetector, 1)
- whenever(freenetInterface.insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenAnswer {
+ whenever(freenetInterface.insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenAnswer {
soneInserter.stop()
finalUri
}
soneInserter.serviceRun()
val soneEvents = ArgumentCaptor.forClass(SoneEvent::class.java)
- verify(freenetInterface).insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))
+ verify(freenetInterface).insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))
verify(eventBus, times(2)).post(soneEvents.capture())
assertThat(soneEvents.allValues[0], instanceOf(SoneInsertingEvent::class.java))
assertThat(soneEvents.allValues[0].sone, equalTo(sone))
@Test
fun `sone inserter does not insert sone if it is not eligible`() {
- val insertUri = mock<FreenetURI>()
createSone(insertUri)
val soneModificationDetector = mock<SoneModificationDetector>()
val soneInserter = SoneInserter(core, eventBus, freenetInterface, metricRegistry, "SoneId", soneModificationDetector, 1)
soneInserter.stop()
}).start()
soneInserter.serviceRun()
- verify(freenetInterface, never()).insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))
+ verify(freenetInterface, never()).insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))
verify(eventBus, never()).post(argThat(org.hamcrest.Matchers.any(SoneEvent::class.java)))
}
@Test
fun `sone inserter posts aborted event if an exception occurs`() {
- val insertUri = mock<FreenetURI>()
val sone = createSone(insertUri)
val soneModificationDetector = mock<SoneModificationDetector>()
whenever(soneModificationDetector.isEligibleForInsert).thenReturn(true)
val soneInserter = SoneInserter(core, eventBus, freenetInterface, metricRegistry, "SoneId", soneModificationDetector, 1)
val soneException = SoneException(Exception())
- whenever(freenetInterface.insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenAnswer {
+ whenever(freenetInterface.insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenAnswer {
soneInserter.stop()
throw soneException
}
soneInserter.serviceRun()
val soneEvents = ArgumentCaptor.forClass(SoneEvent::class.java)
- verify(freenetInterface).insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))
+ verify(freenetInterface).insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))
verify(eventBus, times(2)).post(soneEvents.capture())
assertThat(soneEvents.allValues[0], instanceOf(SoneInsertingEvent::class.java))
assertThat(soneEvents.allValues[0].sone, equalTo(sone))
@Test
fun `successful insert updates metrics`() {
- val insertUri = mock<FreenetURI>()
val finalUri = mock<FreenetURI>()
createSone(insertUri)
val soneModificationDetector = mock<SoneModificationDetector>()
whenever(soneModificationDetector.isEligibleForInsert).thenReturn(true)
- whenever(freenetInterface.insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenReturn(finalUri)
+ whenever(freenetInterface.insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenReturn(finalUri)
val soneInserter = SoneInserter(core, eventBus, freenetInterface, metricRegistry,"SoneId", soneModificationDetector, 1)
doAnswer {
soneInserter.stop()
@Test
fun `unsuccessful insert does not update histogram but records error`() {
- val insertUri = mock<FreenetURI>()
createSone(insertUri)
val soneModificationDetector = mock<SoneModificationDetector>()
whenever(soneModificationDetector.isEligibleForInsert).thenReturn(true)
val soneInserter = SoneInserter(core, eventBus, freenetInterface, metricRegistry, "SoneId", soneModificationDetector, 1)
- whenever(freenetInterface.insertDirectory(eq(insertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenAnswer {
+ whenever(freenetInterface.insertDirectory(eq(expectedInsertUri), any<HashMap<String, Any>>(), eq("index.html"))).thenAnswer {
soneInserter.stop()
throw SoneException(Exception())
}
}
}
+
+val insertUri = createInsertUri
+val expectedInsertUri: FreenetURI = FreenetURI(insertUri.toString())
+ .setKeyType("USK")
+ .setDocName("Sone")
+ .setMetaString(kotlin.emptyArray())
+ .setSuggestedEdition(0)