Skip to content

Added custom ITemplateModeHandler and IMessageResolver support #6

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

Open
wants to merge 1 commit into
base: 2.1-dev
Choose a base branch
from
Open

Added custom ITemplateModeHandler and IMessageResolver support #6

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
32 changes: 30 additions & 2 deletions src/main/java/org/thymeleaf/testing/templateengine/engine/TestExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
import org.thymeleaf.context.IProcessingContext;
import org.thymeleaf.dialect.IDialect;
import org.thymeleaf.fragment.IFragmentSpec;
import org.thymeleaf.messageresolver.IMessageResolver;
import org.thymeleaf.standard.StandardDialect;
import org.thymeleaf.templatemode.ITemplateModeHandler;
import org.thymeleaf.testing.templateengine.context.IProcessingContextBuilder;
import org.thymeleaf.testing.templateengine.context.web.WebProcessingContextBuilder;
import org.thymeleaf.testing.templateengine.engine.cache.TestCacheManager;
Expand Down Expand Up @@ -62,6 +64,8 @@ public final class TestExecutor {
private ITestableResolver testableResolver = new StandardTestableResolver();
private IProcessingContextBuilder processingContextBuilder = new WebProcessingContextBuilder();
private List<IDialect> dialects = Collections.singletonList((IDialect)new StandardDialect());
private List<ITemplateModeHandler> templateModeHandlers = new ArrayList<ITemplateModeHandler>();
private IMessageResolver messageResolver = null;
protected ITestReporter reporter = new ConsoleTestReporter();


Expand Down Expand Up @@ -139,9 +143,26 @@ public void setDialects(final List<? extends IDialect> dialects) {
public List<IDialect> getDialects() {
return this.dialects;
}

public void addTemplateModeHandler(final ITemplateModeHandler templateModeHandler) {
this.templateModeHandlers.add(templateModeHandler);
}

public void setTemplateModeHandlers(final List<ITemplateModeHandler> templateModeHandlers) {
this.templateModeHandlers = templateModeHandlers;
}

public List<ITemplateModeHandler> getTemplateModeHandlers() {
return this.templateModeHandlers;
}

public void setMessageResolver(IMessageResolver messageResolver) {
this.messageResolver = messageResolver;
}

public IMessageResolver getMessageResolver() {
return this.messageResolver;
}



Expand Down Expand Up @@ -193,14 +214,21 @@ private void execute(final ITestable testable, final TestExecutionContext contex
Validate.notNull(context, "Test execution context cannot be null");

final TestEngineTemplateResolver templateResolver = new TestEngineTemplateResolver();
final TestEngineMessageResolver messageResolver = new TestEngineMessageResolver();
final TestEngineMessageResolver testMessageResolver = new TestEngineMessageResolver();
final TestCacheManager cacheManager = new TestCacheManager();

final TemplateEngine templateEngine = new TemplateEngine();
templateEngine.setTemplateResolver(templateResolver);
templateEngine.setMessageResolver(messageResolver);
if(this.messageResolver != null) {
templateEngine.setMessageResolver(this.messageResolver);
} else {
templateEngine.setMessageResolver(testMessageResolver);
}
templateEngine.setDialects(new HashSet<IDialect>(this.dialects));
templateEngine.setCacheManager(cacheManager);
for(ITemplateModeHandler templateModeHandler: this.templateModeHandlers) {
templateEngine.addTemplateModeHandler(templateModeHandler);
}

context.setTemplateEngine(templateEngine);

Expand Down