From: David ‘Bombe’ Roden <bombe@freenetproject.org>
Date: Sat, 23 Nov 2024 01:21:07 +0000 (+0100)
Subject: ✅ Add test for SimpleProgress being used in getRequests()
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=e8e6fbfaa2f69c0441f7351c731ca7c53674d36e;p=jFCPlib.git

✅ Add test for SimpleProgress being used in getRequests()
---

diff --git a/src/test/java/net/pterodactylus/fcp/highlevel/FcpClientTest.java b/src/test/java/net/pterodactylus/fcp/highlevel/FcpClientTest.java
index cdd37d7..a9c6fc8 100644
--- a/src/test/java/net/pterodactylus/fcp/highlevel/FcpClientTest.java
+++ b/src/test/java/net/pterodactylus/fcp/highlevel/FcpClientTest.java
@@ -21,6 +21,7 @@ import net.pterodactylus.fcp.PersistentPut;
 import net.pterodactylus.fcp.PersistentPutDir;
 import net.pterodactylus.fcp.ProtocolError;
 import net.pterodactylus.fcp.SSKKeypair;
+import net.pterodactylus.fcp.SimpleProgress;
 import net.pterodactylus.fcp.UnknownNodeIdentifier;
 import org.hamcrest.Matcher;
 import org.junit.Rule;
@@ -755,6 +756,53 @@ public class FcpClientTest {
 		);
 	}
 
+	@Test
+	public void getRequestsFillsInDataFromSimpleProgressMessages() throws Exception {
+		FcpConnection fcpConnection = createFcpConnectionReactingToSingleMessage(named("ListPersistentRequests"), sendRequests(this::sendRequests, this::sendSimpleProgress, this::endListPersistentRequests));
+		try (FcpClient fcpClient = new FcpClient(fcpConnection)) {
+			Collection<Request> requests = fcpClient.getRequests(false);
+			assertThat(requests, containsInAnyOrder(
+					isRequest(
+							equalTo("get1"),
+							matches("total", m -> m.getTotalBlocks() == 123),
+							matches("required", m -> m.getRequiredBlocks() == 234),
+							matches("failed", m -> m.getFailedBlocks() == 345),
+							matches("fatallyFailed", m -> m.getFatallyFailedBlocks() == 456),
+							matches("succeeded", m -> m.getSucceededBlocks() == 567),
+							matches("finalized", Request::isFinalizedTotal)
+					),
+					isRequest(
+							equalTo("put1"),
+							matches("total", m -> m.getTotalBlocks() == 234),
+							matches("required", m -> m.getRequiredBlocks() == 345),
+							matches("failed", m -> m.getFailedBlocks() == 456),
+							matches("fatallyFailed", m -> m.getFatallyFailedBlocks() == 567),
+							matches("succeeded", m -> m.getSucceededBlocks() == 678),
+							matches("finalized", request -> !request.isFinalizedTotal())
+					),
+					isRequest(equalTo("put2"), matches("total", m -> m.getTotalBlocks() == 0))
+			));
+		}
+	}
+
+	private void sendSimpleProgress(FcpListener listener, FcpConnection connection) {
+		listener.receivedSimpleProgress(connection, createSimpleProgress("get1", 123, 234, 345, 456, 567, true));
+		listener.receivedSimpleProgress(connection, createSimpleProgress("put1", 234, 345, 456, 567, 678, false));
+		listener.receivedSimpleProgress(connection, createSimpleProgress("unknown", 234, 345, 456, 567, 678, false));
+	}
+
+	private SimpleProgress createSimpleProgress(String identifier, int total, int required, int failed, int fatallyFailed, int succeeded, boolean isFinalized) {
+		return new SimpleProgress(new FcpMessage("SimpleProgress")
+				.put("Identifier", identifier)
+				.put("Total", String.valueOf(total))
+				.put("Required", String.valueOf(required))
+				.put("Failed", String.valueOf(failed))
+				.put("FatallyFailed", String.valueOf(fatallyFailed))
+				.put("Succeeded", String.valueOf(succeeded))
+				.put("FinalizedTotal", String.valueOf(isFinalized))
+		);
+	}
+
 	private void sendRequests(FcpListener listener, FcpConnection connection) {
 		listener.receivedPersistentGet(connection, new PersistentGet(new FcpMessage("PersistentGet").put("Identifier", "get1").put("Global", "false")));
 		listener.receivedPersistentPut(connection, new PersistentPut(new FcpMessage("PersistentPut").put("Identifier", "put1").put("Global", "false")));