From f8c8f2c9a64553761b4b149bafa175e110b21e01 Mon Sep 17 00:00:00 2001
From: "Edward M. Kagan" <pagan@tabor.one>
Date: Sun, 28 Feb 2021 04:30:24 +0300
Subject: [PATCH] Cleaner collection iteration. FIxed file layout in dirs for
 tests.

---
 .../pagan/traqtor/deck/op/OperationResult.java     | 14 ++++++++------
 .../java/link/pagan/traqtor/test/TestUtils.java    |  0
 .../test/java/link/pagan/traqtor/EndToEndTest.java |  2 ++
 .../traqtor/{IoTest.java => WorkspaceTest.java}    |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
 rename traqtor-aio/src/{test => main}/java/link/pagan/traqtor/test/TestUtils.java (100%)
 rename traqtor-aio/src/test/java/link/pagan/traqtor/{IoTest.java => WorkspaceTest.java} (97%)

diff --git a/traqtor-aio/src/main/java/link/pagan/traqtor/deck/op/OperationResult.java b/traqtor-aio/src/main/java/link/pagan/traqtor/deck/op/OperationResult.java
index 3c5b4e6..55f794c 100644
--- a/traqtor-aio/src/main/java/link/pagan/traqtor/deck/op/OperationResult.java
+++ b/traqtor-aio/src/main/java/link/pagan/traqtor/deck/op/OperationResult.java
@@ -40,16 +40,18 @@ public class OperationResult {
 	public boolean ok () {
 		boolean proxiedOK = proxiedOK();
 
-		if (!proxiedOK) { for (OperationMessage message : this.messages) { System.out.println(message.toString()); } }
+		if (!proxiedOK) { this.messages.forEach(message -> {
+			System.out.println(message.toString());
+			});
+}
 		return proxiedOK;
 	}
 
 	private boolean proxiedOK () {
-
-		if (this.messages.stream().anyMatch(message -> (message.type().equals(MessageType.FAIL)))) { return false; }
-
-		if (!this.subresults.stream().noneMatch(subresult -> (!subresult.ok()))) { return false; }
-		return true;
+		if (this.messages.stream().anyMatch(message -> (message.type().equals(MessageType.FAIL)))) {
+			return false;
+		}
+		return this.subresults.stream().noneMatch(subresult -> (!subresult.ok()));
 	}
 
 	public long timestamp () {
diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/test/TestUtils.java b/traqtor-aio/src/main/java/link/pagan/traqtor/test/TestUtils.java
similarity index 100%
rename from traqtor-aio/src/test/java/link/pagan/traqtor/test/TestUtils.java
rename to traqtor-aio/src/main/java/link/pagan/traqtor/test/TestUtils.java
diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java b/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java
index bcef5e2..925e21a 100644
--- a/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java
+++ b/traqtor-aio/src/test/java/link/pagan/traqtor/EndToEndTest.java
@@ -1,6 +1,8 @@
 package link.pagan.traqtor;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import link.pagan.traqtor.Traqtor;
+import link.pagan.traqtor.Workspace;
 import link.pagan.traqtor.project.universe.UniverseProject;
 import link.pagan.traqtor.project.universe.Universe;
 import link.pagan.traqtor.project.universe.element.Element;
diff --git a/traqtor-aio/src/test/java/link/pagan/traqtor/IoTest.java b/traqtor-aio/src/test/java/link/pagan/traqtor/WorkspaceTest.java
similarity index 97%
rename from traqtor-aio/src/test/java/link/pagan/traqtor/IoTest.java
rename to traqtor-aio/src/test/java/link/pagan/traqtor/WorkspaceTest.java
index bbab233..e3e43d8 100644
--- a/traqtor-aio/src/test/java/link/pagan/traqtor/IoTest.java
+++ b/traqtor-aio/src/test/java/link/pagan/traqtor/WorkspaceTest.java
@@ -9,7 +9,7 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
 /** @author Edward M. Kagan {@literal <}kaganem{@literal @}2pm.tech{@literal >} */
-public class IoTest {
+public class WorkspaceTest {
 
 	@BeforeEach
 	public void cleanTestDir () throws IOException {