diff --git a/src/main/java/beamline/models/algorithms/StreamMiningAlgorithm.java b/src/main/java/beamline/models/algorithms/StreamMiningAlgorithm.java index 0a4e694c81df1b5a1f4ba30606dadf2cd59f40ba..e901def6429b7af8ab433814a182e4615bb54338 100644 --- a/src/main/java/beamline/models/algorithms/StreamMiningAlgorithm.java +++ b/src/main/java/beamline/models/algorithms/StreamMiningAlgorithm.java @@ -69,7 +69,7 @@ public abstract class StreamMiningAlgorithm<T extends Response> extends RichFlat * The internal processor in charge of updating the internal status of the * map. */ - protected T process(BEvent event) throws Exception { + protected T process(BEvent event) { try { long value = 1; if (processedEvents.value() != null) { diff --git a/src/main/java/beamline/sources/XesLogSource.java b/src/main/java/beamline/sources/XesLogSource.java index 71098b92cb40fdca7450e1a936ea54434094a156..3d6a1cfc4a1fb969c718e8a82a6f875250659076 100644 --- a/src/main/java/beamline/sources/XesLogSource.java +++ b/src/main/java/beamline/sources/XesLogSource.java @@ -159,12 +159,16 @@ public class XesLogSource extends BeamlineAbstractSource { Path p = null; if (SystemUtils.IS_OS_UNIX) { FileAttribute<Set<PosixFilePermission>> attr = PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")); - p = Files.createTempFile("log", ".xes.gz", attr); // Compliant + p = Files.createTempFile("log", ".xes.gz", attr); } else { - File f = Files.createTempFile("log", ".xes.gz").toFile(); // Compliant - f.setReadable(true, true); - f.setWritable(true, true); - f.setExecutable(true, true); + File f = Files.createTempFile("log", ".xes.gz").toFile(); + boolean configured = + f.setReadable(true, true) && + f.setWritable(true, true) && + f.setExecutable(true, true); + if (!configured) { + // potential issue with unable to configure all flags + } p = f.toPath(); } return p; diff --git a/src/test/java/beamline/tests/ResponsesTest.java b/src/test/java/beamline/tests/ResponsesTest.java index 3b933e22faf832b7892fd42a8db97544fd5fd9b9..243181a674638f49ff393232fcb19c71d68c7a43 100644 --- a/src/test/java/beamline/tests/ResponsesTest.java +++ b/src/test/java/beamline/tests/ResponsesTest.java @@ -2,6 +2,7 @@ package beamline.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -29,20 +30,26 @@ public class ResponsesTest { @Test public void directly_follow_tests() throws EventException { - assertThrows(IllegalArgumentException.class, () -> - new DirectlyFollowsRelation( - BEvent.create("p", "a", "c1"), - BEvent.create("p", "a", "c2"))); + BEvent e1 = BEvent.create("p", "a", "c1"); + BEvent e2 = BEvent.create("p", "a", "c2"); - DirectlyFollowsRelation df = new DirectlyFollowsRelation(BEvent.create("p", "a", "c1"), BEvent.create("p", "b", "c1")); - DirectlyFollowsRelation df2 = new DirectlyFollowsRelation(BEvent.create("p", "a", "c2"), BEvent.create("p", "b", "c2")); - DirectlyFollowsRelation df3 = new DirectlyFollowsRelation(BEvent.create("p", "a", "c1"), BEvent.create("p", "d", "c1")); + assertThrows(IllegalArgumentException.class, () -> new DirectlyFollowsRelation(e1, e2)); - assertTrue(df.equals(df2)); - assertFalse(df.equals(df3)); - assertFalse(df.equals(null)); - assertFalse(df.equals("")); - assertTrue(df.equals(df)); + BEvent e21 = BEvent.create("p", "a", "c1"); + BEvent e22 = BEvent.create("p", "b", "c1"); + BEvent e23 = BEvent.create("p", "a", "c2"); + BEvent e24 = BEvent.create("p", "b", "c2"); + BEvent e25 = BEvent.create("p", "d", "c1"); + + DirectlyFollowsRelation df = new DirectlyFollowsRelation(e21, e22); + DirectlyFollowsRelation df2 = new DirectlyFollowsRelation(e23, e24); + DirectlyFollowsRelation df3 = new DirectlyFollowsRelation(e21, e25); + + assertEquals(df, df2); + assertNotEquals(df, df3); + assertNotEquals(null, df); + assertNotEquals("-", df); + assertEquals(df, df); assertTrue(df.hashCode() == df2.hashCode()); assertFalse(df.hashCode() == df3.hashCode()); @@ -56,8 +63,8 @@ public class ResponsesTest { StringResponse sr = new StringResponse(""); sr.set(unique); - assertTrue(sr.get().equals(unique)); - assertTrue(sr.toString().equals(unique)); + assertEquals(sr.get(), unique); + assertEquals(sr.toString(), unique); } }