diff --git a/src/main/java/beamline/sources/CSVXesLogSource.java b/src/main/java/beamline/sources/CSVLogSource.java similarity index 87% rename from src/main/java/beamline/sources/CSVXesLogSource.java rename to src/main/java/beamline/sources/CSVLogSource.java index 46eda050048c7a876ad792e46a59c3ff19d70eb9..b97d3bb6086f4ae0fd3678514c96528ee1e0af56 100644 --- a/src/main/java/beamline/sources/CSVXesLogSource.java +++ b/src/main/java/beamline/sources/CSVLogSource.java @@ -25,10 +25,10 @@ import beamline.exceptions.SourceException; * * @author Andrea Burattin */ -public class CSVXesLogSource extends BeamlineAbstractSource { +public class CSVLogSource extends BeamlineAbstractSource { private static final long serialVersionUID = 205574514393782145L; - private CSVXesLogSource.ParserConfiguration parserConfiguration; + private CSVLogSource.ParserConfiguration parserConfiguration; private String filename; private int caseIdColumn; private int activityNameColumn; @@ -44,7 +44,7 @@ public class CSVXesLogSource extends BeamlineAbstractSource { * @param parserConfiguration the parser configuration to be used for * parsing the CSV file */ - public CSVXesLogSource(String filename, int caseIdColumn, int activityNameColumn, CSVXesLogSource.ParserConfiguration parserConfiguration) { + public CSVLogSource(String filename, int caseIdColumn, int activityNameColumn, CSVLogSource.ParserConfiguration parserConfiguration) { this.filename = filename; this.caseIdColumn = caseIdColumn; this.activityNameColumn = activityNameColumn; @@ -60,8 +60,8 @@ public class CSVXesLogSource extends BeamlineAbstractSource { * @param activityNameColumn the id of the column containing the activity * name (counting starts from 0) */ - public CSVXesLogSource(String filename, int caseIdColumn, int activityNameColumn) { - this(filename, caseIdColumn, activityNameColumn, new CSVXesLogSource.ParserConfiguration()); + public CSVLogSource(String filename, int caseIdColumn, int activityNameColumn) { + this(filename, caseIdColumn, activityNameColumn, new CSVLogSource.ParserConfiguration()); } @Override diff --git a/src/test/java/beamline/tests/SourcesTest.java b/src/test/java/beamline/tests/SourcesTest.java index fd3561bec5b7ab1a81addecdd033764f865c941d..95d18d441df00775183484ae24bd01ee20c6a0aa 100644 --- a/src/test/java/beamline/tests/SourcesTest.java +++ b/src/test/java/beamline/tests/SourcesTest.java @@ -26,17 +26,32 @@ import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.junit.jupiter.api.Test; import beamline.events.BEvent; -import beamline.sources.CSVXesLogSource; +import beamline.sources.CSVLogSource; import beamline.sources.MQTTXesSource; +import beamline.sources.StringTestSource; import beamline.sources.XesLogSource; public class SourcesTest { + @Test + public void test_string_test_source() throws Exception { + List<String> acts = new LinkedList<>(); + StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); + DataStream<BEvent> stream = env.addSource(new StringTestSource("ABCDA")); + stream.executeAndCollect().forEachRemaining((BEvent e) -> { + acts.add(e.getEventName()); + }); + + assertEquals(5, acts.size()); + + assertThat(acts, hasItems("A","B","C","D","A")); + } + @Test public void test_csv_source_1() throws Exception { List<String> acts = new LinkedList<>(); List<String> caseIds = new LinkedList<>(); - CSVXesLogSource source = new CSVXesLogSource("src/test/resources/sources/source.csv", 0, 1); + CSVLogSource source = new CSVLogSource("src/test/resources/sources/source.csv", 0, 1); StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); DataStream<BEvent> stream = env.addSource(source); @@ -56,11 +71,11 @@ public class SourcesTest { public void test_csv_source_2() throws Exception { List<String> acts = new LinkedList<>(); List<String> caseIds = new LinkedList<>(); - CSVXesLogSource source = new CSVXesLogSource( + CSVLogSource source = new CSVLogSource( "src/test/resources/sources/source_2.csv", 0, 1, - new CSVXesLogSource.ParserConfiguration().withSeparator('|')); + new CSVLogSource.ParserConfiguration().withSeparator('|')); StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); DataStream<BEvent> stream = env.addSource(source); @@ -78,7 +93,7 @@ public class SourcesTest { @Test public void test_csv_source_3() { - CSVXesLogSource source = new CSVXesLogSource("DOESNT_EXIST", 0, 1); + CSVLogSource source = new CSVLogSource("DOESNT_EXIST", 0, 1); assertThrowsExactly(JobExecutionException.class, () -> { StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment(); env.addSource(source).map(e -> e).print();