From 8f74aa5f0820a548167e0a6c00054266775222c7 Mon Sep 17 00:00:00 2001 From: Jonathan Knight Date: Mon, 12 Feb 2024 14:10:17 +0300 Subject: [PATCH] Cleaning up code --- lib_xunit/src/main/x/xunit.x | 16 ++++- .../src/main/x/xunit/DisplayNameGenerator.x | 5 +- lib_xunit/src/main/x/xunit/ExecutionContext.x | 4 +- .../src/main/x/xunit/ExtensionProvider.x | 1 - .../src/main/x/xunit/ParameterResolver.x | 5 +- .../main/x/xunit_engine/DefaultTestEngine.x | 5 +- .../x/xunit_engine/DiscoveryConfiguration.x | 24 ++------ .../src/main/x/xunit_engine/DiscoveryEngine.x | 4 +- .../x/xunit_engine/ExecutionConfiguration.x | 16 ++--- .../main/x/xunit_engine/ExecutionListener.x | 10 ++-- .../src/main/x/xunit_engine/Model.x | 27 +++------ .../src/main/x/xunit_engine/Result.x | 4 +- .../src/main/x/xunit_engine/UniqueId.x | 25 +++----- .../main/x/xunit_engine/discovery/selectors.x | 4 +- .../executor/BaseExecutionLifecycle.x | 4 +- .../executor/EngineExecutionContext.x | 20 ++----- .../executor/ExceptionCollector.x | 23 +++----- .../executor/ExecutionLifecycle.x | 58 +++++++------------ .../executor/MethodExecutionLifecycle.x | 9 +-- .../executor/TemplateExecutionLifecycle.x | 5 +- .../extensions/ExtensionRegistry.x | 13 ++--- .../x/xunit_engine/models/ContainerModel.x | 13 +---- .../main/x/xunit_engine/models/MethodModel.x | 20 ++----- .../x/xunit_engine/models/TemplateModel.x | 4 +- 24 files changed, 108 insertions(+), 211 deletions(-) diff --git a/lib_xunit/src/main/x/xunit.x b/lib_xunit/src/main/x/xunit.x index 9eb88c29de..38cd112c91 100644 --- a/lib_xunit/src/main/x/xunit.x +++ b/lib_xunit/src/main/x/xunit.x @@ -60,15 +60,27 @@ module xunit.xtclang.org { * A function that performs a predicate check on a test fixture. */ typedef function Boolean (Object) as FixturePredicate; - + + /** + * A `FixturePredicate` that tests a value is a `Method`. + */ static FixturePredicate MethodFixturePredicate = o -> o.is(Method); + /** + * A `FixturePredicate` that tests a value is a `Class`. + */ static FixturePredicate ClassFixturePredicate = o -> o.is(Class); + /** + * A `FixturePredicate` that tests a value is a `Package`. + */ static FixturePredicate PackageFixturePredicate = o -> o.is(Package); /** - * A skipped test result. + * The result for a possibly skipped test, + * + * @param skipped a flag that is `True` if the test was skipped, or `False` if the test was executed. + * @param reason an optional message to describe why the test was skipped */ const SkipResult(Boolean skipped, String reason = "unknown") { /** diff --git a/lib_xunit/src/main/x/xunit/DisplayNameGenerator.x b/lib_xunit/src/main/x/xunit/DisplayNameGenerator.x index db8c86e901..d8c04cf7bc 100644 --- a/lib_xunit/src/main/x/xunit/DisplayNameGenerator.x +++ b/lib_xunit/src/main/x/xunit/DisplayNameGenerator.x @@ -1,7 +1,8 @@ import annotations.DisplayName; /** - * A class that can generate display names for classes and methods. + * A class that can generate human readable names for test classes and methods. + * These names will be used in console output and test reports. */ interface DisplayNameGenerator extends Const { @@ -43,14 +44,12 @@ interface DisplayNameGenerator */ static String parameterTypesAsString(MethodOrFunction method) { StringBuffer buf = new StringBuffer().add('('); - EachParam: for (Parameter param : method.params) { if (!EachParam.first) { ", ".appendTo(buf); } param.appendTo(buf); } - return buf.add(')').toString(); } diff --git a/lib_xunit/src/main/x/xunit/ExecutionContext.x b/lib_xunit/src/main/x/xunit/ExecutionContext.x index 2936849118..d07432a0c1 100644 --- a/lib_xunit/src/main/x/xunit/ExecutionContext.x +++ b/lib_xunit/src/main/x/xunit/ExecutionContext.x @@ -1,6 +1,6 @@ /** - * A holder of information that an `ExtensionProvider` can use to provide - * an `Extension`. + * A holder of information that an `ExtensionProvider` can use + * when providing an `Extension`. */ interface ExecutionContext { /** diff --git a/lib_xunit/src/main/x/xunit/ExtensionProvider.x b/lib_xunit/src/main/x/xunit/ExtensionProvider.x index e36148028f..678673efef 100644 --- a/lib_xunit/src/main/x/xunit/ExtensionProvider.x +++ b/lib_xunit/src/main/x/xunit/ExtensionProvider.x @@ -2,7 +2,6 @@ * A provider of `Extension`s. */ interface ExtensionProvider { - /** * The name of this provider. */ diff --git a/lib_xunit/src/main/x/xunit/ParameterResolver.x b/lib_xunit/src/main/x/xunit/ParameterResolver.x index 083e3002d8..6b77197f29 100644 --- a/lib_xunit/src/main/x/xunit/ParameterResolver.x +++ b/lib_xunit/src/main/x/xunit/ParameterResolver.x @@ -1,7 +1,8 @@ import ecstasy.reflect.Parameter; /** - * A `ParameterResolver` is able to resolve values for parameters to be used to call methods and functions. + * A `ParameterResolver` is able to resolve values for parameters to be used + * when executing test methods and functions. */ interface ParameterResolver { /** @@ -30,7 +31,6 @@ interface ParameterResolver { if (unresolved.empty) { return values; } - ParameterResolver[] resolvers = context.registry.getResources(ParameterResolver); throw new IllegalState($"Failed to resolve parameters: unresolved={unresolved} resolvers={resolvers}"); } @@ -71,7 +71,6 @@ interface ParameterResolver { unresolved.add(param); } } - return paramValues, unresolved; } diff --git a/lib_xunit_engine/src/main/x/xunit_engine/DefaultTestEngine.x b/lib_xunit_engine/src/main/x/xunit_engine/DefaultTestEngine.x index dcb944090d..10c77b07cc 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/DefaultTestEngine.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/DefaultTestEngine.x @@ -68,7 +68,6 @@ service DefaultTestEngine * * @return the modified `EngineExecutionContext.Builder` to modify */ - protected EngineExecutionContext.Builder modifyExecutionContext(EngineExecutionContext.Builder builder) { - return builder.withListener(listener); - } + protected EngineExecutionContext.Builder modifyExecutionContext(EngineExecutionContext.Builder builder) = + builder.withListener(listener); } diff --git a/lib_xunit_engine/src/main/x/xunit_engine/DiscoveryConfiguration.x b/lib_xunit_engine/src/main/x/xunit_engine/DiscoveryConfiguration.x index a1eba081c6..db78e8daa1 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/DiscoveryConfiguration.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/DiscoveryConfiguration.x @@ -34,9 +34,7 @@ const DiscoveryConfiguration { /** * Return this `DiscoveryConfiguration` as a `Builder`. */ - Builder asBuilder() { - return new Builder(this); - } + Builder asBuilder() = new Builder(this); /** * A convenience method to return the display name for a @@ -46,9 +44,7 @@ const DiscoveryConfiguration { * * @return the human readable display name for the `Class` */ - String displayNameFor(Class clz) { - return displayNameGenerator.nameForClass(clz); - } + String displayNameFor(Class clz) = displayNameGenerator.nameForClass(clz); /** * A convenience method to return the display name for a @@ -59,25 +55,19 @@ const DiscoveryConfiguration { * * @return the human readable display name for the `Class` */ - String displayNameFor(Class clz, MethodOrFunction method) { - return displayNameGenerator.nameForMethod(clz, method); - } + String displayNameFor(Class clz, MethodOrFunction method) = displayNameGenerator.nameForMethod(clz, method); // ----- factory methods ----------------------------------------------------------------------- /** * Create a default `DiscoveryConfiguration`. */ - static DiscoveryConfiguration create() { - return builder().build(); - } + static DiscoveryConfiguration create() = builder().build(); /** * Create a `DiscoveryConfiguration` builder. */ - static Builder builder() { - return new Builder(); - } + static Builder builder() = new Builder(); // ----- inner class: Builder ------------------------------------------------------------------ @@ -142,8 +132,6 @@ const DiscoveryConfiguration { * * @return a `DiscoveryConfiguration` built from this `Builder` */ - DiscoveryConfiguration build() { - return new DiscoveryConfiguration(this); - } + DiscoveryConfiguration build() = new DiscoveryConfiguration(this); } } diff --git a/lib_xunit_engine/src/main/x/xunit_engine/DiscoveryEngine.x b/lib_xunit_engine/src/main/x/xunit_engine/DiscoveryEngine.x index 53ccae68bb..c2a790b262 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/DiscoveryEngine.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/DiscoveryEngine.x @@ -23,7 +23,5 @@ interface DiscoveryEngine * * @return an instance of the default `DiscoveryEngine` */ - static DiscoveryEngine create() { - return new DefaultDiscoveryEngine(); - } + static DiscoveryEngine create() = new DefaultDiscoveryEngine(); } \ No newline at end of file diff --git a/lib_xunit_engine/src/main/x/xunit_engine/ExecutionConfiguration.x b/lib_xunit_engine/src/main/x/xunit_engine/ExecutionConfiguration.x index d8e7e9ee22..a3c44b93ee 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/ExecutionConfiguration.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/ExecutionConfiguration.x @@ -13,23 +13,17 @@ const ExecutionConfiguration { /** * Return this `ExecutionConfiguration` as a `Builder`. */ - Builder asBuilder() { - return new Builder(this); - } + Builder asBuilder() = new Builder(this); /** * Create a default `ExecutionConfiguration`. */ - static ExecutionConfiguration create() { - return builder().build(); - } + static ExecutionConfiguration create() = builder().build(); /** * Create an `ExecutionConfiguration` builder. */ - static Builder builder() { - return new Builder(); - } + static Builder builder() = new Builder(); /** * An `ExecutionConfiguration` builder. @@ -54,8 +48,6 @@ const ExecutionConfiguration { * * @return an `ExecutionConfiguration` built from this `Builder` */ - ExecutionConfiguration build() { - return new ExecutionConfiguration(this); - } + ExecutionConfiguration build() = new ExecutionConfiguration(this); } } \ No newline at end of file diff --git a/lib_xunit_engine/src/main/x/xunit_engine/ExecutionListener.x b/lib_xunit_engine/src/main/x/xunit_engine/ExecutionListener.x index 9535f1f01f..0220606f63 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/ExecutionListener.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/ExecutionListener.x @@ -75,16 +75,14 @@ interface ExecutionListener { /** * Compare two ReportEntry values for the purposes of ordering. */ - static Ordered compare(CompileType value1, CompileType value2) { - return value1.timestamp <=> value2.timestamp; - } + static Ordered compare(CompileType value1, CompileType value2) = + value1.timestamp <=> value2.timestamp; /** * Compare two ReportEntry values for equality. */ - static Boolean equals(CompileType value1, CompileType value2) { - return value1.timestamp == value2.timestamp; - } + static Boolean equals(CompileType value1, CompileType value2) = + value1.timestamp == value2.timestamp; } // ---- inner const: NoOpListener -------------------------------------------------------------- diff --git a/lib_xunit_engine/src/main/x/xunit_engine/Model.x b/lib_xunit_engine/src/main/x/xunit_engine/Model.x index 78c71876c3..5a8943a76a 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/Model.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/Model.x @@ -83,16 +83,12 @@ interface Model * * A root model is a model without a parent. */ - Boolean isRoot() { - return parentId == Null; - } + Boolean isRoot() = parentId == Null; /** * Determine if this model may register dynamic tests during execution. */ - Boolean mayRegisterTests() { - return False; - } + Boolean mayRegisterTests() = False; /** * Determine if the supplied model (or any of its descendants) @@ -103,10 +99,8 @@ interface Model * @return `True` if the model is a test, contains tests, or may * later register tests dynamically */ - static Boolean containsTests(Model model) { - return !model.isContainer || model.mayRegisterTests() - || model.children.any((d) -> d.containsTests()); - } + static Boolean containsTests(Model model) = + !model.isContainer || model.mayRegisterTests() || model.children.any((d) -> d.containsTests()); /** * Find the model with the supplied unique ID. @@ -167,21 +161,16 @@ interface Model /** * Compare two Model values for equality. */ - static Boolean equals(CompileType value1, CompileType value2) { - return value1.uniqueId == value2.uniqueId; - } + static Boolean equals(CompileType value1, CompileType value2) = + value1.uniqueId == value2.uniqueId; // ----- Stringable methods -------------------------------------------------------------------- @Override - Int estimateStringLength() { - return displayName.estimateStringLength(); - } + Int estimateStringLength() = displayName.estimateStringLength(); @Override - Appender appendTo(Appender buf) { - return displayName.appendTo(buf); - } + Appender appendTo(Appender buf) = displayName.appendTo(buf); // ----- Visitor interface --------------------------------------------------------------------- diff --git a/lib_xunit_engine/src/main/x/xunit_engine/Result.x b/lib_xunit_engine/src/main/x/xunit_engine/Result.x index 052248c11e..e2f218812c 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/Result.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/Result.x @@ -16,9 +16,7 @@ const Result(Status status, Exception? exception = Null, Exception[]? suppressed * * @return a copy of this `Result` with a specific duration */ - Result withDuration(Duration d) { - return new Result(status, exception, suppressed, d); - } + Result withDuration(Duration d) = new Result(status, exception, suppressed, d); /** * A singleton `Result` representing a successful test fixture. diff --git a/lib_xunit_engine/src/main/x/xunit_engine/UniqueId.x b/lib_xunit_engine/src/main/x/xunit_engine/UniqueId.x index 123d0cccda..29e91e9326 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/UniqueId.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/UniqueId.x @@ -37,9 +37,7 @@ const UniqueId * * @return the type of this `UniqueId` */ - @Lazy SegmentType type.calc() { - return segments[size -1].type; - } + @Lazy SegmentType type.calc() = segments[size -1].type; /** * Return the value of this `UniqueId`. @@ -48,9 +46,7 @@ const UniqueId * * @return the value of this `UniqueId` */ - @Lazy String value.calc() { - return segments[size -1].value; - } + @Lazy String value.calc() = segments[size -1].value; /** * Return the path for this `UniqueId`. @@ -94,9 +90,7 @@ const UniqueId * @param type the `Segment` type * @param value the `Segment` value */ - UniqueId! append(SegmentType type, String value) { - return new UniqueId(segments + new Segment(type, value)); - } + UniqueId! append(SegmentType type, String value) = new UniqueId(segments + new Segment(type, value)); /** * Returns the parent of this `UniqueId`. @@ -128,21 +122,16 @@ const UniqueId } @Override - static Boolean equals(CompileType value1, CompileType value2) { - return value1.segments == value2.segments; - } + static Boolean equals(CompileType value1, CompileType value2) + = value1.segments == value2.segments; // ----- Stringable methods -------------------------------------------------------------------- @Override - Int estimateStringLength() { - return stringValue.size; - } + Int estimateStringLength() = stringValue.size; @Override - Appender appendTo(Appender buf) { - return stringValue.appendTo(buf); - } + Appender appendTo(Appender buf) = stringValue.appendTo(buf); // ----- factory methods ----------------------------------------------------------------------- diff --git a/lib_xunit_engine/src/main/x/xunit_engine/discovery/selectors.x b/lib_xunit_engine/src/main/x/xunit_engine/discovery/selectors.x index 9e3b947480..739a3ee760 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/discovery/selectors.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/discovery/selectors.x @@ -165,9 +165,7 @@ package selectors { return selectors; } - Selector forMethod(Class clz, MethodOrFunction testMethod) { - return new MethodSelector(clz, testMethod); - } + Selector forMethod(Class clz, MethodOrFunction testMethod) = new MethodSelector(clz, testMethod); conditional Selector forPackage(Type type) { if (type.isA(Package)) { diff --git a/lib_xunit_engine/src/main/x/xunit_engine/executor/BaseExecutionLifecycle.x b/lib_xunit_engine/src/main/x/xunit_engine/executor/BaseExecutionLifecycle.x index 55c1888630..4dc30dcb17 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/executor/BaseExecutionLifecycle.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/executor/BaseExecutionLifecycle.x @@ -22,9 +22,7 @@ import xunit.MethodOrFunction; // ----- ExecutionLifecycle methods ------------------------------------------------------------ @Override - List getChildren(EngineExecutionContext context) { - return model.children; - } + List getChildren(EngineExecutionContext context) = model.children; // ----- helper methods ------------------------------------------------------------------------ diff --git a/lib_xunit_engine/src/main/x/xunit_engine/executor/EngineExecutionContext.x b/lib_xunit_engine/src/main/x/xunit_engine/executor/EngineExecutionContext.x index 0c71681336..45ab08fa39 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/executor/EngineExecutionContext.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/executor/EngineExecutionContext.x @@ -35,9 +35,7 @@ class EngineExecutionContext /** * The `UniqueId` of the current test fixture. */ - UniqueId uniqueId.get() { - return model.uniqueId; - } + UniqueId uniqueId.get() = model.uniqueId; /** * The human readable name for the test. @@ -102,27 +100,21 @@ class EngineExecutionContext * * @param model the `Model` to execute */ - static Builder builder(Model model) { - return new Builder(model); - } + static Builder builder(Model model)= new Builder(model); /** * Create a `EngineExecutionContext` from the specified `Model`. * * @param model the `Model` to execute */ - static EngineExecutionContext create(Model model) { - return builder(model).build(); - } + static EngineExecutionContext create(Model model)= builder(model).build(); /** * Create a `Builder` from this context and the specified `Model`. * * @param model the `Model` to execute */ - Builder asBuilder(Model model) { - return new Builder(this, model); - } + Builder asBuilder(Model model) = new Builder(this, model); /** * Invoke a `MethodOrFunction` using any registered `ParameterResolver` resources @@ -286,8 +278,6 @@ class EngineExecutionContext return this; } - EngineExecutionContext build() { - return new EngineExecutionContext(this); - } + EngineExecutionContext build() = new EngineExecutionContext(this); } } diff --git a/lib_xunit_engine/src/main/x/xunit_engine/executor/ExceptionCollector.x b/lib_xunit_engine/src/main/x/xunit_engine/executor/ExceptionCollector.x index f9182ff6d3..b597934d95 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/executor/ExceptionCollector.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/executor/ExceptionCollector.x @@ -27,24 +27,18 @@ class ExceptionCollector(AbortExecutionPredicate abortExecution = (e) -> False) /** * @return `True` iff this collector does not contain an `Exception` */ - Boolean empty.get() { - return exception == Null; - } + Boolean empty.get() = exception == Null; /** * @return `True` iff this collector contains a `PreconditionFailed` */ - Boolean skipped.get() { - return exception.is(PreconditionFailed); - } + Boolean skipped.get() = exception.is(PreconditionFailed); /** * @return `True` iff this collector contains an `Exception` * that is not a `PreconditionFailed`. */ - Boolean failed.get() { - return exception != Null && !skipped; - } + Boolean failed.get() = exception != Null && !skipped; /** * @return the `Result` of the test execution based on the state @@ -69,12 +63,11 @@ class ExceptionCollector(AbortExecutionPredicate abortExecution = (e) -> False) * * @param fn the `Function` to execute */ - Boolean executeVoid(function void () fn) { - return executeObject(() -> { - fn(); - return Null; - }); - } + Boolean executeVoid(function void () fn) = + executeObject(() -> { + fn(); + return Null; + }); /** * Execute a `Function` that returns a conditional `Result`, collecting any thrown exceptions. diff --git a/lib_xunit_engine/src/main/x/xunit_engine/executor/ExecutionLifecycle.x b/lib_xunit_engine/src/main/x/xunit_engine/executor/ExecutionLifecycle.x index b12378af6c..c034c72321 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/executor/ExecutionLifecycle.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/executor/ExecutionLifecycle.x @@ -7,17 +7,13 @@ import xunit.SkipResult; * to handle various phases of a test lifecycle. */ interface ExecutionLifecycle - extends Const - { + extends Const { /** * Return the child `Model`s. * * @return the child `Model`s */ - List getChildren(EngineExecutionContext context) - { - return []; - } + List getChildren(EngineExecutionContext context) = []; /** * Prepare an EngineExecutionContext prior to execution. @@ -27,10 +23,7 @@ interface ExecutionLifecycle * @param parentExtensions` the optional parent model's extensions */ EngineExecutionContext prepare(EngineExecutionContext context, ExtensionRegistry extensions, - ExtensionRegistry? parentExtensions) - { - return context; - } + ExtensionRegistry? parentExtensions) = context; /** * Determine whether the execution of the supplied EngineExecutionContext @@ -38,10 +31,7 @@ interface ExecutionLifecycle * * @param context the `EngineExecutionContext` to execute in */ - SkipResult shouldBeSkipped(EngineExecutionContext context, ExtensionRegistry extensions) - { - return SkipResult.NotSkipped; - } + SkipResult shouldBeSkipped(EngineExecutionContext context, ExtensionRegistry extensions) = SkipResult.NotSkipped; /** * Execute the before behavior of this ExecutionLifecycle. @@ -53,10 +43,8 @@ interface ExecutionLifecycle * * @return the context to use to execute children of this ExecutionLifecycle */ - EngineExecutionContext before(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) - { - return context; - } + EngineExecutionContext before(ExceptionCollector collector, EngineExecutionContext context, + ExtensionRegistry extensions) = context; /** * Execute the behavior of this ExecutionLifecycle. @@ -72,10 +60,8 @@ interface ExecutionLifecycle * @return the context to use to execute children of this ExecutionLifecycle and execution * of the after behaviour in the parent of this ExecutionLifecycle */ - EngineExecutionContext execute(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) - { - return context; - } + EngineExecutionContext execute(ExceptionCollector collector, EngineExecutionContext context, + ExtensionRegistry extensions) = context; /** * Execute any after behavior for this ExecutionLifecycle. @@ -84,9 +70,8 @@ interface ExecutionLifecycle * @param collector the exception collector to use * @param context the `EngineExecutionContext` to execute in */ - void after(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) - { - } + void after(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) { + } /** * Clean up the supplied EngineExecutionContext after execution. @@ -94,9 +79,8 @@ interface ExecutionLifecycle * @param collector the exception collector to use * @param context the `EngineExecutionContext` to execute in */ - void cleanUp(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) - { - } + void cleanUp(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) { + } /** * a callback that will be invoked if execution of this ExecutionLifecycle was skipped. @@ -105,9 +89,8 @@ interface ExecutionLifecycle * @param model the test model that was skipped * @param result the result of skipped execution */ - void onSkipped(EngineExecutionContext context, ExtensionRegistry extensions, SkipResult result) - { - } + void onSkipped(EngineExecutionContext context, ExtensionRegistry extensions, SkipResult result) { + } /** * a callback that will be invoked when execution of this ExecutionLifecycle has completed. @@ -116,16 +99,17 @@ interface ExecutionLifecycle * @param model the test model that was skipped * @param result the result of the execution */ - void onCompleted(EngineExecutionContext context, ExtensionRegistry extensions, Result result) - { - } + void onCompleted(EngineExecutionContext context, ExtensionRegistry extensions, Result result) { + } /** * A no-op instance of an `ExecutionLifecycle`. */ static const NoOp - implements ExecutionLifecycle - { + implements ExecutionLifecycle { + /** + * A singleton instance of `NoOp`. + */ static ExecutionLifecycle Instance = new NoOp(); - } } +} diff --git a/lib_xunit_engine/src/main/x/xunit_engine/executor/MethodExecutionLifecycle.x b/lib_xunit_engine/src/main/x/xunit_engine/executor/MethodExecutionLifecycle.x index 368328526b..7bbccad615 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/executor/MethodExecutionLifecycle.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/executor/MethodExecutionLifecycle.x @@ -61,9 +61,7 @@ const MethodExecutionLifecycle } @Override - EngineExecutionContext before(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) { - return context; - } + EngineExecutionContext before(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) = context; @Override EngineExecutionContext execute(ExceptionCollector collector, EngineExecutionContext context, ExtensionRegistry extensions) { @@ -133,7 +131,6 @@ const MethodExecutionLifecycle * @param builder the `EngineExecutionContext` builder that may be modified * @param extensions the `ExtensionRegistry` to add `Extensions` to */ - protected void prepare(EngineExecutionContext.Builder builder, ExtensionRegistry extensions) - { - } + protected void prepare(EngineExecutionContext.Builder builder, ExtensionRegistry extensions) { + } } \ No newline at end of file diff --git a/lib_xunit_engine/src/main/x/xunit_engine/executor/TemplateExecutionLifecycle.x b/lib_xunit_engine/src/main/x/xunit_engine/executor/TemplateExecutionLifecycle.x index 317eaa6d8d..1a5d1cd76f 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/executor/TemplateExecutionLifecycle.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/executor/TemplateExecutionLifecycle.x @@ -21,9 +21,8 @@ const TemplateExecutionLifecycle // ----- ExecutionLifecycle methods ------------------------------------------------------------ @Override - List getChildren(EngineExecutionContext context) { - return createChildren(model.template.templateFactories, 0, context, new Array()); - } + List getChildren(EngineExecutionContext context) = + createChildren(model.template.templateFactories, 0, context, new Array()); // ----- helper methods ------------------------------------------------------------------------ diff --git a/lib_xunit_engine/src/main/x/xunit_engine/extensions/ExtensionRegistry.x b/lib_xunit_engine/src/main/x/xunit_engine/extensions/ExtensionRegistry.x index 77ae2490ce..cc277ef146 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/extensions/ExtensionRegistry.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/extensions/ExtensionRegistry.x @@ -48,11 +48,10 @@ class ExtensionRegistry * * @param type the type of `Extension` to return */ - ExtensionType[] get(Type type) { - return getByType(type) - .map(holder -> holder.extension.as(ExtensionType)) - .toArray(); - } + ExtensionType[] get(Type type) = + getByType(type) + .map(holder -> holder.extension.as(ExtensionType)) + .toArray(); /** * Add an `Extension` to this registry. @@ -160,9 +159,7 @@ class ExtensionRegistry * * @return `True` if this holder contains an `Extension` of the specified `Type` */ - Boolean isType(Type type) { - return type.isInstance(extension); - } + Boolean isType(Type type) = type.isInstance(extension); /** * Order holders by priority. diff --git a/lib_xunit_engine/src/main/x/xunit_engine/models/ContainerModel.x b/lib_xunit_engine/src/main/x/xunit_engine/models/ContainerModel.x index 4ce85d90a9..c57921ac57 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/models/ContainerModel.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/models/ContainerModel.x @@ -49,21 +49,15 @@ const ContainerModel } @Override - ExecutionLifecycle createExecutionLifecycle() { - return new ContainerExecutionLifecycle(this); - } + ExecutionLifecycle createExecutionLifecycle() = new ContainerExecutionLifecycle(this); // ----- Stringable methods -------------------------------------------------------------------- @Override - Int estimateStringLength() { - return stringValue.size; - } + Int estimateStringLength() = stringValue.size; @Override - Appender appendTo(Appender buf) { - return stringValue.appendTo(buf); - } + Appender appendTo(Appender buf) = stringValue.appendTo(buf); // ----- inner service: Builder ---------------------------------------------------------------- @@ -94,7 +88,6 @@ const ContainerModel Type type = clz.toType(); Model.Constructor? constructor = clz.isSingleton() ? Null : utils.findTestConstructor(type); ExtensionProvider[] providers = utils.findExtensions(clz); - return new ContainerModel(uniqueId, clz, name, constructor, providers, children); } } diff --git a/lib_xunit_engine/src/main/x/xunit_engine/models/MethodModel.x b/lib_xunit_engine/src/main/x/xunit_engine/models/MethodModel.x index 6f440a580b..13d432ab6c 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/models/MethodModel.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/models/MethodModel.x @@ -64,26 +64,18 @@ const MethodModel /** * The lazily calculated string value for this model. */ - @Lazy private String stringValue.calc() { - return $"MethodModel(id={uniqueId})"; - } + @Lazy private String stringValue.calc() = $"MethodModel(id={uniqueId})"; @Override - ExecutionLifecycle createExecutionLifecycle() { - return new MethodExecutionLifecycle(this); - } + ExecutionLifecycle createExecutionLifecycle() = new MethodExecutionLifecycle(this); // ----- Stringable methods -------------------------------------------------------------------- @Override - Int estimateStringLength() { - return stringValue.size; - } + Int estimateStringLength() = stringValue.size; @Override - Appender appendTo(Appender buf) { - return stringValue.appendTo(buf); - } + Appender appendTo(Appender buf) = stringValue.appendTo(buf); // ----- inner service: Builder ---------------------------------------------------------------- @@ -122,9 +114,7 @@ const MethodModel // ----- Stringable methods ---------------------------------------------------------------- @Override - Int estimateStringLength() { - return uniqueId.estimateStringLength() + clz.estimateStringLength(); - } + Int estimateStringLength() = uniqueId.estimateStringLength() + clz.estimateStringLength(); @Override Appender appendTo(Appender buf) { diff --git a/lib_xunit_engine/src/main/x/xunit_engine/models/TemplateModel.x b/lib_xunit_engine/src/main/x/xunit_engine/models/TemplateModel.x index b4b18b02ea..084cc39093 100644 --- a/lib_xunit_engine/src/main/x/xunit_engine/models/TemplateModel.x +++ b/lib_xunit_engine/src/main/x/xunit_engine/models/TemplateModel.x @@ -25,7 +25,5 @@ const TemplateModel public/private Model template; @Override - ExecutionLifecycle createExecutionLifecycle() { - return new TemplateExecutionLifecycle(this); - } + ExecutionLifecycle createExecutionLifecycle() = new TemplateExecutionLifecycle(this); }