Skip to content

Added support for observer concurrency in the default executor as wel… #128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 18, 2025
Merged

Added support for observer concurrency in the default executor as wel… #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.google.pdsl</groupId>
<artifactId>pdsl</artifactId>
<version>1.8.2</version>
<version>1.8.3-SNAPSHOT</version>

<name>pdsl</name>
<url>http://www.github.com/google/polymorphicDSL</url>
Expand Down
16 changes: 4 additions & 12 deletions src/main/java/com/pdsl/executors/DefaultPolymorphicDslTestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.pdsl.executors;

import com.pdsl.logging.AnsiTerminalColorHelper;
import com.pdsl.logging.PdslThreadSafeOutputStream;
import com.pdsl.reports.DefaultTestResult;
import com.pdsl.reports.MetadataTestRunResults;
Expand All @@ -9,25 +8,17 @@
import com.pdsl.specifications.DefaultPhrase;
import com.pdsl.specifications.FilteredPhrase;
import com.pdsl.specifications.Phrase;
import com.pdsl.specifications.PolymorphicDslTransformationException;
import com.pdsl.testcases.SharedTestCase;
import com.pdsl.testcases.SharedTestSuite.SharedTestCaseWithInterpreter;
import com.pdsl.testcases.TestCase;
import com.pdsl.testcases.TestSection;

import java.util.stream.Collectors;

import org.antlr.v4.runtime.tree.ParseTree;
import org.antlr.v4.runtime.tree.ParseTreeListener;
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
import org.antlr.v4.runtime.tree.ParseTreeWalker;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.Charset;
import java.util.*;
import java.util.concurrent.CopyOnWriteArrayList;

/**
* An executor that runs PDSL tests create from a TestCaseFactory.
Expand All @@ -40,8 +31,9 @@
public class DefaultPolymorphicDslTestExecutor implements TraceableTestRunExecutor, ActivePhraseObservable {

private final ParseTreeWalker walker = new ParseTreeWalker();
private static final Charset DEFAULT_CHARSET = Charset.defaultCharset();
private final List<ExecutorObserver> activePhraseObservers = new ArrayList<>();
// In concurrent test cases an observer might be added to the collection while it's being read from
// Use a type that is safe for concurrency.
private final List<ExecutorObserver> activePhraseObservers = new CopyOnWriteArrayList<>();

/**
* Constructs a DefaultPolymorphicDslTestExecutor with a default ColorizedObserver.
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/pdsl/executors/ExecutorObserver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.pdsl.executors;

import com.pdsl.reports.MetadataTestRunResults;
import com.pdsl.specifications.Phrase;
import com.pdsl.testcases.SharedTestCase;
import com.pdsl.testcases.TestCase;
import com.pdsl.testcases.TestSection;
Expand Down Expand Up @@ -52,8 +51,8 @@ default void onAfterPhrase(ParseTreeListener listener,
ParseTreeWalker walker, TestSection testSection) {}

/** Notifies the implementer of a phrase that has completed execution with a visitor WITHOUT an exception. */
void onAfterPhrase(ParseTreeVisitor<?> visitor,
TestSection testSection);
default void onAfterPhrase(ParseTreeVisitor<?> visitor,
TestSection testSection) {}

/** Notifies the implementer of a phrase that has failed during excecution with a listener. */
default void onPhraseFailure(ParseTreeListener listener,
Expand Down
Loading