From 60d938ffc0de3edf11808bdc9803511dd5243893 Mon Sep 17 00:00:00 2001 From: Robert Stoll Date: Thu, 29 Aug 2019 11:37:11 +0200 Subject: [PATCH] kotlin.code.style.official, reformat newer code no need to reformat deprecated functionality --- .../build.gradle | 6 +- ...arSequenceContainsAtLeastAssertionsSpec.kt | 2 +- ...arSequenceContainsExactlyAssertionsSpec.kt | 8 +- ...sertionsBoundedReferenceAlternativeSpec.kt | 3 - .../atrium-api-fluent-en_GB-js/build.gradle | 6 +- .../atrium-api-fluent-en_GB-jvm/build.gradle | 6 +- .../en_GB/floatingPointJvmAssertions.kt | 4 +- .../atrium-api-fluent-en_GB-jdk8/build.gradle | 6 +- build.gradle | 1 + .../src/test/kotlin/custom/SmokeSpec.kt | 6 +- .../atrium/assertions/AssertionGroup.kt | 41 +++++----- .../atrium/assertions/DescriptiveAssertion.kt | 3 +- .../atrium/assertions/IndentAssertionGroup.kt | 4 +- .../assertions/InvisibleAssertionGroup.kt | 4 +- .../builders/AssertionBuilderFinalStep.kt | 2 +- ...DescriptionAndEmptyRepresentationOption.kt | 9 ++- .../assertions/builders/AssertionsOption.kt | 19 +++-- .../builders/BasicAssertionGroupFinalStep.kt | 4 +- .../atrium/assertions/builders/descriptive.kt | 4 +- .../atrium/assertions/builders/explanatory.kt | 37 +++++---- .../assertions/builders/explanatoryGroup.kt | 34 +++++--- .../builders/impl/AssertionBuilderImpl.kt | 32 ++++---- ...riptionAndEmptyRepresentationOptionImpl.kt | 2 +- .../builders/impl/AssertionsOptionImpl.kt | 4 +- ...dClaimLikeAssertionGroupHoldsOptionImpl.kt | 12 +-- .../builders/impl/descriptive/defaultImpls.kt | 7 +- .../builders/impl/explanatory/defaultImpls.kt | 7 +- .../FixedClaimAssertionGroup.kt | 4 +- .../PartiallyFixedClaimAssertionGroup.kt | 4 +- .../atrium/assertions/builders/root.kt | 5 +- .../atrium/core/polyfills/kClassExtentions.kt | 2 +- .../tutteli/atrium/creating/AssertionPlant.kt | 8 +- .../atrium/creating/AssertionPlantNullable.kt | 1 + .../AssertionPlantWithCommonFields.kt | 3 + .../creating/BaseCollectingAssertionPlant.kt | 1 + .../creating/BaseReportingAssertionPlant.kt | 1 + .../creating/CollectingAssertionPlant.kt | 1 + .../CollectingAssertionPlantNullable.kt | 1 + .../tutteli/atrium/creating/MaybeSubject.kt | 6 +- .../creating/PlantHasNoSubjectException.kt | 9 ++- .../creating/ReportingAssertionPlant.kt | 1 + .../ReportingAssertionPlantNullable.kt | 1 + .../atrium/creating/SubjectProvider.kt | 4 +- .../atrium/reporting/AssertionFormatter.kt | 6 +- .../reporting/AssertionFormatterController.kt | 6 +- .../reporting/AssertionFormatterFacade.kt | 2 +- .../AssertionFormatterParameterObject.kt | 16 ++-- .../reporting/AssertionPairFormatter.kt | 6 +- .../ch/tutteli/atrium/reporting/constants.kt | 5 +- .../ArgumentsSupportingTranslator.kt | 2 +- .../translating/LocaleOrderDecider.kt | 1 + .../translating/TranslatableWithArgs.kt | 20 +++-- .../translating/UsingDefaultTranslator.kt | 2 - .../ch/tutteli/atrium/core/CoreFactory.kt | 24 +++--- .../tutteli/atrium/reporting/AtriumError.kt | 4 +- .../atrium/core/polyfills/KClassCastTest.kt | 6 +- .../atrium/core/polyfills/testUtils.kt | 1 + .../ch/tutteli/atrium/core/CoreFactory.kt | 24 +++--- .../atrium/core/migration/toAtriumLocale.kt | 13 ++- .../atrium/core/polyfills/stringExtensions.kt | 1 - .../tutteli/atrium/reporting/AtriumError.kt | 4 +- .../build.gradle | 6 +- .../lib/checking/FeatureAssertionChecker.kt | 9 ++- .../MutableListBasedAssertionPlant.kt | 3 +- .../ReportingAssertionPlantNullableImpl.kt | 1 + ...AssertionFormatterControllerBasedFacade.kt | 8 +- .../AssertionFormatterControllerImpl.kt | 11 ++- .../reporting/MultiAtriumErrorAdjusterImpl.kt | 2 +- ...attingSingleAssertionGroupTypeFormatter.kt | 5 +- .../lib/reporting/OnlyFailureReporter.kt | 4 +- .../RemoveAtriumFromAtriumErrorAdjuster.kt | 2 +- .../RemoveRunnerAtriumErrorAdjuster.kt | 2 +- .../SingleAssertionGroupTypeFormatter.kt | 31 +++++-- .../TextExplanatoryAssertionGroupFormatter.kt | 10 ++- .../TextFallbackAssertionFormatter.kt | 23 ++++-- .../TextFeatureAssertionGroupFormatter.kt | 10 ++- .../TextIndentAssertionGroupFormatter.kt | 12 ++- .../TextListBasedAssertionGroupFormatter.kt | 7 +- .../TextNextLineAssertionPairFormatter.kt | 21 +++-- .../TextPrefixBasedAssertionGroupFormatter.kt | 12 ++- .../TextSameLineAssertionPairFormatter.kt | 16 +++- .../TextSummaryAssertionGroupFormatter.kt | 10 ++- .../reporting/FilterAtriumErrorAdjuster.kt | 2 +- .../lib/reporting/DetailedObjectFormatter.kt | 2 +- .../RemoveRunnerAtriumErrorAdjuster.kt | 5 +- .../ResourceBundleBasedTranslator.kt | 4 +- .../translating/Atrium_de.properties | 4 +- .../translating/Atrium_de_CH.properties | 2 +- .../translating/Atrium_fr.properties | 8 +- .../translating/Atrium_zh.properties | 2 +- .../translating/Atrium_zh_Hans.properties | 4 +- .../translating/Atrium_zh_Hans_CN.properties | 2 +- .../translating/Atrium_zh_Hant.properties | 4 +- .../translating/Atrium_zh_Hant_HK.properties | 2 +- .../translating/Atrium_zh_Hant_MO.properties | 2 +- .../translating/Atrium_zh_Hant_TW.properties | 2 +- .../atrium/specs/AssertionVerb_fr.properties | 2 +- .../DescriptionAnyAssertion_fr.properties | 2 +- .../DescriptionBasic_de.properties | 4 +- .../DescriptionBasic_de_CH.properties | 2 +- .../DescriptionBasic_fr.properties | 4 +- .../DescriptionBasic_zh_Hans.properties | 4 +- .../DescriptionBasic_zh_Hans_CN.properties | 2 +- .../DescriptionBasic_zh_Hans_SG.properties | 2 +- .../DescriptionBasic_zh_Hant.properties | 4 +- .../DescriptionBasic_zh_Hant_HK.properties | 2 +- .../DescriptionBasic_zh_Hant_MO.properties | 2 +- .../DescriptionBasic_zh_Hant_TW.properties | 2 +- .../DescriptionBasic_zh_TW.properties | 2 +- .../core/robstoll/CoreFactoryCommonImpl.kt | 4 +- .../atrium/core/robstoll/registerServices.kt | 1 + .../atrium/core/robstoll/CoreFactoryImpl.kt | 4 +- .../domain/creating/ComparableAssertions.kt | 11 +-- .../creating/FloatingPointAssertions.kt | 3 +- .../domain/creating/MapEntryAssertions.kt | 4 +- .../atrium/domain/creating/PairAssertions.kt | 17 +++- .../domain/creating/ThrowableAssertions.kt | 4 +- .../AnyTypeTransformationAssertions.kt | 10 ++- .../feature/extract/FeatureExtractor.kt | 15 ++-- .../FeatureExtractorCreatorFactory.kt | 4 +- .../feature/extract/impl/deprecatedImpl.kt | 4 +- .../iterable/contains/IterableContains.kt | 5 +- ...InOrderOnlyGroupedWithinSearchBehaviour.kt | 2 - .../throwable/thrown/ThrowableThrown.kt | 8 +- .../creating/FloatingPointAssertions.kt | 2 +- .../domain/creating/BigDecimalAssertions.kt | 7 +- .../creating/FloatingPointAssertions.kt | 9 ++- .../atrium/domain/builders/AssertImpl.kt | 3 +- .../creating/MapEntryAssertionsBuilder.kt | 1 - .../creating/PairAssertionsBuilder.kt | 1 + .../creating/anyAssertionsBuilders.kt | 10 ++- .../changers/FeatureExtractorBuilder.kt | 6 +- .../charSequenceAssertionsBuilders.kt | 81 +++++++++++-------- .../builders/AtLeastCheckerOptionBase.kt | 2 +- .../builders/AtLeastCheckerOptionBase.kt | 2 +- .../builders/AtMostCheckerOptionBase.kt | 2 +- .../builders/ButAtMostCheckerOptionBase.kt | 4 +- .../builders/ExactlyCheckerOptionBase.kt | 2 +- .../contains/builders/NotCheckerOptionBase.kt | 2 +- .../builders/NotOrAtMostCheckerOptionBase.kt | 2 +- .../creating/throwableAssertionsBuilders.kt | 10 ++- .../AssertionFormatterControllerOption.kt | 4 +- .../AssertionFormatterFacadeOption.kt | 4 +- .../reporting/AssertionPairFormatterOption.kt | 19 +++-- .../AtriumErrorAdjusterCommonOption.kt | 2 +- .../reporting/LocaleOrderDeciderOption.kt | 4 +- .../reporting/ObjectFormatterOption.kt | 3 +- .../builders/reporting/ReporterBuilder.kt | 5 +- .../reporting/ReporterBuilderFinalStep.kt | 3 +- .../reporting/TextAssertionFormatterOption.kt | 2 +- .../builders/reporting/TranslatorOption.kt | 2 +- .../AssertionFormatterControllerOptionImpl.kt | 8 +- .../AssertionFormatterFacadeOptionImpl.kt | 8 +- .../impl/AssertionPairFormatterOptionImpl.kt | 4 +- .../impl/LocaleOrderDeciderOptionImpl.kt | 7 +- .../impl/ObjectFormatterOptionImpl.kt | 7 +- .../reporting/impl/TranslatorOptionImpl.kt | 8 +- .../builders/utils/containsValidators.kt | 3 +- .../domain/builders/utils/groupsToList.kt | 4 +- .../atrium/domain/builders/utils/nullable.kt | 9 ++- .../domain/builders/utils/MapArgumentsSpec.kt | 4 +- .../domain/builders/registerServices.kt | 1 + .../builders/reporting/ReporterBuilder.kt | 2 +- .../builders/reporting/TranslatorOption.kt | 2 +- .../reporting/impl/ReporterBuilderImpl.kt | 13 ++- .../reporting/impl/ReporterBuilderImpl.kt | 14 ++-- .../build.gradle | 6 +- .../build.gradle | 6 +- .../composers/descriptiveWithFailureHint.kt | 2 +- .../TypeTransformationAssertionCreator.kt | 14 ++-- .../ExplanatoryFailureHandler.kt | 4 +- .../ExplanatoryFailureHandlerBase.kt | 4 +- .../ExplanatoryFailureHandlerWithHint.kt | 6 +- .../collectionAssertionsDeprecated.kt | 1 + .../AssertionCollectorForExplanationImpl.kt | 1 + .../collectors/collectOrExplainDeprecated.kt | 2 +- .../creators/FeatureExtractorCreatorImpl.kt | 69 +++++++++------- ...yOrderEntriesDeprecatedAssertionCreator.kt | 21 ++++- ...erOnlyEntriesDeprecatedAssertionCreator.kt | 5 +- .../InOrderOnlyDeprecatedAssertionCreator.kt | 16 ++-- .../InOrderOnlyEntriesDeprecatedMatcher.kt | 6 +- ...erOnlyGroupedDeprecatedAssertionCreator.kt | 2 +- ...roupedEntriesDeprecatedAssertionCreator.kt | 10 ++- .../contains/creators/creatorsDeprecated.kt | 21 +++-- .../creating/iterableAssertionsDeprecated.kt | 19 +++-- .../lib/creating/listAssertionsDeprecated.kt | 1 + .../lib/creating/mapAssertionsDeprecated.kt | 44 +++++----- .../creating/mapEntryAssertionsDeprecated.kt | 17 ++-- .../lib/creating/pairAssertionsDeprecated.kt | 15 ++-- .../ThrowableThrownAssertionCreator.kt | 20 +++-- .../build.gradle | 6 +- .../build.gradle | 6 +- .../creating/floatingPointJvmAssertions.kt | 6 +- .../LazyThreadUnsafeAssertionGroupSpec.kt | 2 +- .../creating/CharSequenceAssertionsImpl.kt | 45 ++++------- .../creating/ThrowableAssertionsImpl.kt | 9 ++- .../AnyTypeTransformationAssertionsImpl.kt | 5 +- .../FailureHandlerFactoryImpl.kt | 7 +- .../CharSequenceContainsAssertionsImpl.kt | 2 +- .../SearchBehaviourFactoryImpl.kt | 3 +- .../FeatureExtractorCreatorFactoryImpl.kt | 11 ++- ...terableContainsAssertionsDeprecatedImpl.kt | 5 +- .../SearchBehaviourFactoryImpl.kt | 19 ++--- ...sentThrowableMessageProviderFactoryImpl.kt | 4 +- .../domain/robstoll/registerServices.kt | 1 + gradle.properties | 1 + misc/atrium-bc-test/build.gradle | 10 +-- .../ch/tutteli/atrium/spec/ForgivingTest.kt | 5 +- ...IterableContainsNotValuesAssertionsSpec.kt | 5 +- .../org/spekframework/spek2/dsl/GroupScope.kt | 3 +- .../org/spekframework/spek2/dsl/Root.kt | 5 +- .../spek2/style/specification/describe.kt | 10 +-- .../translating/TranslatorIntSpec.kt | 2 +- .../atrium/verbs/internal/atriumVerbs.kt | 22 ++--- .../atrium/verbs/internal/registerServices.kt | 1 + .../translations/DescriptionAnyAssertion.kt | 10 ++- .../DescriptionIterableAssertion.kt | 6 +- .../DescriptionThrowableAssertion.kt | 5 +- .../DescriptionTypeTransformationAssertion.kt | 8 +- .../translations/DescriptionAnyAssertion.kt | 10 ++- .../DescriptionIterableAssertion.kt | 3 +- .../DescriptionThrowableAssertion.kt | 5 +- .../DescriptionTypeTransformationAssertion.kt | 5 +- 223 files changed, 991 insertions(+), 704 deletions(-) create mode 100644 gradle.properties diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-android/build.gradle b/apis/fluent-en_GB/atrium-api-fluent-en_GB-android/build.gradle index da2679e69..643f7459c 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-android/build.gradle +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-android/build.gradle @@ -1,7 +1,7 @@ description = 'A fluent assertion function API in en_GB with a focus on code completion for Android.' + - 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + - 'in other words, the developer should be able to: ' + - 'start creating an assertion + code completion + . + code completion + . + and so on.' + 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + + 'in other words, the developer should be able to: ' + + 'start creating an assertion + code completion + . + code completion + . + and so on.' dependencies { api prefixedProject('domain-builders-android') diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastAssertionsSpec.kt index 9c99be13c..3cf6edae1 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastAssertionsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsAtLeastAssertionsSpec.kt @@ -79,7 +79,7 @@ class CharSequenceContainsAtLeastAssertionsSpec : Spek({ aX: Array ) = expect.contains.atLeast(atLeast).butAtMost(butAtMost).values(a, *aX) - private val atLeastButAtMostIgnoringCaseDescr = { what: String, timesAtLeast: String, timesAtMost: String -> + private val atLeastButAtMostIgnoringCaseDescr = { what: String, timesAtLeast: String, timesAtMost: String -> "$contains $ignoringCase $what $atLeast $timesAtLeast $butAtMost $timesAtMost" } diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyAssertionsSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyAssertionsSpec.kt index 0c4c29c2b..4c8f7a125 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyAssertionsSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/CharSequenceContainsExactlyAssertionsSpec.kt @@ -24,8 +24,12 @@ class CharSequenceContainsExactlyAssertionsSpec : ("$contains.$ignoringCase.$exactly" to Companion::containsExactlyIgnoringCase) - private fun containsExactlyIgnoringCase(expect: Expect, exactly: Int, a: Any, aX: Array) = - expect.contains.ignoringCase.exactly(exactly).values(a, *aX) + private fun containsExactlyIgnoringCase( + expect: Expect, + exactly: Int, + a: Any, + aX: Array + ) = expect.contains.ignoringCase.exactly(exactly).values(a, *aX) private fun getContainsNotPair() = containsNot to Companion::getErrorMsgContainsNot diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt index 62d3051b2..c3ce3edcd 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-common/src/test/kotlin/ch/tutteli/atrium/api/fluent/en_GB/FeatureAssertionsBoundedReferenceAlternativeSpec.kt @@ -1,7 +1,5 @@ package ch.tutteli.atrium.api.fluent.en_GB - - class FeatureAssertionsBoundedReferenceAlternativeSpec : ch.tutteli.atrium.specs.integration.FeatureAssertionsSpec( propertyImmediate, propertyLazy, @@ -102,4 +100,3 @@ class FeatureAssertionsBoundedReferenceAlternativeSpec : ch.tutteli.atrium.specs val f5EmptyAssertionCreator: F = { feature({ f5(it::return5, "a", 1, true, 1.2, 'b') }) {} } } } - diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-js/build.gradle b/apis/fluent-en_GB/atrium-api-fluent-en_GB-js/build.gradle index 663185bf7..2d315c336 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-js/build.gradle +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-js/build.gradle @@ -1,7 +1,7 @@ description = 'An assertion function API in en_GB with a focus on code completion for the JS platform.' + - 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + - 'in other words, the developer should be able to: ' + - 'start creating an assertion + code completion + . + code completion + . + and so on.' + 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + + 'in other words, the developer should be able to: ' + + 'start creating an assertion + code completion + . + code completion + . + and so on.' dependencies { api prefixedProject('domain-builders-js') diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/build.gradle b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/build.gradle index 28117f748..47caf138c 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/build.gradle +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/build.gradle @@ -1,7 +1,7 @@ description = 'A fluent assertion function API in en_GB with a focus on code completion for the JVM platform.' + - 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + - 'in other words, the developer should be able to: ' + - 'start creating an assertion + code completion + . + code completion + . + and so on.' + 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + + 'in other words, the developer should be able to: ' + + 'start creating an assertion + code completion + . + code completion + . + and so on.' ext.jacoco_additional = [ prefixedProject('translations-en_GB-jvm'), diff --git a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointJvmAssertions.kt b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointJvmAssertions.kt index b67b5a1ec..a2cec756a 100644 --- a/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointJvmAssertions.kt +++ b/apis/fluent-en_GB/atrium-api-fluent-en_GB-jvm/src/main/kotlin/ch/tutteli/atrium/api/fluent/en_GB/floatingPointJvmAssertions.kt @@ -20,5 +20,5 @@ import java.math.BigDecimal * @return This assertion container to support a fluent API. * @throws AssertionError Might throw an [AssertionError] if the assertion made is not correct. */ -fun Expect.toBeWithErrorTolerance(expected: BigDecimal, tolerance: BigDecimal) - = addAssertion(ExpectImpl.floatingPoint.toBeWithErrorTolerance(this, expected, tolerance)) +fun Expect.toBeWithErrorTolerance(expected: BigDecimal, tolerance: BigDecimal) = + addAssertion(ExpectImpl.floatingPoint.toBeWithErrorTolerance(this, expected, tolerance)) diff --git a/apis/fluent-en_GB/extensions/atrium-api-fluent-en_GB-jdk8/build.gradle b/apis/fluent-en_GB/extensions/atrium-api-fluent-en_GB-jdk8/build.gradle index 656c0929a..f6871daa2 100644 --- a/apis/fluent-en_GB/extensions/atrium-api-fluent-en_GB-jdk8/build.gradle +++ b/apis/fluent-en_GB/extensions/atrium-api-fluent-en_GB-jdk8/build.gradle @@ -1,7 +1,7 @@ description = 'A fluent assertion function API in en_GB with a focus on code completion for the JVM platform version >= 8.' + - 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + - 'in other words, the developer should be able to: ' + - 'start creating an assertion + code completion + . + code completion + . + and so on.' + 'It provides a fluent API in en_GB which is designed to ease the usage of code completion or ' + + 'in other words, the developer should be able to: ' + + 'start creating an assertion + code completion + . + code completion + . + and so on.' ext.jacoco_additional = [ prefixedProject('domain-builders-jvm'), diff --git a/build.gradle b/build.gradle index e90274fef..aea53ca90 100644 --- a/build.gradle +++ b/build.gradle @@ -298,6 +298,7 @@ def createRegisterJsServicesTask(String projectName, String packageName, Functio doLast { services.write("""\ @file:Suppress("DEPRECATION") + package $packageName import ch.tutteli.atrium.core.polyfills.registerService diff --git a/bundles/fluent-en_GB/atrium-fluent-en_GB-jvm/src/test/kotlin/custom/SmokeSpec.kt b/bundles/fluent-en_GB/atrium-fluent-en_GB-jvm/src/test/kotlin/custom/SmokeSpec.kt index ef3da806f..76c73b297 100644 --- a/bundles/fluent-en_GB/atrium-fluent-en_GB-jvm/src/test/kotlin/custom/SmokeSpec.kt +++ b/bundles/fluent-en_GB/atrium-fluent-en_GB-jvm/src/test/kotlin/custom/SmokeSpec.kt @@ -4,7 +4,7 @@ import ch.tutteli.atrium.api.fluent.en_GB.toBe import ch.tutteli.atrium.api.verbs.assertThat import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.Expect -import ch.tutteli.atrium.domain.builders.AssertImpl +import ch.tutteli.atrium.domain.builders.ExpectImpl import ch.tutteli.atrium.reporting.RawString import ch.tutteli.atrium.reporting.translating.StringBasedTranslatable import ch.tutteli.atrium.translations.DescriptionBasic @@ -31,7 +31,9 @@ fun Expect.isEven() = fun Expect.isMultipleOf(base: Int) = addAssertion(_isMultipleOf(this, base)) fun _isMultipleOf(assertionContainer: Expect, base: Int): Assertion = - AssertImpl.builder.createDescriptive(assertionContainer, DescriptionIntAssertions.IS_MULTIPLE_OF, base) { it % base == 0 } + ExpectImpl.builder.createDescriptive(assertionContainer, DescriptionIntAssertions.IS_MULTIPLE_OF, base) { + it % base == 0 + } enum class DescriptionIntAssertions(override val value: String) : StringBasedTranslatable { IS_MULTIPLE_OF("is multiple of") diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/AssertionGroup.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/AssertionGroup.kt index 5012d1e11..b0d8c5965 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/AssertionGroup.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/AssertionGroup.kt @@ -16,7 +16,8 @@ interface AssertionGroup : Assertion { val description: Translatable @Deprecated("Use description; will be removed with 1.0.0", ReplaceWith("description")) - val name get() = description + val name + get() = description /** @@ -34,7 +35,8 @@ interface AssertionGroup : Assertion { val representation: Any @Deprecated("Use representation; will be removed with 1.0.0", ReplaceWith("representation")) - val subject get() = representation + val subject + get() = representation /** @@ -113,17 +115,17 @@ interface AssertionGroup : Assertion { @Deprecated("Use AssertImpl.builder instead; will be removed with 1.0.0") class BasicAssertionGroupBuilder(private val groupType: AssertionGroupType) { - fun create(name: Translatable, subject: Any, assertion: Assertion): AssertionGroup - = assertionBuilder.customType(groupType) - .withDescriptionAndRepresentation(name, subject) - .withAssertion(assertion) - .build() + fun create(name: Translatable, subject: Any, assertion: Assertion): AssertionGroup = + assertionBuilder.customType(groupType) + .withDescriptionAndRepresentation(name, subject) + .withAssertion(assertion) + .build() - fun create(name: Translatable, subject: Any, assertions: List): AssertionGroup - = assertionBuilder.customType(groupType) - .withDescriptionAndRepresentation(name, subject) - .withAssertions(assertions) - .build() + fun create(name: Translatable, subject: Any, assertions: List): AssertionGroup = + assertionBuilder.customType(groupType) + .withDescriptionAndRepresentation(name, subject) + .withAssertions(assertions) + .build() } @Suppress("DEPRECATION") @@ -137,22 +139,21 @@ interface AssertionGroup : Assertion { @Suppress("DEPRECATION") @Deprecated("Use AssertImpl.builder instead; will be removed with 1.0.0") class ExplanatoryAssertionGroupBuilder(private val groupType: ExplanatoryAssertionGroupType) { - fun create(assertion: Assertion): ExplanatoryAssertionGroup - = create(assertion) + fun create(assertion: Assertion): ExplanatoryAssertionGroup = create(assertion) - fun create(assertions: List): ExplanatoryAssertionGroup - = ExplanatoryAssertionGroup(groupType, assertions) + fun create(assertions: List): ExplanatoryAssertionGroup = + ExplanatoryAssertionGroup(groupType, assertions) } @Deprecated("Use AssertImpl.builder instead; will be removed with 1.0.0") class EmptyNameAndSubjectAssertionGroupBuilder(private val groupType: AssertionGroupType) { - fun create(assertion: Assertion): AssertionGroup - = AssertionsOption.withDefaultFinalStepAndEmptyDescriptionAndRepresentation(groupType) + fun create(assertion: Assertion): AssertionGroup = + AssertionsOption.withDefaultFinalStepAndEmptyDescriptionAndRepresentation(groupType) .withAssertion(assertion) .build() - fun create(assertions: List): AssertionGroup - = AssertionsOption.withDefaultFinalStepAndEmptyDescriptionAndRepresentation(groupType) + fun create(assertions: List): AssertionGroup = + AssertionsOption.withDefaultFinalStepAndEmptyDescriptionAndRepresentation(groupType) .withAssertions(assertions) .build() } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/DescriptiveAssertion.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/DescriptiveAssertion.kt index 0361aa783..6e06a3c4c 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/DescriptiveAssertion.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/DescriptiveAssertion.kt @@ -16,7 +16,8 @@ interface DescriptiveAssertion : Assertion { val representation: Any @Deprecated("Use representation; will be removed with 1.0.0", ReplaceWith("representation")) - val expected get() = representation + val expected + get() = representation /** * The complementary description to the [representation] result such as `contains`, `is not` etc. diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/IndentAssertionGroup.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/IndentAssertionGroup.kt index 6eb0db952..e4e757fa5 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/IndentAssertionGroup.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/IndentAssertionGroup.kt @@ -10,5 +10,5 @@ package ch.tutteli.atrium.assertions */ @Suppress("DEPRECATION" /* TODO remove with 1.0.0 */) @Deprecated("So far indentation was achieved by grouping (which is the solution to go). See AssertImpl.builder for different groups. Will be removed with 1.0.0") -class IndentAssertionGroup(assertions: List) - : EmptyNameAndRepresentationAssertionGroup(DefaultIndentAssertionGroupType, assertions) +class IndentAssertionGroup(assertions: List) : + EmptyNameAndRepresentationAssertionGroup(DefaultIndentAssertionGroupType, assertions) diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/InvisibleAssertionGroup.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/InvisibleAssertionGroup.kt index 94f7bc807..36def2ffc 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/InvisibleAssertionGroup.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/InvisibleAssertionGroup.kt @@ -9,5 +9,5 @@ package ch.tutteli.atrium.assertions */ @Suppress("DEPRECATION" /* TODO remove with 1.0.0 */) @Deprecated("Use AssertionGroup, do not rely on this specific type, will be made internal with 1.0.0") -class InvisibleAssertionGroup internal constructor(assertions: List) - : EmptyNameAndRepresentationAssertionGroup(InvisibleAssertionGroupType, assertions) +class InvisibleAssertionGroup internal constructor(assertions: List) : + EmptyNameAndRepresentationAssertionGroup(InvisibleAssertionGroupType, assertions) diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionBuilderFinalStep.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionBuilderFinalStep.kt index f46799239..18f6633ce 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionBuilderFinalStep.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionBuilderFinalStep.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.assertions.Assertion * Final step in the [AssertionBuilder] process, creates the desired [Assertion] of type [T]. * @param T the type of the [Assertion]. */ -interface AssertionBuilderFinalStep { +interface AssertionBuilderFinalStep { /** * Creates and returns the new [Assertion] of type [T]. diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionGroupDescriptionAndEmptyRepresentationOption.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionGroupDescriptionAndEmptyRepresentationOption.kt index 38ffffc98..3f6db5b79 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionGroupDescriptionAndEmptyRepresentationOption.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionGroupDescriptionAndEmptyRepresentationOption.kt @@ -3,15 +3,15 @@ package ch.tutteli.atrium.assertions.builders import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.assertions.AssertionGroupType import ch.tutteli.atrium.assertions.builders.impl.AssertionGroupDescriptionAndEmptyRepresentationOptionImpl +import ch.tutteli.atrium.reporting.RawString import ch.tutteli.atrium.reporting.translating.Translatable import ch.tutteli.atrium.reporting.translating.Untranslatable -import ch.tutteli.atrium.reporting.RawString /** * Option step which allows to specify the [AssertionGroup.description] -- [RawString.EMPTY] is * used as [AssertionGroup.representation]. */ -interface AssertionGroupDescriptionAndEmptyRepresentationOption { +interface AssertionGroupDescriptionAndEmptyRepresentationOption { /** * The previously defined [AssertionGroup.type]. */ @@ -35,9 +35,10 @@ interface AssertionGroupDescriptionAndEmptyRepresentationOption create( + fun create( type: T, factory: (T, Translatable, Any) -> R - ): AssertionGroupDescriptionAndEmptyRepresentationOption = AssertionGroupDescriptionAndEmptyRepresentationOptionImpl(type, factory) + ): AssertionGroupDescriptionAndEmptyRepresentationOption = + AssertionGroupDescriptionAndEmptyRepresentationOptionImpl(type, factory) } } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionsOption.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionsOption.kt index 11e5242e6..7891e7210 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionsOption.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/AssertionsOption.kt @@ -41,8 +41,8 @@ interface AssertionsOption { /** * Uses the given [assertion1], [assertion2] and [assertion3] as [AssertionGroup.assertions]. */ - fun withAssertions(assertion1: Assertion, assertion2: Assertion, assertion3: Assertion): R - = withAssertions(listOf(assertion1, assertion2, assertion3)) + fun withAssertions(assertion1: Assertion, assertion2: Assertion, assertion3: Assertion): R = + withAssertions(listOf(assertion1, assertion2, assertion3)) /** * Uses the given [assertions] as [AssertionGroup.assertions]. @@ -82,8 +82,12 @@ interface AssertionsOption { */ fun withDefaultFinalStepAndEmptyDescriptionAndRepresentation( groupType: T - ): AssertionsOption - = AssertionsOptionImpl(groupType, Untranslatable.EMPTY, RawString.EMPTY, BasicAssertionGroupFinalStep.Companion::create) + ): AssertionsOption = AssertionsOptionImpl( + groupType, + Untranslatable.EMPTY, + RawString.EMPTY, + BasicAssertionGroupFinalStep.Companion::create + ) /** * Returns a factory method which creates an [AssertionsOption] where [BasicAssertionGroupFinalStep] is used @@ -95,12 +99,13 @@ interface AssertionsOption { /* that's fine because T is covariant and we do not need multiple function objects for the same functionality */ "UNCHECKED_CAST" ) - val factory = factoryWithDefaultFinalStep as (T, Translatable, Any) -> AssertionsOption + val factory = + factoryWithDefaultFinalStep as (T, Translatable, Any) -> AssertionsOption return factory } - private val factoryWithDefaultFinalStep: (AssertionGroupType, Translatable, Any) -> AssertionsOption - = { t, d, r -> + private val factoryWithDefaultFinalStep: (AssertionGroupType, Translatable, Any) -> AssertionsOption = + { t, d, r -> AssertionsOptionImpl(t, d, r, BasicAssertionGroupFinalStep.Companion::create) } } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/BasicAssertionGroupFinalStep.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/BasicAssertionGroupFinalStep.kt index dca94ed65..fca5aa58a 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/BasicAssertionGroupFinalStep.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/BasicAssertionGroupFinalStep.kt @@ -42,6 +42,8 @@ interface BasicAssertionGroupFinalStep : AssertionBuilderFinalStep - ): BasicAssertionGroupFinalStep = BasicAssertionGroupFinalStepImpl(groupType, description, representation, assertions) + ): BasicAssertionGroupFinalStep = BasicAssertionGroupFinalStepImpl( + groupType, description, representation, assertions + ) } } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/descriptive.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/descriptive.kt index 90d561e27..bd696c380 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/descriptive.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/descriptive.kt @@ -69,8 +69,8 @@ interface Descriptive { * Notice, if you want to use text (e.g. a [String]) as representation, * then wrap it into a [RawString] via [RawString.create] and pass the [RawString] instead. */ - fun withDescriptionAndRepresentation(description: String, representation: Any?): R - = withDescriptionAndRepresentation(Untranslatable(description), representation) + fun withDescriptionAndRepresentation(description: String, representation: Any?): R = + withDescriptionAndRepresentation(Untranslatable(description), representation) /** * Uses the given [description] as [DescriptiveAssertion.description] and [representation] diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/explanatory.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/explanatory.kt index 031eb950d..5dd1cd575 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/explanatory.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/explanatory.kt @@ -18,7 +18,7 @@ interface Explanatory { /** * Option step which allows to specify an [ExplanatoryAssertion.explanation]. */ - interface ExplanationOption{ + interface ExplanationOption { /** * Uses the given [translatable] together with the [arg] and optionally [otherArgs] to create an @@ -27,14 +27,13 @@ interface Explanatory { * It delegates to the overload which expects a single [Translatable]; see there for more details about * how the [Translatable] is used as [ExplanatoryAssertion.explanation]. */ - fun withExplanation(translatable: Translatable, arg: Any, vararg otherArgs: Any): FinalStep - = withExplanation(TranslatableWithArgs(translatable, arg glue otherArgs)) + fun withExplanation(translatable: Translatable, arg: Any, vararg otherArgs: Any): FinalStep = + withExplanation(TranslatableWithArgs(translatable, arg glue otherArgs)) /** * Uses the given [description] as explanation. */ - fun withExplanation(description: String): FinalStep - = withExplanation(Untranslatable(description)) + fun withExplanation(description: String): FinalStep = withExplanation(Untranslatable(description)) /** * Uses the given [translatable] as explanation. @@ -42,8 +41,7 @@ interface Explanatory { * In detail, the given [translatable] is turned into a [RawString] so that an [ObjectFormatter] translates the * given [translatable] and treats the result as raw string. */ - fun withExplanation(translatable: Translatable): FinalStep - = withExplanation(RawString.create(translatable)) + fun withExplanation(translatable: Translatable): FinalStep = withExplanation(RawString.create(translatable)) /** * Uses the given [explanation] as [ExplanatoryAssertion.explanation]. @@ -51,19 +49,28 @@ interface Explanatory { * Notice, if you want to use a text (e.g. a [String]) as explanation, * then wrap it into a [RawString] via [RawString.create] and pass the [RawString] instead. */ - fun withExplanation(explanation: Any?) : FinalStep + fun withExplanation(explanation: Any?): FinalStep - @Deprecated("use withExplanation instead; will be removed with 1.0.0", ReplaceWith("this.withExplanation(translatable, arg, *otherArgs)")) - fun withDescription(translatable: Translatable, arg: Any, vararg otherArgs: Any): FinalStep - = withExplanation(translatable, arg, *otherArgs) + @Deprecated( + "use withExplanation instead; will be removed with 1.0.0", + ReplaceWith("this.withExplanation(translatable, arg, *otherArgs)") + ) + fun withDescription(translatable: Translatable, arg: Any, vararg otherArgs: Any): FinalStep = + withExplanation(translatable, arg, *otherArgs) - @Deprecated("use withExplanation instead; will be removed with 1.0.0", ReplaceWith("this.withExplanation(translatable)")) + @Deprecated( + "use withExplanation instead; will be removed with 1.0.0", + ReplaceWith("this.withExplanation(translatable)") + ) fun withDescription(translatable: Translatable): FinalStep = withExplanation(translatable) - @Deprecated("use withExplanation instead; will be removed with 1.0.0", ReplaceWith("this.withExplanation(explanation)")) - fun withDescription(explanation: Any?) : FinalStep = withExplanation(explanation) + @Deprecated( + "use withExplanation instead; will be removed with 1.0.0", + ReplaceWith("this.withExplanation(explanation)") + ) + fun withDescription(explanation: Any?): FinalStep = withExplanation(explanation) companion object { @@ -78,7 +85,7 @@ interface Explanatory { /** * Final step which creates an [ExplanatoryAssertion] based on the previously defined [explanation]. */ - interface FinalStep : AssertionBuilderFinalStep{ + interface FinalStep : AssertionBuilderFinalStep { /** * The previously defined [ExplanatoryAssertion.explanation]. */ diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/explanatoryGroup.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/explanatoryGroup.kt index 575751126..1d68c3c69 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/explanatoryGroup.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/explanatoryGroup.kt @@ -15,7 +15,7 @@ interface ExplanatoryGroup { * Option step which allows to specify what [ExplanatoryAssertionGroupType] is used as [AssertionGroup.type]. */ @Suppress("DEPRECATION" /* TODO remove super-type with 1.0.0 */) - interface GroupTypeOption: ExplanatoryAssertionGroupTypeOption { + interface GroupTypeOption : ExplanatoryAssertionGroupTypeOption { /** * Builder to create an [AssertionGroup] with a [DefaultExplanatoryAssertionGroupType]. @@ -46,7 +46,7 @@ interface ExplanatoryGroup { * defined [groupType] and the [explanatoryAssertions]. */ @Suppress("DEPRECATION" /* TODO remove super-type with 1.0.0 */) - interface FinalStep: AssertionBuilderFinalStep, ExplanatoryAssertionGroupFinalStep{ + interface FinalStep : AssertionBuilderFinalStep, ExplanatoryAssertionGroupFinalStep { /** * The previously defined [AssertionGroup.type]. */ @@ -76,7 +76,7 @@ interface ExplanatoryGroup { * * See [AssertionsOption.withAssertion] for details. */ -@Suppress("DEPRECATION" /* TODO exchange ExplanatoryAssertionGroupFinalStep with ExplanatoryGroup.FinalStep in 1.0.0 */ ) +@Suppress("DEPRECATION" /* TODO exchange ExplanatoryAssertionGroupFinalStep with ExplanatoryGroup.FinalStep in 1.0.0 */) fun AssertionsOption.withExplanatoryAssertion( translatable: Translatable ): ExplanatoryAssertionGroupFinalStep = withExplanatoryAssertion { it.withExplanation(translatable).build() } @@ -88,7 +88,7 @@ fun AssertionsOption AssertionsOption.withExplanatoryAssertion( representation: Any? ): ExplanatoryAssertionGroupFinalStep = withExplanatoryAssertion { it.withExplanation(representation).build() } @@ -100,8 +100,11 @@ fun AssertionsOption AssertionsOption.withExplanatoryAssertions( translatable: Translatable, arg: Any, @@ -115,12 +118,13 @@ fun AssertionsOption AssertionsOption.withExplanatoryAssertion( translatable: Translatable, arg: Any, vararg otherArgs: Any -): ExplanatoryAssertionGroupFinalStep = withExplanatoryAssertion { it.withExplanation(translatable, arg, *otherArgs).build() } +): ExplanatoryAssertionGroupFinalStep = + withExplanatoryAssertion { it.withExplanation(translatable, arg, *otherArgs).build() } /** @@ -129,7 +133,7 @@ fun AssertionsOption AssertionsOption.withExplanatoryAssertion( explanationStep: (Explanatory.ExplanationOption) -> Assertion ): ExplanatoryAssertionGroupFinalStep = withAssertion(explanationStep(assertionBuilder.explanatory)) @@ -139,7 +143,10 @@ inline fun AssertionsOption{ +@Deprecated( + "Use ExplanatoryGroup.FinalStep instead; will be removed with 1.0.0", + ReplaceWith("ExplanatoryGroup.FinalStep") +) +interface ExplanatoryAssertionGroupFinalStep : AssertionBuilderFinalStep { /** * The previously defined [AssertionGroup.type]. */ diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionBuilderImpl.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionBuilderImpl.kt index eef1a29c9..e2169ddaa 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionBuilderImpl.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionBuilderImpl.kt @@ -5,28 +5,28 @@ import ch.tutteli.atrium.assertions.builders.* internal object AssertionBuilderImpl : AssertionBuilder { - override val list: DefaultAssertionGroupBuilderOptions - = createDescriptionAndRepresentationOption(DefaultListAssertionGroupType) + override val list: DefaultAssertionGroupBuilderOptions = + createDescriptionAndRepresentationOption(DefaultListAssertionGroupType) - override val feature: DefaultAssertionGroupBuilderOptions - = createDescriptionAndRepresentationOption(DefaultFeatureAssertionGroupType) + override val feature: DefaultAssertionGroupBuilderOptions = + createDescriptionAndRepresentationOption(DefaultFeatureAssertionGroupType) - override val summary: AssertionGroupDescriptionAndEmptyRepresentationOption> - = AssertionGroupDescriptionAndEmptyRepresentationOption.create(DefaultSummaryAssertionGroupType, AssertionsOption.factoryWithDefaultFinalStep()) + override val summary: AssertionGroupDescriptionAndEmptyRepresentationOption> = + AssertionGroupDescriptionAndEmptyRepresentationOption.create( + DefaultSummaryAssertionGroupType, + AssertionsOption.factoryWithDefaultFinalStep() + ) - override val explanatoryGroup: ExplanatoryGroup.GroupTypeOption - = ExplanatoryGroup.GroupTypeOption.create() + override val explanatoryGroup: ExplanatoryGroup.GroupTypeOption = ExplanatoryGroup.GroupTypeOption.create() - override val descriptive: Descriptive.HoldsOption - = Descriptive.HoldsOption.create() + override val descriptive: Descriptive.HoldsOption = Descriptive.HoldsOption.create() - override val explanatory: Explanatory.ExplanationOption - = Explanatory.ExplanationOption.create() + override val explanatory: Explanatory.ExplanationOption = Explanatory.ExplanationOption.create() - override fun customType(groupType: T): DefaultAssertionGroupBuilderOptions - = createDescriptionAndRepresentationOption(groupType) + override fun customType(groupType: T): DefaultAssertionGroupBuilderOptions = + createDescriptionAndRepresentationOption(groupType) - private fun createDescriptionAndRepresentationOption(type: T): DefaultAssertionGroupBuilderOptions - = AssertionGroupDescriptionAndRepresentationOption.create(type, AssertionsOption.factoryWithDefaultFinalStep()) + private fun createDescriptionAndRepresentationOption(type: T): DefaultAssertionGroupBuilderOptions = + AssertionGroupDescriptionAndRepresentationOption.create(type, AssertionsOption.factoryWithDefaultFinalStep()) } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionGroupDescriptionAndEmptyRepresentationOptionImpl.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionGroupDescriptionAndEmptyRepresentationOptionImpl.kt index 90d4416ed..74d010f80 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionGroupDescriptionAndEmptyRepresentationOptionImpl.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionGroupDescriptionAndEmptyRepresentationOptionImpl.kt @@ -5,7 +5,7 @@ import ch.tutteli.atrium.assertions.builders.AssertionGroupDescriptionAndEmptyRe import ch.tutteli.atrium.reporting.RawString import ch.tutteli.atrium.reporting.translating.Translatable -internal class AssertionGroupDescriptionAndEmptyRepresentationOptionImpl( +internal class AssertionGroupDescriptionAndEmptyRepresentationOptionImpl( override val groupType: T, private val factory: (T, Translatable, Any) -> R ) : AssertionGroupDescriptionAndEmptyRepresentationOption { diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionsOptionImpl.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionsOptionImpl.kt index 1c0002758..049d34129 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionsOptionImpl.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/AssertionsOptionImpl.kt @@ -12,6 +12,6 @@ internal class AssertionsOptionImpl( private val factory: (T, Translatable, Any, List) -> R ) : AssertionsOption { - override fun withAssertions(assertions: List): R - = factory(groupType, description, representation, assertions) + override fun withAssertions(assertions: List): R = + factory(groupType, description, representation, assertions) } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/FixedClaimLikeAssertionGroupHoldsOptionImpl.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/FixedClaimLikeAssertionGroupHoldsOptionImpl.kt index c360f8a55..b62953ecc 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/FixedClaimLikeAssertionGroupHoldsOptionImpl.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/FixedClaimLikeAssertionGroupHoldsOptionImpl.kt @@ -16,14 +16,14 @@ internal abstract class FixedClaimLikeAssertionGroupHoldsOptionImpl> get() = createDescriptionAndRepresentationOption(false) - override fun withClaim(holds: Boolean): AssertionGroupDescriptionAndRepresentationOption> - = createDescriptionAndRepresentationOption(holds) + override fun withClaim(holds: Boolean): AssertionGroupDescriptionAndRepresentationOption> = + createDescriptionAndRepresentationOption(holds) - private fun createDescriptionAndRepresentationOption(holds: Boolean) - = AssertionGroupDescriptionAndRepresentationOption.create(groupType, createAssertionOptionWithHolds(holds)) + private fun createDescriptionAndRepresentationOption(holds: Boolean) = + AssertionGroupDescriptionAndRepresentationOption.create(groupType, createAssertionOptionWithHolds(holds)) - private fun createAssertionOptionWithHolds(holds: Boolean): (T, Translatable, Any) -> AssertionsOption - = { t, d, r -> AssertionsOption.create(t, d, r, createFixedClaimLikeAssertionGroupFinalStep(holds)) } + private fun createAssertionOptionWithHolds(holds: Boolean): (T, Translatable, Any) -> AssertionsOption = + { t, d, r -> AssertionsOption.create(t, d, r, createFixedClaimLikeAssertionGroupFinalStep(holds)) } protected abstract fun createFixedClaimLikeAssertionGroupFinalStep( holds: Boolean diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/descriptive/defaultImpls.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/descriptive/defaultImpls.kt index 77974f466..db23a8805 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/descriptive/defaultImpls.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/descriptive/defaultImpls.kt @@ -1,6 +1,6 @@ package ch.tutteli.atrium.assertions.builders.impl.descriptive -import ch.tutteli.atrium.assertions.* +import ch.tutteli.atrium.assertions.DescriptiveAssertion import ch.tutteli.atrium.assertions.builders.Descriptive import ch.tutteli.atrium.core.trueProvider import ch.tutteli.atrium.creating.SubjectProvider @@ -46,6 +46,7 @@ internal class FinalStepImpl( override val representation: Any ) : Descriptive.FinalStep { - @Suppress("DEPRECATION") - override fun build(): DescriptiveAssertion = BasicDescriptiveAssertion(description, representation, test) + @Suppress("DEPRECATION" /* TODO remove annotation with 1.0.0 */) + override fun build(): DescriptiveAssertion = + ch.tutteli.atrium.assertions.BasicDescriptiveAssertion(description, representation, test) } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/explanatory/defaultImpls.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/explanatory/defaultImpls.kt index 4a695417a..3f09c706c 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/explanatory/defaultImpls.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/explanatory/defaultImpls.kt @@ -1,7 +1,5 @@ - package ch.tutteli.atrium.assertions.builders.impl.explanatory -import ch.tutteli.atrium.assertions.* import ch.tutteli.atrium.assertions.ExplanatoryAssertion import ch.tutteli.atrium.assertions.builders.Explanatory @@ -10,9 +8,8 @@ internal object ExplanationOptionImpl : Explanatory.ExplanationOption { override fun withExplanation(explanation: Any?): Explanatory.FinalStep = Explanatory.FinalStep.create(explanation) } - internal class FinalStepImpl(override val explanation: Any?) : Explanatory.FinalStep { - @Suppress("DEPRECATION" /* TODO remove with 1.0.0 */ ) - override fun build(): ExplanatoryAssertion = BasicExplanatoryAssertion(explanation) + @Suppress("DEPRECATION" /* TODO remove annotation with 1.0.0 */) + override fun build(): ExplanatoryAssertion = ch.tutteli.atrium.assertions.BasicExplanatoryAssertion(explanation) } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/fixedClaimGroup/FixedClaimAssertionGroup.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/fixedClaimGroup/FixedClaimAssertionGroup.kt index af0fc9c3d..18295d440 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/fixedClaimGroup/FixedClaimAssertionGroup.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/fixedClaimGroup/FixedClaimAssertionGroup.kt @@ -1,6 +1,8 @@ package ch.tutteli.atrium.assertions.builders.impl.fixedClaimGroup -import ch.tutteli.atrium.assertions.* +import ch.tutteli.atrium.assertions.Assertion +import ch.tutteli.atrium.assertions.AssertionGroup +import ch.tutteli.atrium.assertions.AssertionGroupType import ch.tutteli.atrium.reporting.translating.Translatable internal data class FixedClaimAssertionGroup( diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/partiallyFixedClaimGroup/PartiallyFixedClaimAssertionGroup.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/partiallyFixedClaimGroup/PartiallyFixedClaimAssertionGroup.kt index 7cbc9bf82..ac28e87a2 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/partiallyFixedClaimGroup/PartiallyFixedClaimAssertionGroup.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/impl/partiallyFixedClaimGroup/PartiallyFixedClaimAssertionGroup.kt @@ -1,6 +1,8 @@ package ch.tutteli.atrium.assertions.builders.impl.partiallyFixedClaimGroup -import ch.tutteli.atrium.assertions.* +import ch.tutteli.atrium.assertions.Assertion +import ch.tutteli.atrium.assertions.AssertionGroup +import ch.tutteli.atrium.assertions.AssertionGroupType import ch.tutteli.atrium.reporting.translating.Translatable internal data class PartiallyFixedClaimAssertionGroup( diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/root.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/root.kt index d38918bbc..bca7a7095 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/root.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/assertions/builders/root.kt @@ -10,4 +10,7 @@ import ch.tutteli.atrium.checking.AssertionChecker */ @Suppress("unused" /* it's fine if we don't use AssertionBuilder */) val AssertionBuilder.root: DefaultAssertionGroupBuilderOptions - get() = AssertionGroupDescriptionAndRepresentationOption.create(RootAssertionGroupType, AssertionsOption.factoryWithDefaultFinalStep()) + get() = AssertionGroupDescriptionAndRepresentationOption.create( + RootAssertionGroupType, + AssertionsOption.factoryWithDefaultFinalStep() + ) diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/core/polyfills/kClassExtentions.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/core/polyfills/kClassExtentions.kt index 909862424..49a47f858 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/core/polyfills/kClassExtentions.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/core/polyfills/kClassExtentions.kt @@ -27,7 +27,7 @@ expect val KClass<*>.fullName: String * @param obj The object from which this [KClass] was created of. * @return The full name of this [KClass]. */ -expect fun KClass.fullName(obj: T): String +expect fun KClass.fullName(obj: T): String /** * Casts the given [any] to the type of the given [KClass]. diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlant.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlant.kt index 40a23b69f..a29a5ef5a 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlant.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlant.kt @@ -31,8 +31,8 @@ interface AssertionPlant : BaseAssertionPlant> fun addAssertionsCreatedBy(assertionCreator: AssertionPlant.() -> Unit): AssertionPlant /** - * Creates a [DescriptiveAssertion] based on the given [description], [expected] and [test] and [adds][addAssertion] it - * to the plant. + * Creates a [DescriptiveAssertion] based on the given [description], [expected] and [test] and + * [adds][addAssertion] it to the plant. * * @param description The description of the assertion, e.g., `is less than`. * @param expected The expected value, e.g., `5` @@ -43,7 +43,7 @@ interface AssertionPlant : BaseAssertionPlant> * @throws AssertionError Might throw an [AssertionError] in case [Assertion]s are immediately * evaluated (see [ReportingAssertionPlant]). */ - fun createAndAddAssertion(description: Translatable, expected: Any, test: () -> Boolean): AssertionPlant - = addAssertion(assertionBuilder.createDescriptive(description, expected, test)) + fun createAndAddAssertion(description: Translatable, expected: Any, test: () -> Boolean): AssertionPlant = + addAssertion(assertionBuilder.createDescriptive(description, expected, test)) } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlantNullable.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlantNullable.kt index 64ef4521d..3ffe75229 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlantNullable.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlantNullable.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.creating /** diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlantWithCommonFields.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlantWithCommonFields.kt index 1cb5f53dc..54c1779c5 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlantWithCommonFields.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/AssertionPlantWithCommonFields.kt @@ -1,8 +1,11 @@ +@file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.creating import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.checking.AssertionChecker import ch.tutteli.atrium.core.evalOnce +import ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields import ch.tutteli.atrium.reporting.translating.Translatable /** diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/BaseCollectingAssertionPlant.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/BaseCollectingAssertionPlant.kt index ac6ddcb30..49ba34796 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/BaseCollectingAssertionPlant.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/BaseCollectingAssertionPlant.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.creating import ch.tutteli.atrium.assertions.Assertion diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/BaseReportingAssertionPlant.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/BaseReportingAssertionPlant.kt index e16e6bfde..4b6f492ec 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/BaseReportingAssertionPlant.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/BaseReportingAssertionPlant.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.creating import ch.tutteli.atrium.assertions.Assertion diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/CollectingAssertionPlant.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/CollectingAssertionPlant.kt index 507087715..f7924e76e 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/CollectingAssertionPlant.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/CollectingAssertionPlant.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.creating import ch.tutteli.atrium.assertions.Assertion diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/CollectingAssertionPlantNullable.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/CollectingAssertionPlantNullable.kt index 40b5ac7ed..770870582 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/CollectingAssertionPlantNullable.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/CollectingAssertionPlantNullable.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.creating import ch.tutteli.atrium.assertions.Assertion diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/MaybeSubject.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/MaybeSubject.kt index 846155288..c0186f4ae 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/MaybeSubject.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/MaybeSubject.kt @@ -18,7 +18,7 @@ sealed class MaybeSubject { */ @Suppress("DEPRECATION") @Deprecated("Use something like ch.tutteli.atrium.core.None instead; will be removed with 1.0.0") - object Absent: MaybeSubject(){ + object Absent : MaybeSubject() { /** * Throws a [PlantHasNoSubjectException]. * @throws PlantHasNoSubjectException if this method is called. @@ -33,7 +33,7 @@ sealed class MaybeSubject { */ @Suppress("DEPRECATION") @Deprecated("Use something like ch.tutteli.atrium.core.Some instead; will be removed with 1.0.0") - data class Present(val subject: T): MaybeSubject(){ + data class Present(val subject: T) : MaybeSubject() { /** * Returns the [subject]. */ @@ -42,7 +42,7 @@ sealed class MaybeSubject { companion object { @Suppress("DEPRECATION") - operator fun invoke(subject: T?) = + operator fun invoke(subject: T?) = if (subject == null) Absent else Present(subject) } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/PlantHasNoSubjectException.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/PlantHasNoSubjectException.kt index d14110cc4..ff44e51aa 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/PlantHasNoSubjectException.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/PlantHasNoSubjectException.kt @@ -7,11 +7,14 @@ import ch.tutteli.atrium.reporting.BUG_REPORT_URL */ @Deprecated("No longer required with Expect; will be removed with 1.0.0") class PlantHasNoSubjectException - @Deprecated("Use the constructor without argument; will be removed with 1.0.0", ReplaceWith("PlantHasNoSubjectException()")) - constructor(message: String) : RuntimeException(message){ +@Deprecated( + "Use the constructor without argument; will be removed with 1.0.0", + ReplaceWith("PlantHasNoSubjectException()") +) +constructor(message: String) : RuntimeException(message) { @Suppress("DEPRECATION" /* TODO remove with 1.0.0 */) - constructor(): this( + constructor() : this( "subject is not available, you as user should not see this message.\n" + "Please file a bug report (including stacktrace if possible): $BUG_REPORT_URL" ) diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/ReportingAssertionPlant.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/ReportingAssertionPlant.kt index 63cd08253..1890acdbd 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/ReportingAssertionPlant.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/ReportingAssertionPlant.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.creating import ch.tutteli.atrium.assertions.Assertion diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/ReportingAssertionPlantNullable.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/ReportingAssertionPlantNullable.kt index d42e80309..e19dda73f 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/ReportingAssertionPlantNullable.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/ReportingAssertionPlantNullable.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.creating import ch.tutteli.atrium.assertions.Assertion diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/SubjectProvider.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/SubjectProvider.kt index 18b29c51a..8fee0c7c8 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/SubjectProvider.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/creating/SubjectProvider.kt @@ -1,9 +1,9 @@ package ch.tutteli.atrium.creating import ch.tutteli.atrium.assertions.Assertion +import ch.tutteli.atrium.core.None import ch.tutteli.atrium.core.Option import ch.tutteli.atrium.core.Some -import ch.tutteli.atrium.core.None /** * Provides the subject of an [Assertion]. @@ -13,7 +13,7 @@ import ch.tutteli.atrium.core.None * Hence, to be on the safe side, you should use [Expect] instead. */ interface SubjectProvider { - + /** * The subject of an [Assertion] -- deprecated, will be removed with 1.0.0. * diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatter.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatter.kt index 56fe4a408..77b4e37d9 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatter.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatter.kt @@ -97,7 +97,11 @@ interface AssertionFormatter { * It itself expects a [AssertionFormatterParameterObject] which is used for the child assertions and a function * which formats the child [Assertion]s in the context of the given [assertionGroup]. */ - fun formatGroup(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject, formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit) + fun formatGroup( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject, + formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit + ) companion object { val CALL_FORMAT_GROUP = "do not use `${AssertionFormatter::format.name}` for " + diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterController.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterController.kt index e3d54a8c4..54058cf71 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterController.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterController.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.reporting import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup -import ch.tutteli.atrium.assertions.InvisibleAssertionGroupType import ch.tutteli.atrium.assertions.ExplanatoryAssertionGroupType +import ch.tutteli.atrium.assertions.InvisibleAssertionGroupType import ch.tutteli.atrium.core.CoreFactory /** @@ -52,8 +52,8 @@ interface AssertionFormatterController { * * @return `true` if it is an explanatory assertion group; `false` otherwise. */ - fun isExplanatoryAssertionGroup(assertion: Assertion) - = assertion is AssertionGroup && assertion.type is ExplanatoryAssertionGroupType + fun isExplanatoryAssertionGroup(assertion: Assertion) = + assertion is AssertionGroup && assertion.type is ExplanatoryAssertionGroupType companion object { /** diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterFacade.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterFacade.kt index 58aedde0b..16febb04c 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterFacade.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterFacade.kt @@ -7,7 +7,7 @@ import ch.tutteli.atrium.core.CoreFactory * Responsible to call an appropriate [AssertionFormatter] which supports [format]ing a given [Assertion]. */ interface AssertionFormatterFacade { - + /** * Formats the given [assertion] and appends the result to the given [sb]. * diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterParameterObject.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterParameterObject.kt index b9432b1a1..20dab6224 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterParameterObject.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionFormatterParameterObject.kt @@ -54,8 +54,14 @@ class AssertionFormatterParameterObject private constructor( * * @return The newly created [AssertionFormatterParameterObject]. */ - fun createChildWithNewPrefixAndAdditionalIndent(newPrefix: String, additionalIndent: Int) - = AssertionFormatterParameterObject(sb, newPrefix, indentLevel + prefix.length + additionalIndent, assertionFilter, numberOfDoNotFilterGroups) + fun createChildWithNewPrefixAndAdditionalIndent(newPrefix: String, additionalIndent: Int) = + AssertionFormatterParameterObject( + sb, + newPrefix, + indentLevel + prefix.length + additionalIndent, + assertionFilter, + numberOfDoNotFilterGroups + ) /** @@ -65,8 +71,8 @@ class AssertionFormatterParameterObject private constructor( * * @return The newly created [AssertionFormatterParameterObject]. */ - fun createForDoNotFilterAssertionGroup(): AssertionFormatterParameterObject - = AssertionFormatterParameterObject(sb, prefix, indentLevel, assertionFilter, numberOfDoNotFilterGroups + 1) + fun createForDoNotFilterAssertionGroup(): AssertionFormatterParameterObject = + AssertionFormatterParameterObject(sb, prefix, indentLevel, assertionFilter, numberOfDoNotFilterGroups + 1) /** * Indicates that the formatting process is currently not formatting the [Assertion]s (or any nested assertion) @@ -101,7 +107,7 @@ class AssertionFormatterParameterObject private constructor( /** * Appends spaces equal to [numberOfSpaces] to [sb]. */ - fun indent(numberOfSpaces: Int){ + fun indent(numberOfSpaces: Int) { for (i in 0 until numberOfSpaces) { sb.append(' ') } diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionPairFormatter.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionPairFormatter.kt index 0ae1f7f0b..24b882a89 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionPairFormatter.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/AssertionPairFormatter.kt @@ -18,7 +18,11 @@ interface AssertionPairFormatter { * @param assertionGroup The [AssertionGroup] of which we want to format the header. * @param newParameterObject The [AssertionFormatterParameterObject] used for the [AssertionGroup.assertions]. */ - fun formatGroupHeader(parameterObject: AssertionFormatterParameterObject, assertionGroup: AssertionGroup, newParameterObject: AssertionFormatterParameterObject) + fun formatGroupHeader( + parameterObject: AssertionFormatterParameterObject, + assertionGroup: AssertionGroup, + newParameterObject: AssertionFormatterParameterObject + ) /** * Formats the assertion pair consisting of the given [translatable] and the given [representation] diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/constants.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/constants.kt index fd9bbc158..805a708dd 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/constants.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/constants.kt @@ -1,7 +1,7 @@ package ch.tutteli.atrium.reporting -import ch.tutteli.atrium.reporting.translating.Untranslatable import ch.tutteli.atrium.reporting.translating.Translatable +import ch.tutteli.atrium.reporting.translating.Untranslatable /** * Refers to the bug tracker of Atrium. @@ -11,7 +11,8 @@ const val BUG_REPORT_URL = "https://github.com/robstoll/atrium/issues/new" /** * Can be used in places where an argument for reporting is expected which should never be shown to the user. */ -const val SHOULD_NOT_BE_SHOWN_TO_THE_USER_BUG = "Should not be shown to the user; if you see this, please file a bug report at $BUG_REPORT_URL" +const val SHOULD_NOT_BE_SHOWN_TO_THE_USER_BUG = + "Should not be shown to the user; if you see this, please file a bug report at $BUG_REPORT_URL" /** * Can be used in places where an argument of type [Translatable] is expected which should never be shown to the user. diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/ArgumentsSupportingTranslator.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/ArgumentsSupportingTranslator.kt index 7c8f0c6df..3c7bc6918 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/ArgumentsSupportingTranslator.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/ArgumentsSupportingTranslator.kt @@ -1,7 +1,7 @@ package ch.tutteli.atrium.reporting.translating -import ch.tutteli.kbox.forElementAndForEachIn import ch.tutteli.atrium.core.polyfills.format +import ch.tutteli.kbox.forElementAndForEachIn /** * Represents a [Translator] which supports [TranslatableWithArgs]. diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/LocaleOrderDecider.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/LocaleOrderDecider.kt index e43a8014c..43aaa492a 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/LocaleOrderDecider.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/LocaleOrderDecider.kt @@ -1,6 +1,7 @@ package ch.tutteli.atrium.reporting.translating import ch.tutteli.atrium.core.CoreFactory + /** * Responsible to decide in which order [Locale]s should be processed. * diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/TranslatableWithArgs.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/TranslatableWithArgs.kt index 51cec9c59..487ed2deb 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/TranslatableWithArgs.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/TranslatableWithArgs.kt @@ -60,19 +60,17 @@ class TranslatableWithArgs constructor(val translatable: Translatable, val argum companion object { - private fun createList(arg: Any): List - = ArrayList(1).apply { - add(arg) - } + private fun createList(arg: Any): List = ArrayList(1).apply { + add(arg) + } - private fun createList(arg1: Any, arg2: Any): List - = ArrayList(2).apply { - add(arg1) - add(arg2) - } + private fun createList(arg1: Any, arg2: Any): List = ArrayList(2).apply { + add(arg1) + add(arg2) + } - private fun createList(arg1: Any, arg2: Any, otherArgs: Array): List - = ArrayList(2 + otherArgs.size).apply { + private fun createList(arg1: Any, arg2: Any, otherArgs: Array): List = + ArrayList(2 + otherArgs.size).apply { add(arg1) add(arg2) addAll(otherArgs) diff --git a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/UsingDefaultTranslator.kt b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/UsingDefaultTranslator.kt index 4353d3b5d..549c6f673 100644 --- a/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/UsingDefaultTranslator.kt +++ b/core/api/atrium-core-api-common/src/main/kotlin/ch/tutteli/atrium/reporting/translating/UsingDefaultTranslator.kt @@ -1,7 +1,5 @@ package ch.tutteli.atrium.reporting.translating -import ch.tutteli.atrium.core.polyfills.format - /** * This translator does not translate but uses [Translatable.getDefault] instead * and uses [getDefaultLocale] as [primaryLocale] if not defined differently via constructor parameter. diff --git a/core/api/atrium-core-api-js/src/main/kotlin/ch/tutteli/atrium/core/CoreFactory.kt b/core/api/atrium-core-api-js/src/main/kotlin/ch/tutteli/atrium/core/CoreFactory.kt index 412635c0d..6fab8a450 100644 --- a/core/api/atrium-core-api-js/src/main/kotlin/ch/tutteli/atrium/core/CoreFactory.kt +++ b/core/api/atrium-core-api-js/src/main/kotlin/ch/tutteli/atrium/core/CoreFactory.kt @@ -2,7 +2,7 @@ package ch.tutteli.atrium.core import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.checking.AssertionChecker -import ch.tutteli.atrium.creating.* +import ch.tutteli.atrium.creating.ReportingAssertionPlantNullable import ch.tutteli.atrium.reporting.RawString import ch.tutteli.atrium.reporting.Reporter import ch.tutteli.atrium.reporting.translating.Translatable @@ -18,17 +18,17 @@ actual interface CoreFactory : CoreFactoryCommon { * Creates a [ReportingAssertionPlantNullable] which is the entry point for assertions about nullable types. * * It creates a [newThrowingAssertionChecker] based on the given [reporter] for assertion checking, - * uses [subjectProvider] as [AssertionPlantWithCommonFields.CommonFields.subjectProvider] but also as - * [AssertionPlantWithCommonFields.CommonFields.representationProvider]. + * uses [subjectProvider] as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.subjectProvider] but also as + * [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.representationProvider]. * Notice that [evalOnce] is applied to the given [subjectProvider] to avoid side effects * (the provider is most likely called more than once). * * Notice, this method will be moved to [CoreFactoryCommon] with 1.0.0. * * @param assertionVerb The assertion verb which will be used inter alia in reporting - * (see [AssertionPlantWithCommonFields.CommonFields.assertionVerb]). - * @param subjectProvider Used as [AssertionPlantWithCommonFields.CommonFields.subjectProvider] but - * also as [AssertionPlantWithCommonFields.CommonFields.representationProvider]. + * (see [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.assertionVerb]). + * @param subjectProvider Used as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.subjectProvider] but + * also as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.representationProvider]. * @param reporter The reporter which will be used for a [newThrowingAssertionChecker]. * * @@ -55,19 +55,19 @@ actual interface CoreFactory : CoreFactoryCommon { * Creates a [ReportingAssertionPlantNullable] which is the entry point for assertions about nullable types. * * It uses the given [assertionChecker] for assertion checking, uses [subjectProvider] as - * [AssertionPlantWithCommonFields.CommonFields.subjectProvider] but also as - * [AssertionPlantWithCommonFields.CommonFields.representationProvider]. + * [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.subjectProvider] but also as + * [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.representationProvider]. * Notice that [evalOnce] is applied to the given [subjectProvider] to avoid side effects * (the provider is most likely called more than once). * * Notice, this method will be moved to [CoreFactoryCommon] with 1.0.0. * * @param assertionVerb The assertion verb which will be used inter alia in reporting - * (see [AssertionPlantWithCommonFields.CommonFields.assertionVerb]). - * @param subjectProvider Used as [AssertionPlantWithCommonFields.CommonFields.subjectProvider] but - * also as [AssertionPlantWithCommonFields.CommonFields.representationProvider]. + * (see [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.assertionVerb]). + * @param subjectProvider Used as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.subjectProvider] but + * also as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.representationProvider]. * @param assertionChecker The checker which will be used to check [Assertion]s. - * (see [AssertionPlantWithCommonFields.CommonFields.assertionChecker]). + * (see [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.assertionChecker]). * * @return The newly created assertion plant. */ diff --git a/core/api/atrium-core-api-js/src/main/kotlin/ch/tutteli/atrium/reporting/AtriumError.kt b/core/api/atrium-core-api-js/src/main/kotlin/ch/tutteli/atrium/reporting/AtriumError.kt index 0d20e5c4a..0f7d8cf6e 100644 --- a/core/api/atrium-core-api-js/src/main/kotlin/ch/tutteli/atrium/reporting/AtriumError.kt +++ b/core/api/atrium-core-api-js/src/main/kotlin/ch/tutteli/atrium/reporting/AtriumError.kt @@ -22,7 +22,7 @@ actual class AtriumError internal actual constructor(message: String) : Assertio * * @return The newly created [AtriumError] */ - actual fun create(message: String, atriumErrorAdjuster: AtriumErrorAdjuster): AtriumError - = createAtriumError(message, atriumErrorAdjuster) + actual fun create(message: String, atriumErrorAdjuster: AtriumErrorAdjuster): AtriumError = + createAtriumError(message, atriumErrorAdjuster) } } diff --git a/core/api/atrium-core-api-js/src/test/kotlin/ch/tutteli/atrium/core/polyfills/KClassCastTest.kt b/core/api/atrium-core-api-js/src/test/kotlin/ch/tutteli/atrium/core/polyfills/KClassCastTest.kt index 8ede0c30e..176db6559 100644 --- a/core/api/atrium-core-api-js/src/test/kotlin/ch/tutteli/atrium/core/polyfills/KClassCastTest.kt +++ b/core/api/atrium-core-api-js/src/test/kotlin/ch/tutteli/atrium/core/polyfills/KClassCastTest.kt @@ -117,13 +117,13 @@ class KClassCastTest { fun illegalCasts_functionTypes__throwsClassCastException() { //TODO should throw but does not, see https://youtrack.jetbrains.com/issue/KT-27846 // expect { - val f: () -> Int = { 1 } - f::class.cast({ "a" }) + val f: () -> Int = { 1 } + f::class.cast({ "a" }) // }.toThrow { messageContains("??? 1") } //TODO should throw but does not, see https://youtrack.jetbrains.com/issue/KT-27846 // expect{ - type<() -> Int>().cast({ "a " }) + type<() -> Int>().cast({ "a " }) // }.toThrow { messageContains("??? 2") } expect { diff --git a/core/api/atrium-core-api-js/src/test/kotlin/ch/tutteli/atrium/core/polyfills/testUtils.kt b/core/api/atrium-core-api-js/src/test/kotlin/ch/tutteli/atrium/core/polyfills/testUtils.kt index ff2a05324..e49eba624 100644 --- a/core/api/atrium-core-api-js/src/test/kotlin/ch/tutteli/atrium/core/polyfills/testUtils.kt +++ b/core/api/atrium-core-api-js/src/test/kotlin/ch/tutteli/atrium/core/polyfills/testUtils.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /*TODO remove with 1.0.0 */) + package ch.tutteli.atrium.core.polyfills import ch.tutteli.atrium.assertions.Assertion diff --git a/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/CoreFactory.kt b/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/CoreFactory.kt index 65ac9fa05..48da9974b 100644 --- a/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/CoreFactory.kt +++ b/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/CoreFactory.kt @@ -2,7 +2,7 @@ package ch.tutteli.atrium.core import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.checking.AssertionChecker -import ch.tutteli.atrium.creating.* +import ch.tutteli.atrium.creating.ReportingAssertionPlantNullable import ch.tutteli.atrium.reporting.AssertionFormatterFacade import ch.tutteli.atrium.reporting.RawString import ch.tutteli.atrium.reporting.Reporter @@ -44,17 +44,17 @@ actual interface CoreFactory : CoreFactoryCommon { * Creates a [ReportingAssertionPlantNullable] which is the entry point for assertions about nullable types. * * It creates a [newThrowingAssertionChecker] based on the given [reporter] for assertion checking, - * uses [subjectProvider] as [AssertionPlantWithCommonFields.CommonFields.subjectProvider] but also as - * [AssertionPlantWithCommonFields.CommonFields.representationProvider]. + * uses [subjectProvider] as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.subjectProvider] but also as + * [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.representationProvider]. * Notice that [evalOnce] is applied to the given [subjectProvider] to avoid side effects * (the provider is most likely called more than once). * * Notice, this method will be moved to [CoreFactoryCommon] with 1.0.0. * * @param assertionVerb The assertion verb which will be used inter alia in reporting - * (see [AssertionPlantWithCommonFields.CommonFields.assertionVerb]). + * (see [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.assertionVerb]). * @param subjectProvider Used as [AssertionPlantWithCommonFields.CommonFields.subjectProvider] but - * also as [AssertionPlantWithCommonFields.CommonFields.representationProvider]. + * also as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.representationProvider]. * @param reporter The reporter which will be used for a [newThrowingAssertionChecker]. * * @return The newly created assertion plant. @@ -80,19 +80,19 @@ actual interface CoreFactory : CoreFactoryCommon { * Creates a [ReportingAssertionPlantNullable] which is the entry point for assertions about nullable types. * * It uses the given [assertionChecker] for assertion checking, uses [subjectProvider] as - * [AssertionPlantWithCommonFields.CommonFields.subjectProvider] but also as - * [AssertionPlantWithCommonFields.CommonFields.representationProvider]. + * [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.subjectProvider] but also as + * [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.representationProvider]. * Notice that [evalOnce] is applied to the given [subjectProvider] to avoid side effects * (the provider is most likely called more than once). * * Notice, this method will be moved to [CoreFactoryCommon] with 1.0.0. * * @param assertionVerb The assertion verb which will be used inter alia in reporting - * (see [AssertionPlantWithCommonFields.CommonFields.assertionVerb]). - * @param subjectProvider Used as [AssertionPlantWithCommonFields.CommonFields.subjectProvider] but - * also as [AssertionPlantWithCommonFields.CommonFields.representationProvider]. + * (see [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.assertionVerb]). + * @param subjectProvider Used as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.subjectProvider] but + * also as [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.representationProvider]. * @param assertionChecker The checker which will be used to check [Assertion]s. - * (see [AssertionPlantWithCommonFields.CommonFields.assertionChecker]). + * (see [ch.tutteli.atrium.creating.AssertionPlantWithCommonFields.CommonFields.assertionChecker]). * * @return The newly created assertion plant. */ @@ -112,6 +112,4 @@ actual interface CoreFactory : CoreFactoryCommon { ): ReportingAssertionPlantNullable = newReportingPlantNullableFromCommon( assertionVerb, subjectProvider, assertionChecker, nullRepresentation ) - - } diff --git a/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/migration/toAtriumLocale.kt b/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/migration/toAtriumLocale.kt index 5d3446585..b53687e3f 100644 --- a/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/migration/toAtriumLocale.kt +++ b/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/migration/toAtriumLocale.kt @@ -5,10 +5,9 @@ import ch.tutteli.kbox.blankToNull @Suppress("DeprecatedCallableAddReplaceWith") @Deprecated("Only here to ease migration, use Atrium's Locale directly; will be removed with 1.0.0") -fun java.util.Locale.toAtriumLocale(): Locale - = ch.tutteli.atrium.reporting.translating.Locale( - language, - script.blankToNull(), - country.blankToNull(), - variant.blankToNull() - ) +fun java.util.Locale.toAtriumLocale(): Locale = ch.tutteli.atrium.reporting.translating.Locale( + language, + script.blankToNull(), + country.blankToNull(), + variant.blankToNull() +) diff --git a/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/polyfills/stringExtensions.kt b/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/polyfills/stringExtensions.kt index 3f6730427..3ad0754e3 100644 --- a/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/polyfills/stringExtensions.kt +++ b/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/core/polyfills/stringExtensions.kt @@ -2,7 +2,6 @@ package ch.tutteli.atrium.core.polyfills import ch.tutteli.atrium.reporting.translating.Locale import ch.tutteli.atrium.reporting.translating.toJavaLocale -import kotlin.String actual fun String.format(locale: Locale, arg: Any, vararg otherArgs: Any): String { return java.lang.String.format(locale.toJavaLocale(), this, arg, *otherArgs) diff --git a/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/reporting/AtriumError.kt b/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/reporting/AtriumError.kt index e45c1f105..d1ec694e4 100644 --- a/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/reporting/AtriumError.kt +++ b/core/api/atrium-core-api-jvm/src/main/kotlin/ch/tutteli/atrium/reporting/AtriumError.kt @@ -18,7 +18,7 @@ actual class AtriumError internal actual constructor(message: String) : Assertio * * Creates an [AtriumError] and adjusts it with the given [atriumErrorAdjuster] before it is returned * (adjusting might filter the [stackTrace]). */ - actual fun create(message: String, atriumErrorAdjuster: AtriumErrorAdjuster): AtriumError - = createAtriumError(message, atriumErrorAdjuster) + actual fun create(message: String, atriumErrorAdjuster: AtriumErrorAdjuster): AtriumError = + createAtriumError(message, atriumErrorAdjuster) } } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-android/build.gradle b/core/robstoll-lib/atrium-core-robstoll-lib-android/build.gradle index e65df12b1..4456c69e1 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-android/build.gradle +++ b/core/robstoll-lib/atrium-core-robstoll-lib-android/build.gradle @@ -1,7 +1,7 @@ description = 'Contains the bits and pieces behind robstoll\'s implementation ' + - 'of Atrium for Android. You should only depend on this module if you are ' + - 'providing an implementation as well and want to reuse certain artifacts. If you are a consumer of ' + - 'Atrium, then you should depend on atrium-core-robstoll instead.' + 'of Atrium for Android. You should only depend on this module if you are ' + + 'providing an implementation as well and want to reuse certain artifacts. If you are a consumer of ' + + 'Atrium, then you should depend on atrium-core-robstoll instead.' dependencies { compile prefixedProject('core-api-android') diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/checking/FeatureAssertionChecker.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/checking/FeatureAssertionChecker.kt index a99807187..52ea2b4f2 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/checking/FeatureAssertionChecker.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/checking/FeatureAssertionChecker.kt @@ -42,10 +42,11 @@ class FeatureAssertionChecker(private val originalAssertionHolder: AssertionHold * @throws AssertionError Might throw an [AssertionError] in case one of the given [assertions] does not hold. */ override fun check(assertionVerb: Translatable, representation: Any?, assertions: List) { - originalAssertionHolder.addAssertion(assertionBuilder.feature - .withDescriptionAndRepresentation(assertionVerb, representation) - .withAssertions(ArrayList(assertions)) - .build() + originalAssertionHolder.addAssertion( + assertionBuilder.feature + .withDescriptionAndRepresentation(assertionVerb, representation) + .withAssertions(ArrayList(assertions)) + .build() ) } } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/creating/MutableListBasedAssertionPlant.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/creating/MutableListBasedAssertionPlant.kt index fd34e1dec..64ccc159f 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/creating/MutableListBasedAssertionPlant.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/creating/MutableListBasedAssertionPlant.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.core.robstoll.lib.creating import ch.tutteli.atrium.assertions.Assertion @@ -14,7 +15,7 @@ abstract class MutableListBasedAssertionPlant Boolean) - = assertionFormatterController.format(assertion, AssertionFormatterParameterObject.new(sb, assertionFilter)) + override fun format(assertion: Assertion, sb: StringBuilder, assertionFilter: (Assertion) -> Boolean) = + assertionFormatterController.format(assertion, AssertionFormatterParameterObject.new(sb, assertionFilter)) - override fun register(assertionFormatterFactory: (AssertionFormatterController) -> AssertionFormatter) - = assertionFormatterController.register(assertionFormatterFactory(assertionFormatterController)) + override fun register(assertionFormatterFactory: (AssertionFormatterController) -> AssertionFormatter) = + assertionFormatterController.register(assertionFormatterFactory(assertionFormatterController)) } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/AssertionFormatterControllerImpl.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/AssertionFormatterControllerImpl.kt index d03d8cdf2..3b1bbfd89 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/AssertionFormatterControllerImpl.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/AssertionFormatterControllerImpl.kt @@ -38,8 +38,15 @@ class AssertionFormatterControllerImpl : AssertionFormatterController { && !parameterObject.assertionFilter(assertion) } - private fun formatGroup(assertionGroup: AssertionGroup, assertionFormatter: AssertionFormatter, parameterObject: AssertionFormatterParameterObject) { - assertionFormatter.formatGroup(assertionGroup, parameterObject) { childParameterObject, formatAssertionInGroup -> + private fun formatGroup( + assertionGroup: AssertionGroup, + assertionFormatter: AssertionFormatter, + parameterObject: AssertionFormatterParameterObject + ) { + assertionFormatter.formatGroup( + assertionGroup, + parameterObject + ) { childParameterObject, formatAssertionInGroup -> assertionGroup.assertions .filter { !noNeedToFormat(it, childParameterObject) } .forEach { formatChild(it, formatAssertionInGroup) } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/MultiAtriumErrorAdjusterImpl.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/MultiAtriumErrorAdjusterImpl.kt index 1194c9739..eac0d7140 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/MultiAtriumErrorAdjusterImpl.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/MultiAtriumErrorAdjusterImpl.kt @@ -6,4 +6,4 @@ expect class MultiAtriumErrorAdjusterImpl( firstAdjuster: AtriumErrorAdjuster, secondAdjuster: AtriumErrorAdjuster, otherAdjusters: List -): AtriumErrorAdjuster +) : AtriumErrorAdjuster diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/NoSpecialChildFormattingSingleAssertionGroupTypeFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/NoSpecialChildFormattingSingleAssertionGroupTypeFormatter.kt index a218da737..78607b6b9 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/NoSpecialChildFormattingSingleAssertionGroupTypeFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/NoSpecialChildFormattingSingleAssertionGroupTypeFormatter.kt @@ -29,7 +29,10 @@ abstract class NoSpecialChildFormattingSingleAssertionGroupTypeFormatter(clazz) { - override fun formatGroupAssertions(formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit, childParameterObject: AssertionFormatterParameterObject) { + override fun formatGroupAssertions( + formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit, + childParameterObject: AssertionFormatterParameterObject + ) { formatAssertions(childParameterObject) { assertionFormatterController.format(it, childParameterObject) } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/OnlyFailureReporter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/OnlyFailureReporter.kt index 654e05269..f05fb399a 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/OnlyFailureReporter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/OnlyFailureReporter.kt @@ -24,8 +24,8 @@ class OnlyFailureReporter( * Formats the given [assertion] with the help of the defined [assertionFormatterFacade] * and appends the result to the given [sb] but only in case the given [assertion] [holds][Assertion.holds]. */ - override fun format(assertion: Assertion, sb: StringBuilder) - = assertionFormatterFacade.format(assertion, sb, this::assertionFilter) + override fun format(assertion: Assertion, sb: StringBuilder) = + assertionFormatterFacade.format(assertion, sb, this::assertionFilter) private fun assertionFilter(assertion: Assertion) = !assertion.holds() } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveAtriumFromAtriumErrorAdjuster.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveAtriumFromAtriumErrorAdjuster.kt index 29f44d614..de8a7bc3b 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveAtriumFromAtriumErrorAdjuster.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveAtriumFromAtriumErrorAdjuster.kt @@ -2,4 +2,4 @@ package ch.tutteli.atrium.core.robstoll.lib.reporting import ch.tutteli.atrium.reporting.AtriumErrorAdjuster -expect class RemoveAtriumFromAtriumErrorAdjuster(): AtriumErrorAdjuster +expect class RemoveAtriumFromAtriumErrorAdjuster() : AtriumErrorAdjuster diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveRunnerAtriumErrorAdjuster.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveRunnerAtriumErrorAdjuster.kt index 9bb1723aa..b914df8ff 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveRunnerAtriumErrorAdjuster.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveRunnerAtriumErrorAdjuster.kt @@ -2,4 +2,4 @@ package ch.tutteli.atrium.core.robstoll.lib.reporting import ch.tutteli.atrium.reporting.AtriumErrorAdjuster -expect class RemoveRunnerAtriumErrorAdjuster(): AtriumErrorAdjuster +expect class RemoveRunnerAtriumErrorAdjuster() : AtriumErrorAdjuster diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/SingleAssertionGroupTypeFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/SingleAssertionGroupTypeFormatter.kt index d285cd2b3..0230eefd2 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/SingleAssertionGroupTypeFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/SingleAssertionGroupTypeFormatter.kt @@ -29,8 +29,7 @@ abstract class SingleAssertionGroupTypeFormatter( * Returns true if the given [assertion] is an [AssertionGroup] and its [type][AssertionGroup.type] * is [T] or a sub type. */ - final override fun canFormat(assertion: Assertion) - = assertion is AssertionGroup && clazz.isInstance(assertion.type) + final override fun canFormat(assertion: Assertion) = assertion is AssertionGroup && clazz.isInstance(assertion.type) /** * Always throws an [UnsupportedOperationException], because this [AssertionFormatter] can only format @@ -38,8 +37,10 @@ abstract class SingleAssertionGroupTypeFormatter( * * @throws UnsupportedOperationException always! */ - final override fun formatNonGroup(assertion: Assertion, parameterObject: AssertionFormatterParameterObject) - = throw UnsupportedOperationException("supports only ${clazz.fullName} for which one has to call ${AssertionFormatter::formatGroup.name}") + final override fun formatNonGroup(assertion: Assertion, parameterObject: AssertionFormatterParameterObject) = + throw UnsupportedOperationException( + "supports only ${clazz.fullName} for which one has to call ${AssertionFormatter::formatGroup.name}" + ) /** * Checks whether [assertionGroup] is [T] or a sub type and if so, calls [formatGroupHeaderAndGetChildParameterObject] @@ -59,12 +60,20 @@ abstract class SingleAssertionGroupTypeFormatter( * * @throws UnsupportedOperationException if the given [assertionGroup] is not [T] or a sub type of it. */ - final override fun formatGroup(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject, formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit) = when { + final override fun formatGroup( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject, + formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit + ) = when { clazz.isInstance(assertionGroup.type) -> formatSpecificGroup(assertionGroup, parameterObject, formatAssertions) else -> throw UnsupportedOperationException("supports only ${clazz.fullName}") } - private fun formatSpecificGroup(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject, formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit) { + private fun formatSpecificGroup( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject, + formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit + ) { val childParameterObject = formatGroupHeaderAndGetChildParameterObject(assertionGroup, parameterObject) formatGroupAssertions(formatAssertions, childParameterObject) } @@ -80,7 +89,10 @@ abstract class SingleAssertionGroupTypeFormatter( * * @return The [AssertionFormatterParameterObject] which shall be used for the [AssertionGroup.assertions]. */ - protected abstract fun formatGroupHeaderAndGetChildParameterObject(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject): AssertionFormatterParameterObject + protected abstract fun formatGroupHeaderAndGetChildParameterObject( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject + ): AssertionFormatterParameterObject /** * Formats the [AssertionGroup.assertions] -- has to call the given [formatAssertions] function in order that @@ -92,5 +104,8 @@ abstract class SingleAssertionGroupTypeFormatter( * @param childParameterObject The parameter object which shall be used to format [AssertionGroup.assertions] -- contains * inter alia the [sb][AssertionFormatterParameterObject.sb] to which the result will be appended. */ - protected abstract fun formatGroupAssertions(formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit, childParameterObject: AssertionFormatterParameterObject) + protected abstract fun formatGroupAssertions( + formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit, + childParameterObject: AssertionFormatterParameterObject + ) } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextExplanatoryAssertionGroupFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextExplanatoryAssertionGroupFormatter.kt index ce3fa94c6..fcdde1188 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextExplanatoryAssertionGroupFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextExplanatoryAssertionGroupFormatter.kt @@ -36,11 +36,17 @@ import kotlin.reflect.KClass class TextExplanatoryAssertionGroupFormatter( bulletPoints: Map, String>, assertionFormatterController: AssertionFormatterController -) : NoSpecialChildFormattingSingleAssertionGroupTypeFormatter(ExplanatoryAssertionGroupType::class, assertionFormatterController) { +) : NoSpecialChildFormattingSingleAssertionGroupTypeFormatter( + ExplanatoryAssertionGroupType::class, + assertionFormatterController +) { private val explanatoryBulletPoint = bulletPoints[ExplanatoryAssertionGroupType::class] ?: "» " private val warningBulletPoint = bulletPoints[WarningAssertionGroupType::class] ?: "❗❗ " - override fun formatGroupHeaderAndGetChildParameterObject(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject): AssertionFormatterParameterObject { + override fun formatGroupHeaderAndGetChildParameterObject( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject + ): AssertionFormatterParameterObject { val bulletPoint = when (assertionGroup.type) { WarningAssertionGroupType -> warningBulletPoint else -> explanatoryBulletPoint diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextFallbackAssertionFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextFallbackAssertionFormatter.kt index e323e40b8..cdab3f07d 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextFallbackAssertionFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextFallbackAssertionFormatter.kt @@ -59,20 +59,31 @@ class TextFallbackAssertionFormatter( } } - private fun appendDescriptiveAssertion(basicAssertion: DescriptiveAssertion, parameterObject: AssertionFormatterParameterObject) { + private fun appendDescriptiveAssertion( + basicAssertion: DescriptiveAssertion, + parameterObject: AssertionFormatterParameterObject + ) { assertionPairFormatter.format(parameterObject, basicAssertion.description, basicAssertion.representation) } - private fun appendExplanatoryAssertion(assertion: ExplanatoryAssertion, parameterObject: AssertionFormatterParameterObject) { + private fun appendExplanatoryAssertion( + assertion: ExplanatoryAssertion, + parameterObject: AssertionFormatterParameterObject + ) { parameterObject.sb.append(objectFormatter.format(assertion.explanation)) } private fun formatFallback(assertion: Assertion, parameterObject: AssertionFormatterParameterObject) { - val translatable = Untranslatable("Unsupported type ${assertion::class.fullName}, can only report whether it holds") + val translatable = + Untranslatable("Unsupported type ${assertion::class.fullName}, can only report whether it holds") assertionPairFormatter.format(parameterObject, translatable, assertion.holds()) } - override fun formatGroup(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject, formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit) { + override fun formatGroup( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject, + formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit + ) { val childParameterObject = formatGroupHeaderAndGetChildParameterObject(assertionGroup, parameterObject) formatAssertions(childParameterObject) { assertionFormatterController.format(it, childParameterObject) @@ -82,7 +93,9 @@ class TextFallbackAssertionFormatter( private fun formatGroupHeaderAndGetChildParameterObject( assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject ) = when (assertionGroup.type) { - RootAssertionGroupType -> formatter.formatAfterAppendLnEtc(assertionPairFormatter, assertionGroup, parameterObject) + RootAssertionGroupType -> formatter.formatAfterAppendLnEtc( + assertionPairFormatter, assertionGroup, parameterObject + ) else -> formatter.formatWithGroupName(assertionPairFormatter, assertionGroup, parameterObject) } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextFeatureAssertionGroupFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextFeatureAssertionGroupFormatter.kt index 8874999a2..8c4b22aeb 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextFeatureAssertionGroupFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextFeatureAssertionGroupFormatter.kt @@ -37,12 +37,18 @@ class TextFeatureAssertionGroupFormatter( bulletPoints: Map, String>, assertionFormatterController: AssertionFormatterController, private val assertionPairFormatter: AssertionPairFormatter -) : NoSpecialChildFormattingSingleAssertionGroupTypeFormatter(FeatureAssertionGroupType::class, assertionFormatterController) { +) : NoSpecialChildFormattingSingleAssertionGroupTypeFormatter( + FeatureAssertionGroupType::class, + assertionFormatterController +) { private val prefix = (bulletPoints[FeatureAssertionGroupType::class] ?: "◾ ") private val arrow = (bulletPoints[PrefixFeatureAssertionGroupHeader::class] ?: "▶ ") - override fun formatGroupHeaderAndGetChildParameterObject(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject): AssertionFormatterParameterObject { + override fun formatGroupHeaderAndGetChildParameterObject( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject + ): AssertionFormatterParameterObject { parameterObject.appendLnIndentAndPrefix() val translatable = TranslatableWithArgs(Untranslatable("$arrow%s"), assertionGroup.description) val group = diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextIndentAssertionGroupFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextIndentAssertionGroupFormatter.kt index 5749ba72f..9d6ea30dd 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextIndentAssertionGroupFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextIndentAssertionGroupFormatter.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* TODO remove with 1.0.0 */) + package ch.tutteli.atrium.core.robstoll.lib.reporting import ch.tutteli.atrium.assertions.AssertionGroup @@ -31,9 +32,14 @@ import kotlin.reflect.KClass class TextIndentAssertionGroupFormatter( bulletPoints: Map, String>, assertionFormatterController: AssertionFormatterController -) : NoSpecialChildFormattingSingleAssertionGroupTypeFormatter(IndentAssertionGroupType::class, assertionFormatterController) { +) : NoSpecialChildFormattingSingleAssertionGroupTypeFormatter( + IndentAssertionGroupType::class, + assertionFormatterController +) { private val bulletPoint = bulletPoints[IndentAssertionGroupType::class] ?: " ⋄ " - override fun formatGroupHeaderAndGetChildParameterObject(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject) - = parameterObject.createChildWithNewPrefix(bulletPoint) + override fun formatGroupHeaderAndGetChildParameterObject( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject + ): AssertionFormatterParameterObject = parameterObject.createChildWithNewPrefix(bulletPoint) } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextListBasedAssertionGroupFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextListBasedAssertionGroupFormatter.kt index 98f85f8a0..705aed682 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextListBasedAssertionGroupFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextListBasedAssertionGroupFormatter.kt @@ -32,6 +32,9 @@ abstract class TextListBasedAssertionGroupFormatter( private val formatter = TextPrefixBasedAssertionGroupFormatter(bulletPoint) - override fun formatGroupHeaderAndGetChildParameterObject(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject) - = formatter.formatWithGroupName(assertionPairFormatter, assertionGroup, parameterObject) + override fun formatGroupHeaderAndGetChildParameterObject( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject + ): AssertionFormatterParameterObject = + formatter.formatWithGroupName(assertionPairFormatter, assertionGroup, parameterObject) } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextNextLineAssertionPairFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextNextLineAssertionPairFormatter.kt index 648aef1c6..14614cd23 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextNextLineAssertionPairFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextNextLineAssertionPairFormatter.kt @@ -30,13 +30,24 @@ class TextNextLineAssertionPairFormatter( private val translator: Translator ) : AssertionPairFormatter { - override fun formatGroupHeader(parameterObject: AssertionFormatterParameterObject, assertionGroup: AssertionGroup, newParameterObject: AssertionFormatterParameterObject) - = format(parameterObject, assertionGroup.description, assertionGroup.representation, newParameterObject) + override fun formatGroupHeader( + parameterObject: AssertionFormatterParameterObject, + assertionGroup: AssertionGroup, + newParameterObject: AssertionFormatterParameterObject + ): Unit = format(parameterObject, assertionGroup.description, assertionGroup.representation, newParameterObject) - override fun format(parameterObject: AssertionFormatterParameterObject, translatable: Translatable, representation: Any) - = format(parameterObject, translatable, representation, parameterObject) + override fun format( + parameterObject: AssertionFormatterParameterObject, + translatable: Translatable, + representation: Any + ): Unit = format(parameterObject, translatable, representation, parameterObject) - private fun format(parameterObject: AssertionFormatterParameterObject, translatable: Translatable, representation: Any, newParameterObject: AssertionFormatterParameterObject) { + private fun format( + parameterObject: AssertionFormatterParameterObject, + translatable: Translatable, + representation: Any, + newParameterObject: AssertionFormatterParameterObject + ) { parameterObject.sb.append(translator.translate(translatable)).append(":") if (representation !is RawString || representation != RawString.EMPTY) { newParameterObject.appendLnAndIndent() diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextPrefixBasedAssertionGroupFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextPrefixBasedAssertionGroupFormatter.kt index 00ddbd9a8..8dcecf87a 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextPrefixBasedAssertionGroupFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextPrefixBasedAssertionGroupFormatter.kt @@ -7,12 +7,20 @@ import ch.tutteli.atrium.reporting.AssertionPairFormatter class TextPrefixBasedAssertionGroupFormatter( private val prefix: String ) { - fun formatWithGroupName(assertionPairFormatter: AssertionPairFormatter, assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject): AssertionFormatterParameterObject { + fun formatWithGroupName( + assertionPairFormatter: AssertionPairFormatter, + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject + ): AssertionFormatterParameterObject { parameterObject.appendLnIndentAndPrefix() return formatAfterAppendLnEtc(assertionPairFormatter, assertionGroup, parameterObject) } - fun formatAfterAppendLnEtc(assertionPairFormatter: AssertionPairFormatter, assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject): AssertionFormatterParameterObject { + fun formatAfterAppendLnEtc( + assertionPairFormatter: AssertionPairFormatter, + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject + ): AssertionFormatterParameterObject { val newParameterObject = parameterObject.createChildWithNewPrefix(prefix) assertionPairFormatter.formatGroupHeader(parameterObject, assertionGroup, newParameterObject) return newParameterObject diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextSameLineAssertionPairFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextSameLineAssertionPairFormatter.kt index 8f2295735..858171114 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextSameLineAssertionPairFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextSameLineAssertionPairFormatter.kt @@ -28,10 +28,18 @@ class TextSameLineAssertionPairFormatter( private val translator: Translator ) : AssertionPairFormatter { - override fun formatGroupHeader(parameterObject: AssertionFormatterParameterObject, assertionGroup: AssertionGroup, newParameterObject: AssertionFormatterParameterObject) - = format(parameterObject, assertionGroup.description, assertionGroup.representation) + override fun formatGroupHeader( + parameterObject: AssertionFormatterParameterObject, + assertionGroup: AssertionGroup, + newParameterObject: AssertionFormatterParameterObject + ): Unit = format(parameterObject, assertionGroup.description, assertionGroup.representation) - override fun format(parameterObject: AssertionFormatterParameterObject, translatable: Translatable, representation: Any) { - parameterObject.sb.append(translator.translate(translatable)).append(": ").append(objectFormatter.format(representation)) + override fun format( + parameterObject: AssertionFormatterParameterObject, + translatable: Translatable, + representation: Any + ) { + parameterObject.sb.append(translator.translate(translatable)).append(": ") + .append(objectFormatter.format(representation)) } } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextSummaryAssertionGroupFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextSummaryAssertionGroupFormatter.kt index 2e5e801b5..9cab5dc28 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextSummaryAssertionGroupFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/TextSummaryAssertionGroupFormatter.kt @@ -36,14 +36,20 @@ class TextSummaryAssertionGroupFormatter( private val successful = (bulletPoints[PrefixSuccessfulSummaryAssertion::class] ?: "✔ ") private val failing = (bulletPoints[PrefixFailingSummaryAssertion::class] ?: "✘ ") - override fun formatGroupHeaderAndGetChildParameterObject(assertionGroup: AssertionGroup, parameterObject: AssertionFormatterParameterObject): AssertionFormatterParameterObject { + override fun formatGroupHeaderAndGetChildParameterObject( + assertionGroup: AssertionGroup, + parameterObject: AssertionFormatterParameterObject + ): AssertionFormatterParameterObject { parameterObject.appendLnIndentAndPrefix() assertionPairFormatter.format(parameterObject, assertionGroup.description, assertionGroup.representation) //the prefix which should be used for assertions is defined in the formatGroupAssertions return parameterObject.createForDoNotFilterAssertionGroup() } - override fun formatGroupAssertions(formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit, childParameterObject: AssertionFormatterParameterObject) { + override fun formatGroupAssertions( + formatAssertions: (AssertionFormatterParameterObject, (Assertion) -> Unit) -> Unit, + childParameterObject: AssertionFormatterParameterObject + ) { val successfulParameterObject = childParameterObject.createChildWithNewPrefix(successful) val failingParameterObject = childParameterObject.createChildWithNewPrefix(failing) formatAssertions(childParameterObject) { diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-js/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/FilterAtriumErrorAdjuster.kt b/core/robstoll-lib/atrium-core-robstoll-lib-js/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/FilterAtriumErrorAdjuster.kt index 9c43d09de..95518c890 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-js/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/FilterAtriumErrorAdjuster.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-js/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/FilterAtriumErrorAdjuster.kt @@ -15,5 +15,5 @@ abstract class FilterAtriumErrorAdjuster : AtriumErrorAdjuster { /** * Does nothing (no adjustments) - override in subclass if you want a different behaviour. */ - override fun adjustOtherThanStacks(throwable: Throwable){} + override fun adjustOtherThanStacks(throwable: Throwable) {} } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/DetailedObjectFormatter.kt b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/DetailedObjectFormatter.kt index d73c7b456..2dd91f7bc 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/DetailedObjectFormatter.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/DetailedObjectFormatter.kt @@ -1,9 +1,9 @@ package ch.tutteli.atrium.core.robstoll.lib.reporting +import ch.tutteli.atrium.reporting.LazyRepresentation import ch.tutteli.atrium.reporting.ObjectFormatter import ch.tutteli.atrium.reporting.RawString import ch.tutteli.atrium.reporting.StringBasedRawString -import ch.tutteli.atrium.reporting.LazyRepresentation import ch.tutteli.atrium.reporting.translating.TranslatableBasedRawString import ch.tutteli.atrium.reporting.translating.Translator import kotlin.reflect.KClass diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveRunnerAtriumErrorAdjuster.kt b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveRunnerAtriumErrorAdjuster.kt index f34943b7a..2a1bfdf12 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveRunnerAtriumErrorAdjuster.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/RemoveRunnerAtriumErrorAdjuster.kt @@ -7,7 +7,8 @@ actual class RemoveRunnerAtriumErrorAdjuster : FilterAtriumErrorAdjuster(), Atri override fun adjustStackTrace(stackTrace: Sequence): Sequence = stackTrace.takeWhile { !it.className.startsWith("org.junit") && - !it.className.startsWith("org.jetbrains.spek") && - !it.className.startsWith("io.kotlintest") + !it.className.startsWith("org.jetbrains.spek") && + !it.className.startsWith("org.spekframework.spek2") && + !it.className.startsWith("io.kotlintest") } } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/ResourceBundleBasedTranslator.kt b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/ResourceBundleBasedTranslator.kt index 11fdbea9b..1af862854 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/ResourceBundleBasedTranslator.kt +++ b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/ResourceBundleBasedTranslator.kt @@ -60,7 +60,7 @@ internal class ResourceBundleBasedTranslator( * [primaryLocale] or one of its secondary alternatives -- the [fallbackLocales] are used in the * given order. */ - fun create(primaryLocale: Locale, vararg fallbackLocales: Locale) - = ResourceBundleBasedTranslator(primaryLocale, fallbackLocales.toList()) + fun create(primaryLocale: Locale, vararg fallbackLocales: Locale) = + ResourceBundleBasedTranslator(primaryLocale, fallbackLocales.toList()) } } diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_de.properties b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_de.properties index 6ad4381b1..94fcf1ac2 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_de.properties +++ b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_de.properties @@ -1,2 +1,2 @@ -ch.tutteli.atrium.translations.DescriptionBasic-TO_BE = ist (de) -ch.tutteli.atrium.translations.DescriptionBasic-NOT_TO_BE = ist nicht +ch.tutteli.atrium.translations.DescriptionBasic-TO_BE=ist (de) +ch.tutteli.atrium.translations.DescriptionBasic-NOT_TO_BE=ist nicht diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_de_CH.properties b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_de_CH.properties index 808cf334d..9fd26d7d3 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_de_CH.properties +++ b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_de_CH.properties @@ -1 +1 @@ -ch.tutteli.atrium.translations.DescriptionBasic-TO_BE = ist +ch.tutteli.atrium.translations.DescriptionBasic-TO_BE=ist diff --git a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_fr.properties b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_fr.properties index 06c2db418..a6e2a446d 100644 --- a/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_fr.properties +++ b/core/robstoll-lib/atrium-core-robstoll-lib-jvm/src/test/resources/ch/tutteli/atrium/core/robstoll/lib/reporting/translating/Atrium_fr.properties @@ -1,6 +1,6 @@ -ch.tutteli.atrium.translations.DescriptionBasic-TO_BE = est -ch.tutteli.atrium.translations.DescriptionBasic-NOT_TO_BE = n'est pas -ch.tutteli.atrium.translations.DescriptionAnyAssertion-IS_NOT_SAME = n'est pas la m\u00EAme instance que -ch.tutteli.atrium.specs.AssertionVerb-ASSERT = il applique que +ch.tutteli.atrium.translations.DescriptionBasic-TO_BE=est +ch.tutteli.atrium.translations.DescriptionBasic-NOT_TO_BE=n'est pas +ch.tutteli.atrium.translations.DescriptionAnyAssertion-IS_NOT_SAME=n'est pas la m\u00EAme instance que +ch.tutteli.atrium.specs.AssertionVerb-ASSERT=il applique que ch.tutteli.atrium.specs.reporting.translating.TranslatorIntSpec.TestTranslatable-DATE_KNOWN=%tD \u00E9tait %, T2: Any?> isLessThan(subjectProvider: SubjectProvider, expected: T2): Assertion - fun , T2: Any?> isLessOrEquals(subjectProvider: SubjectProvider, expected: T2): Assertion - fun , T2: Any?> isGreaterThan(subjectProvider: SubjectProvider, expected: T2): Assertion - fun , T2: Any?> isGreaterOrEquals(subjectProvider: SubjectProvider, expected: T2): Assertion + fun , T2 : Any?> isLessThan(subjectProvider: SubjectProvider, expected: T2): Assertion + fun , T2 : Any?> isLessOrEquals(subjectProvider: SubjectProvider, expected: T2): Assertion + fun , T2 : Any?> isGreaterThan(subjectProvider: SubjectProvider, expected: T2): Assertion + fun , T2 : Any?> isGreaterOrEquals( + subjectProvider: SubjectProvider, expected: T2 + ): Assertion } diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt index a033b7235..f6b950681 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt @@ -2,7 +2,6 @@ package ch.tutteli.atrium.domain.creating import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.core.polyfills.loadSingleService -import ch.tutteli.atrium.creating.AssertionPlant import ch.tutteli.atrium.creating.SubjectProvider /** @@ -19,7 +18,7 @@ val floatingPointAssertions by lazy { loadSingleService(FloatingPointAssertions: * * An `actual` or in other words platform specific interface might add further methods. */ -expect interface FloatingPointAssertions: FloatingPointAssertionsCommon +expect interface FloatingPointAssertions : FloatingPointAssertionsCommon /** * Defines the minimum set of assertion functions and builders applicable to floating points ([Float], [Double]), diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/MapEntryAssertions.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/MapEntryAssertions.kt index 2b43b2a93..207958856 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/MapEntryAssertions.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/MapEntryAssertions.kt @@ -21,7 +21,7 @@ val mapEntryAssertions by lazy { loadSingleService(MapEntryAssertions::class) } * which an implementation of the domain of Atrium has to provide. */ interface MapEntryAssertions { - fun > isKeyValue(assertionContainer: Expect, key: K, value: V): Assertion + fun > isKeyValue(assertionContainer: Expect, key: K, value: V): Assertion fun > isKeyValue( assertionContainer: Expect, key: K?, @@ -36,8 +36,10 @@ interface MapEntryAssertions { @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") fun isKeyValue(plant: AssertionPlant>, key: K, value: V): Assertion + @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") fun key(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion + @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") fun value( plant: AssertionPlant>, diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/PairAssertions.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/PairAssertions.kt index 711557548..58d281a45 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/PairAssertions.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/PairAssertions.kt @@ -25,11 +25,20 @@ interface PairAssertions { @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") - fun first(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion + fun first(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion + @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") - fun second(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion + fun second(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion + @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") - fun nullableFirst(plant: AssertionPlant>, assertionCreator: AssertionPlantNullable.() -> Unit): Assertion + fun nullableFirst( + plant: AssertionPlant>, + assertionCreator: AssertionPlantNullable.() -> Unit + ): Assertion + @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") - fun nullableSecond(plant: AssertionPlant>, assertionCreator: AssertionPlantNullable.() -> Unit): Assertion + fun nullableSecond( + plant: AssertionPlant>, + assertionCreator: AssertionPlantNullable.() -> Unit + ): Assertion } diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/ThrowableAssertions.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/ThrowableAssertions.kt index 284c1d56f..db2d8b407 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/ThrowableAssertions.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/ThrowableAssertions.kt @@ -22,8 +22,8 @@ interface ThrowableAssertions { /** * Turns the given [assertionVerb] into an [Untranslatable] and delegates to the other overload. */ - fun thrownBuilder(assertionVerb: String, act: () -> Unit, reporter: Reporter): ThrowableThrown.Builder - = thrownBuilder(Untranslatable(assertionVerb), act, reporter) + fun thrownBuilder(assertionVerb: String, act: () -> Unit, reporter: Reporter): ThrowableThrown.Builder = + thrownBuilder(Untranslatable(assertionVerb), act, reporter) fun thrownBuilder(assertionVerb: Translatable, act: () -> Unit, reporter: Reporter): ThrowableThrown.Builder } diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/any/typetransformation/creators/AnyTypeTransformationAssertions.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/any/typetransformation/creators/AnyTypeTransformationAssertions.kt index d3bf42b9d..80615a25e 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/any/typetransformation/creators/AnyTypeTransformationAssertions.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/any/typetransformation/creators/AnyTypeTransformationAssertions.kt @@ -27,10 +27,12 @@ val anyTypeTransformationAssertions by lazy { loadSingleService(AnyTypeTransform interface AnyTypeTransformationAssertions { - @Deprecated("This function will be removed in v.1.0.0 in favour of AssertImpl.any.isNotNull", ReplaceWith( - "plant.addAssertion(AssertImpl.any.isNotNull(plant, type, assertionCreator))", - "ch.tutteli.atrium.domain.builders.AssertImpl" - )) + @Deprecated( + "This function will be removed in v.1.0.0 in favour of AssertImpl.any.isNotNull", ReplaceWith( + "plant.addAssertion(AssertImpl.any.isNotNull(plant, type, assertionCreator))", + "ch.tutteli.atrium.domain.builders.AssertImpl" + ) + ) fun isNotNull( plant: AssertionPlantNullable, type: KClass, diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/FeatureExtractor.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/FeatureExtractor.kt index b45f2d278..6f39e5b1e 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/FeatureExtractor.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/FeatureExtractor.kt @@ -41,14 +41,14 @@ interface FeatureExtractor { * Uses [coreFactory].[newMethodCallFormatter][CoreFactory.newMethodCallFormatter] to create a description * of a method call with the given [methodName] and the given [arguments]. */ - fun methodCall(methodName: String, vararg arguments: Any?): ParameterObjectOption - = feature(coreFactory.newMethodCallFormatter().format(methodName, arguments)) + fun methodCall(methodName: String, vararg arguments: Any?): ParameterObjectOption = + feature(coreFactory.newMethodCallFormatter().format(methodName, arguments)) /** * Uses the given [featureRepresentation] as description. */ - fun feature(featureRepresentation: () -> String): ParameterObjectOption - = withDescription(Untranslatable(featureRepresentation)) + fun feature(featureRepresentation: () -> String): ParameterObjectOption = + withDescription(Untranslatable(featureRepresentation)) /** * Uses the given [translatable] as description of the feature. @@ -72,8 +72,7 @@ interface FeatureExtractor { */ fun withParameterObject( parameterObject: ParameterObject - ): Creator - = featureExtractorCreatorFactory.create(featureDescription, parameterObject) + ): Creator = featureExtractorCreatorFactory.create(featureDescription, parameterObject) /** * Uses the given [parameterObject] where a nullable feature is extracted by @@ -81,8 +80,8 @@ interface FeatureExtractor { */ fun withParameterObjectNullable( parameterObject: ParameterObject - ): CreatorNullable - = featureExtractorCreatorFactory.createNullable(featureDescription, parameterObject) + ): CreatorNullable = + featureExtractorCreatorFactory.createNullable(featureDescription, parameterObject) } /** diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/creators/FeatureExtractorCreatorFactory.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/creators/FeatureExtractorCreatorFactory.kt index 141f06078..bbf24e582 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/creators/FeatureExtractorCreatorFactory.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/creators/FeatureExtractorCreatorFactory.kt @@ -31,7 +31,7 @@ interface FeatureExtractorCreatorFactory { * * @return The newly created feature extractor creator. */ - fun create( + fun create( featureRepresentation: Translatable, parameterObject: FeatureExtractor.ParameterObject ): FeatureExtractor.Creator @@ -46,7 +46,7 @@ interface FeatureExtractorCreatorFactory { * * @return The newly created feature extractor creator. */ - fun createNullable( + fun createNullable( featureRepresentation: Translatable, parameterObject: FeatureExtractor.ParameterObject ): FeatureExtractor.CreatorNullable diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/impl/deprecatedImpl.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/impl/deprecatedImpl.kt index 63dfff502..f05963b11 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/impl/deprecatedImpl.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/feature/extract/impl/deprecatedImpl.kt @@ -7,8 +7,8 @@ import ch.tutteli.atrium.reporting.translating.Translatable @Deprecated("will be removed with 1.0.0") internal class DescriptionOptionImpl : FeatureExtractor.DescriptionOption { - override fun withDescription(translatable: Translatable): FeatureExtractor.ParameterObjectOption - = ParameterObjectOptionImpl(translatable) + override fun withDescription(translatable: Translatable): FeatureExtractor.ParameterObjectOption = + ParameterObjectOptionImpl(translatable) } @Deprecated("will be removed with 1.0.0") diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/iterable/contains/IterableContains.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/iterable/contains/IterableContains.kt index f5c5a6e15..7e6f4d305 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/iterable/contains/IterableContains.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/iterable/contains/IterableContains.kt @@ -2,10 +2,8 @@ package ch.tutteli.atrium.domain.creating.iterable.contains import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup -import ch.tutteli.atrium.creating.AssertionHolder import ch.tutteli.atrium.creating.AssertionPlant import ch.tutteli.atrium.domain.creating.basic.contains.Contains -import ch.tutteli.atrium.domain.creating.charsequence.contains.CharSequenceContains import ch.tutteli.atrium.domain.creating.iterable.contains.IterableContains.* import ch.tutteli.atrium.domain.creating.iterable.contains.creators.IterableContainsAssertions import ch.tutteli.atrium.reporting.translating.Translatable @@ -51,7 +49,8 @@ interface IterableContains { interface Creator, in SC> : Contains.Creator /** - * Represents a check for the search result such as: the object is contained exactly once in the input of the search. + * Represents a check for the search result such as: + * the object is contained exactly once in the input of the search. * * It provides the method [createAssertion] which creates an [Assertion] representing this check. */ diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/iterable/contains/searchbehaviours/InOrderOnlyGroupedWithinSearchBehaviour.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/iterable/contains/searchbehaviours/InOrderOnlyGroupedWithinSearchBehaviour.kt index 5095d5469..800769e82 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/iterable/contains/searchbehaviours/InOrderOnlyGroupedWithinSearchBehaviour.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/iterable/contains/searchbehaviours/InOrderOnlyGroupedWithinSearchBehaviour.kt @@ -1,7 +1,5 @@ package ch.tutteli.atrium.domain.creating.iterable.contains.searchbehaviours -import ch.tutteli.atrium.domain.creating.iterable.contains.IterableContains - /** * Represents a filler step to emphasise that the next step defines the order within a group of a * [InOrderOnlyGroupedSearchBehaviour]. diff --git a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/throwable/thrown/ThrowableThrown.kt b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/throwable/thrown/ThrowableThrown.kt index 36baceadd..a5aa3b594 100644 --- a/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/throwable/thrown/ThrowableThrown.kt +++ b/domain/api/atrium-domain-api-common/src/main/kotlin/ch/tutteli/atrium/domain/creating/throwable/thrown/ThrowableThrown.kt @@ -4,7 +4,6 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.assertions.DescriptiveAssertion import ch.tutteli.atrium.creating.AssertionPlant -import ch.tutteli.atrium.domain.creating.any.typetransformation.* import ch.tutteli.atrium.domain.creating.throwable.thrown.ThrowableThrown.* import ch.tutteli.atrium.domain.creating.throwable.thrown.creators.ThrowableThrownAssertions import ch.tutteli.atrium.reporting.RawString @@ -17,7 +16,8 @@ import kotlin.reflect.KClass * as well as the minimum set of assertions an implementation of the domain of Atrium has to provide. * * The building process is typically started by the creation of a [Builder], - * would allow to define an [AbsentThrowableMessageProvider] as well as an [AnyTypeTransformation.FailureHandler] + * would allow to define an [AbsentThrowableMessageProvider] as well as an + * [ch.tutteli.atrium.domain.creating.any.typetransformation.AnyTypeTransformation.FailureHandler] * (currently all [ThrowableThrownAssertions] specify it implicitly) and * is finalized by one of the [ThrowableThrownAssertions] which usually use a [Creator]. */ @@ -59,7 +59,7 @@ interface ThrowableThrown { * @param throwableThrownBuilder The [ThrowableThrown.Builder] containing inter alia the * [act][ThrowableThrown.Builder.act] lambda. */ - fun executeActAssertNothingThrown(throwableThrownBuilder: ThrowableThrown.Builder) + fun executeActAssertNothingThrown(throwableThrownBuilder: Builder) /** * Executes the [act][ThrowableThrown.Builder.act] lambda of the given [throwableThrownBuilder], catches any @@ -74,7 +74,7 @@ interface ThrowableThrown { * case it was thrown as expected and is of the expected type [TExpected]. */ fun executeActAndCreateAssertion( - throwableThrownBuilder: ThrowableThrown.Builder, + throwableThrownBuilder: Builder, description: Translatable, expectedType: KClass, assertionCreator: AssertionPlant.() -> Unit diff --git a/domain/api/atrium-domain-api-js/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt b/domain/api/atrium-domain-api-js/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt index 920ce3c15..c0223c552 100644 --- a/domain/api/atrium-domain-api-js/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt +++ b/domain/api/atrium-domain-api-js/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt @@ -4,4 +4,4 @@ package ch.tutteli.atrium.domain.creating * Defines the minimum set of assertion functions and builders applicable to floating points ([Float], [Double]), * which an implementation of the domain of Atrium has to provide. */ -actual interface FloatingPointAssertions: FloatingPointAssertionsCommon +actual interface FloatingPointAssertions : FloatingPointAssertionsCommon diff --git a/domain/api/atrium-domain-api-jvm/src/main/kotlin/ch/tutteli/atrium/domain/creating/BigDecimalAssertions.kt b/domain/api/atrium-domain-api-jvm/src/main/kotlin/ch/tutteli/atrium/domain/creating/BigDecimalAssertions.kt index 13b2aabbd..ff2b61f54 100644 --- a/domain/api/atrium-domain-api-jvm/src/main/kotlin/ch/tutteli/atrium/domain/creating/BigDecimalAssertions.kt +++ b/domain/api/atrium-domain-api-jvm/src/main/kotlin/ch/tutteli/atrium/domain/creating/BigDecimalAssertions.kt @@ -20,6 +20,11 @@ val bigDecimalAssertions by lazy { loadSingleService(BigDecimalAssertions::class interface BigDecimalAssertions { fun isNumericallyEqualTo(subjectProvider: SubjectProvider, expected: T): Assertion fun isNotNumericallyEqualTo(subjectProvider: SubjectProvider, expected: T): Assertion - fun isEqualIncludingScale(subjectProvider: SubjectProvider, expected: T, nameOfIsNumericallyEqualTo: String): Assertion + fun isEqualIncludingScale( + subjectProvider: SubjectProvider, + expected: T, + nameOfIsNumericallyEqualTo: String + ): Assertion + fun isNotEqualIncludingScale(subjectProvider: SubjectProvider, expected: T): Assertion } diff --git a/domain/api/atrium-domain-api-jvm/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt b/domain/api/atrium-domain-api-jvm/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt index 2ac7e6882..e278f0be9 100644 --- a/domain/api/atrium-domain-api-jvm/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt +++ b/domain/api/atrium-domain-api-jvm/src/main/kotlin/ch/tutteli/atrium/domain/creating/FloatingPointAssertions.kt @@ -1,7 +1,6 @@ package ch.tutteli.atrium.domain.creating import ch.tutteli.atrium.assertions.Assertion -import ch.tutteli.atrium.creating.AssertionPlant import ch.tutteli.atrium.creating.SubjectProvider import java.math.BigDecimal @@ -9,6 +8,10 @@ import java.math.BigDecimal * Defines the minimum set of assertion functions and builders applicable to floating points ([Float], [Double], * [BigDecimal]), which an implementation of the domain of Atrium has to provide. */ -actual interface FloatingPointAssertions: FloatingPointAssertionsCommon { - fun toBeWithErrorTolerance(subjectProvider: SubjectProvider, expected: T, tolerance: T): Assertion +actual interface FloatingPointAssertions : FloatingPointAssertionsCommon { + fun toBeWithErrorTolerance( + subjectProvider: SubjectProvider, + expected: T, + tolerance: T + ): Assertion } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/AssertImpl.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/AssertImpl.kt index e490ac17a..7de2bffdd 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/AssertImpl.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/AssertImpl.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.domain.builders import ch.tutteli.atrium.assertions.Assertion @@ -112,7 +113,7 @@ interface AssertImplCommon { fun changeSubject( originalAssertionCreator: Expect, transformation: (T) -> R - ): Expect = subjectChanger.unreported(originalAssertionCreator, transformation) + ): Expect = subjectChanger.unreported(originalAssertionCreator, transformation) /** * Creates a new [AssertionPlantNullable] based on the given [subjectProvider] whereas the [AssertionPlant] diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/MapEntryAssertionsBuilder.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/MapEntryAssertionsBuilder.kt index 90120d202..7b7bfa677 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/MapEntryAssertionsBuilder.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/MapEntryAssertionsBuilder.kt @@ -38,7 +38,6 @@ object MapEntryAssertionsBuilder : MapEntryAssertions { mapEntryAssertions.value(assertionContainer) - @Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") override inline fun isKeyValue( diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/PairAssertionsBuilder.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/PairAssertionsBuilder.kt index 597716eee..3ccabe9cd 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/PairAssertionsBuilder.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/PairAssertionsBuilder.kt @@ -1,4 +1,5 @@ @file:Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE") + package ch.tutteli.atrium.domain.builders.creating import ch.tutteli.atrium.assertions.Assertion diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/anyAssertionsBuilders.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/anyAssertionsBuilders.kt index d25ccdb8d..25b986315 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/anyAssertionsBuilders.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/anyAssertionsBuilders.kt @@ -103,10 +103,12 @@ object AnyAssertionsBuilder : AnyAssertions { object AnyTypeTransformationAssertionsBuilder : AnyTypeTransformationAssertions { @Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") - @Deprecated("This function will be removed in v.1.0.0 in favour of AssertImpl.any.isNotNull", ReplaceWith( - "plant.addAssertion(AssertImpl.any.isNotNull(plant, type, assertionCreator))", - "ch.tutteli.atrium.domain.builders.AssertImpl" - )) + @Deprecated( + "This function will be removed in v.1.0.0 in favour of AssertImpl.any.isNotNull", ReplaceWith( + "plant.addAssertion(AssertImpl.any.isNotNull(plant, type, assertionCreator))", + "ch.tutteli.atrium.domain.builders.AssertImpl" + ) + ) override inline fun isNotNull( plant: AssertionPlantNullable, type: KClass, diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/changers/FeatureExtractorBuilder.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/changers/FeatureExtractorBuilder.kt index 92c0232f4..0071fed17 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/changers/FeatureExtractorBuilder.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/changers/FeatureExtractorBuilder.kt @@ -188,7 +188,7 @@ interface FeatureExtractorBuilder { * @param T the type of the current subject. * @param R the type of the feature, aka the new subject. */ - interface RepresentationOption{ + interface RepresentationOption { /** * The so far chosen options up to the [CheckOption] step. */ @@ -273,7 +273,9 @@ interface FeatureExtractorBuilder { canBeTransformed: (T) -> Boolean, transformation: (T) -> R, representationInsteadOfFeature: Any? - ): FinalStep = FinalStepImpl(checkOption, canBeTransformed, transformation, representationInsteadOfFeature) + ): FinalStep = FinalStepImpl( + checkOption, canBeTransformed, transformation, representationInsteadOfFeature + ) } } } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/charSequenceAssertionsBuilders.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/charSequenceAssertionsBuilders.kt index 525bbe509..5c9cd2c41 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/charSequenceAssertionsBuilders.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/charSequenceAssertionsBuilders.kt @@ -1,4 +1,5 @@ @file:Suppress("OVERRIDE_BY_INLINE", "NOTHING_TO_INLINE") + package ch.tutteli.atrium.domain.builders.creating import ch.tutteli.atrium.core.polyfills.loadSingleService @@ -21,32 +22,32 @@ import ch.tutteli.atrium.reporting.translating.Translatable */ object CharSequenceAssertionsBuilder : CharSequenceAssertions { - override inline fun containsBuilder(subjectProvider: SubjectProvider) - = charSequenceAssertions.containsBuilder(subjectProvider) + override inline fun containsBuilder(subjectProvider: SubjectProvider) = + charSequenceAssertions.containsBuilder(subjectProvider) - override inline fun containsNotBuilder(subjectProvider: SubjectProvider) - = charSequenceAssertions.containsNotBuilder(subjectProvider) + override inline fun containsNotBuilder(subjectProvider: SubjectProvider) = + charSequenceAssertions.containsNotBuilder(subjectProvider) - override inline fun startsWith(subjectProvider: SubjectProvider, expected: CharSequence) - = charSequenceAssertions.startsWith(subjectProvider, expected) + override inline fun startsWith(subjectProvider: SubjectProvider, expected: CharSequence) = + charSequenceAssertions.startsWith(subjectProvider, expected) - override inline fun startsNotWith(subjectProvider: SubjectProvider, expected: CharSequence) - = charSequenceAssertions.startsNotWith(subjectProvider, expected) + override inline fun startsNotWith(subjectProvider: SubjectProvider, expected: CharSequence) = + charSequenceAssertions.startsNotWith(subjectProvider, expected) - override inline fun endsWith(subjectProvider: SubjectProvider, expected: CharSequence) - = charSequenceAssertions.endsWith(subjectProvider, expected) + override inline fun endsWith(subjectProvider: SubjectProvider, expected: CharSequence) = + charSequenceAssertions.endsWith(subjectProvider, expected) - override inline fun endsNotWith(subjectProvider: SubjectProvider, expected: CharSequence) - = charSequenceAssertions.endsNotWith(subjectProvider, expected) + override inline fun endsNotWith(subjectProvider: SubjectProvider, expected: CharSequence) = + charSequenceAssertions.endsNotWith(subjectProvider, expected) - override inline fun isEmpty(subjectProvider: SubjectProvider) - = charSequenceAssertions.isEmpty(subjectProvider) + override inline fun isEmpty(subjectProvider: SubjectProvider) = + charSequenceAssertions.isEmpty(subjectProvider) - override inline fun isNotEmpty(subjectProvider: SubjectProvider) - = charSequenceAssertions.isNotEmpty(subjectProvider) + override inline fun isNotEmpty(subjectProvider: SubjectProvider) = + charSequenceAssertions.isNotEmpty(subjectProvider) - override inline fun isNotBlank(subjectProvider: SubjectProvider) - = charSequenceAssertions.isNotBlank(subjectProvider) + override inline fun isNotBlank(subjectProvider: SubjectProvider) = + charSequenceAssertions.isNotBlank(subjectProvider) /** * Returns [CharSequenceContainsAssertionsBuilder] @@ -60,25 +61,37 @@ object CharSequenceAssertionsBuilder : CharSequenceAssertions { * In detail, it implements [CharSequenceContainsAssertions] by delegating to [charSequenceContainsAssertions] * which in turn delegates to the implementation via [loadSingleService]. */ -object CharSequenceContainsAssertionsBuilder: CharSequenceContainsAssertions { +object CharSequenceContainsAssertionsBuilder : CharSequenceContainsAssertions { - override inline fun values(checkerOption: CharSequenceContains.CheckerOption, expected: List) - = charSequenceContainsAssertions.values(checkerOption, expected) + override inline fun values( + checkerOption: CharSequenceContains.CheckerOption, + expected: List + ) = charSequenceContainsAssertions.values(checkerOption, expected) - override inline fun valuesIgnoringCase(checkerOption: CharSequenceContains.CheckerOption, expected: List) - = charSequenceContainsAssertions.valuesIgnoringCase(checkerOption, expected) + override inline fun valuesIgnoringCase( + checkerOption: CharSequenceContains.CheckerOption, + expected: List + ) = charSequenceContainsAssertions.valuesIgnoringCase(checkerOption, expected) - override inline fun defaultTranslationOf(checkerOption: CharSequenceContains.CheckerOption, expected: List) - = charSequenceContainsAssertions.defaultTranslationOf(checkerOption, expected) + override inline fun defaultTranslationOf( + checkerOption: CharSequenceContains.CheckerOption, + expected: List + ) = charSequenceContainsAssertions.defaultTranslationOf(checkerOption, expected) - override inline fun defaultTranslationOfIgnoringCase(checkerOption: CharSequenceContains.CheckerOption, expected: List) - = charSequenceContainsAssertions.defaultTranslationOfIgnoringCase(checkerOption, expected) + override inline fun defaultTranslationOfIgnoringCase( + checkerOption: CharSequenceContains.CheckerOption, + expected: List + ) = charSequenceContainsAssertions.defaultTranslationOfIgnoringCase(checkerOption, expected) - override inline fun regex(checkerOption: CharSequenceContains.CheckerOption, expected: List) - = charSequenceContainsAssertions.regex(checkerOption, expected) + override inline fun regex( + checkerOption: CharSequenceContains.CheckerOption, + expected: List + ) = charSequenceContainsAssertions.regex(checkerOption, expected) - override inline fun regexIgnoringCase(checkerOption: CharSequenceContains.CheckerOption, expected: List) - = charSequenceContainsAssertions.regexIgnoringCase(checkerOption, expected) + override inline fun regexIgnoringCase( + checkerOption: CharSequenceContains.CheckerOption, + expected: List + ) = charSequenceContainsAssertions.regexIgnoringCase(checkerOption, expected) /** * Returns [CharSequenceContainsSearchBehaviourFactoryBuilder] @@ -94,6 +107,8 @@ object CharSequenceContainsAssertionsBuilder: CharSequenceContainsAssertions { */ object CharSequenceContainsSearchBehaviourFactoryBuilder : SearchBehaviourFactory { - override inline fun ignoringCase(containsBuilder: CharSequenceContains.Builder): CharSequenceContains.Builder - = searchBehaviourFactory.ignoringCase(containsBuilder) + override inline fun ignoringCase( + containsBuilder: CharSequenceContains.Builder + ): CharSequenceContains.Builder = + searchBehaviourFactory.ignoringCase(containsBuilder) } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/charsequence/contains/builders/AtLeastCheckerOptionBase.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/charsequence/contains/builders/AtLeastCheckerOptionBase.kt index 1df54781e..c639f8416 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/charsequence/contains/builders/AtLeastCheckerOptionBase.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/charsequence/contains/builders/AtLeastCheckerOptionBase.kt @@ -25,7 +25,7 @@ import ch.tutteli.atrium.domain.creating.charsequence.contains.checkers.checkerF */ abstract class AtLeastCheckerOptionBase( final override val times: Int, - final override val containsBuilder: CharSequenceContains.Builder, + final override val containsBuilder: CharSequenceContains.Builder, nameContainsNotFun: String, atLeastCall: (Int) -> String ) : WithTimesCheckerOption { diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/AtLeastCheckerOptionBase.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/AtLeastCheckerOptionBase.kt index 0afe24c53..7029bdbe0 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/AtLeastCheckerOptionBase.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/AtLeastCheckerOptionBase.kt @@ -25,7 +25,7 @@ import ch.tutteli.atrium.domain.creating.iterable.contains.checkers.checkerFacto */ abstract class AtLeastCheckerOptionBase, out S : SearchBehaviour>( final override val times: Int, - final override val containsBuilder: IterableContains.Builder, + final override val containsBuilder: IterableContains.Builder, nameContainsNotFun: String, atLeastCall: (Int) -> String ) : WithTimesCheckerOption { diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/AtMostCheckerOptionBase.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/AtMostCheckerOptionBase.kt index 4054fafe9..5385fa9dc 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/AtMostCheckerOptionBase.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/AtMostCheckerOptionBase.kt @@ -28,7 +28,7 @@ import ch.tutteli.atrium.domain.creating.iterable.contains.checkers.checkerFacto */ abstract class AtMostCheckerOptionBase, out S : SearchBehaviour>( final override val times: Int, - final override val containsBuilder: IterableContains.Builder, + final override val containsBuilder: IterableContains.Builder, nameContainsNotFun: String, atMostCall: (Int) -> String, atLeastCall: (Int) -> String, diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/ButAtMostCheckerOptionBase.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/ButAtMostCheckerOptionBase.kt index 34298cf88..85e589b82 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/ButAtMostCheckerOptionBase.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/ButAtMostCheckerOptionBase.kt @@ -28,9 +28,9 @@ import ch.tutteli.atrium.domain.creating.iterable.contains.checkers.checkerFacto * @param exactlyCall The name of the function which represents a `Iterable contains exactly` assertion. */ abstract class ButAtMostCheckerOptionBase, out S : SearchBehaviour>( - final override val times: Int, + final override val times: Int, atLeastBuilder: WithTimesCheckerOption, - final override val containsBuilder: IterableContains.Builder, + final override val containsBuilder: IterableContains.Builder, nameContainsNotFun: String, atLeastButAtMostCall: (Int, Int) -> String, atMostCall: (Int) -> String, diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/ExactlyCheckerOptionBase.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/ExactlyCheckerOptionBase.kt index dd6c0206e..ab20644d3 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/ExactlyCheckerOptionBase.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/ExactlyCheckerOptionBase.kt @@ -25,7 +25,7 @@ import ch.tutteli.atrium.domain.creating.iterable.contains.checkers.checkerFacto */ abstract class ExactlyCheckerOptionBase, out S : SearchBehaviour>( final override val times: Int, - final override val containsBuilder: IterableContains.Builder, + final override val containsBuilder: IterableContains.Builder, nameContainsNotFun: String, exactlyCall: (Int) -> String ) : WithTimesCheckerOption { diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/NotCheckerOptionBase.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/NotCheckerOptionBase.kt index 1c45b3715..74aad9375 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/NotCheckerOptionBase.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/NotCheckerOptionBase.kt @@ -15,7 +15,7 @@ import ch.tutteli.atrium.domain.creating.iterable.contains.checkers.checkerFacto * sophisticated `contains` assertion for [Iterable]. */ abstract class NotCheckerOptionBase, out S : SearchBehaviour>( - override val containsBuilder: IterableContains.Builder + override val containsBuilder: IterableContains.Builder ) : IterableContains.CheckerOption { override val checkers = listOf( diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/NotOrAtMostCheckerOptionBase.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/NotOrAtMostCheckerOptionBase.kt index bbd03a48e..511a998ef 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/NotOrAtMostCheckerOptionBase.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/iterable/contains/builders/NotOrAtMostCheckerOptionBase.kt @@ -22,7 +22,7 @@ import ch.tutteli.atrium.domain.creating.iterable.contains.checkers.checkerFacto */ abstract class NotOrAtMostCheckerOptionBase, out S : SearchBehaviour>( final override val times: Int, - final override val containsBuilder: IterableContains.Builder, + final override val containsBuilder: IterableContains.Builder, nameContainsNotFun: String, notOrAtMostCall: (Int) -> String ) : WithTimesCheckerOption { diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/throwableAssertionsBuilders.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/throwableAssertionsBuilders.kt index b2d052703..ce234063f 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/throwableAssertionsBuilders.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/creating/throwableAssertionsBuilders.kt @@ -62,8 +62,8 @@ object ThrowableThrownAssertionsBuilder : ThrowableThrownAssertions { @Suppress("DEPRECATION", "DeprecatedCallableAddReplaceWith") @Deprecated("Switch from Assert to Expect; will be removed with 1.0.0") - override inline fun nothingThrown(throwableThrownBuilder: ThrowableThrown.Builder) - = throwableThrownAssertions.nothingThrown(throwableThrownBuilder) + override inline fun nothingThrown(throwableThrownBuilder: ThrowableThrown.Builder) = + throwableThrownAssertions.nothingThrown(throwableThrownBuilder) /** * Returns [AbsentThrowableMessageProviderFactoryBuilder] @@ -71,7 +71,8 @@ object ThrowableThrownAssertionsBuilder : ThrowableThrownAssertions { */ @Suppress("DeprecatedCallableAddReplaceWith", "DEPRECATION") @Deprecated("Will be removed with 1.0.0") - inline val providers get() = AbsentThrowableMessageProviderFactoryBuilder + inline val providers + get() = AbsentThrowableMessageProviderFactoryBuilder } /** @@ -81,7 +82,8 @@ object ThrowableThrownAssertionsBuilder : ThrowableThrownAssertions { */ @Suppress("DEPRECATION") @Deprecated("Will be removed with 1.0.0") -object AbsentThrowableMessageProviderFactoryBuilder : ch.tutteli.atrium.domain.creating.throwable.thrown.providers.AbsentThrowableMessageProviderFactory { +object AbsentThrowableMessageProviderFactoryBuilder : + ch.tutteli.atrium.domain.creating.throwable.thrown.providers.AbsentThrowableMessageProviderFactory { override inline fun translatableBased(translatable: Translatable): ThrowableThrown.AbsentThrowableMessageProvider = absentThrowableMessageProviderFactory.translatableBased(translatable) diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionFormatterControllerOption.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionFormatterControllerOption.kt index fee033620..5448b40b8 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionFormatterControllerOption.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionFormatterControllerOption.kt @@ -32,7 +32,7 @@ interface AssertionFormatterControllerOption { fun withAssertionFormatterController(assertionFormatterController: AssertionFormatterController): AssertionFormatterFacadeOption companion object { - fun create(objectFormatter: ObjectFormatter, translator: Translator): AssertionFormatterControllerOption - = AssertionFormatterControllerOptionImpl(objectFormatter, translator) + fun create(objectFormatter: ObjectFormatter, translator: Translator): AssertionFormatterControllerOption = + AssertionFormatterControllerOptionImpl(objectFormatter, translator) } } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionFormatterFacadeOption.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionFormatterFacadeOption.kt index cafdeadbf..345cb4280 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionFormatterFacadeOption.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionFormatterFacadeOption.kt @@ -42,7 +42,7 @@ interface AssertionFormatterFacadeOption { assertionFormatterController: AssertionFormatterController, objectFormatter: ObjectFormatter, translator: Translator - ): AssertionFormatterFacadeOption - = AssertionFormatterFacadeOptionImpl(assertionFormatterController, objectFormatter, translator) + ): AssertionFormatterFacadeOption = + AssertionFormatterFacadeOptionImpl(assertionFormatterController, objectFormatter, translator) } } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionPairFormatterOption.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionPairFormatterOption.kt index bd920b32b..644dd987b 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionPairFormatterOption.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AssertionPairFormatterOption.kt @@ -22,14 +22,14 @@ interface AssertionPairFormatterOption { /** * Uses [CoreFactory.newTextSameLineAssertionPairFormatter] as [AssertionPairFormatter]. */ - fun withTextSameLineAssertionPairFormatter(): TextAssertionFormatterOption - = withTextAssertionPairFormatter(coreFactory::newTextSameLineAssertionPairFormatter) + fun withTextSameLineAssertionPairFormatter(): TextAssertionFormatterOption = + withTextAssertionPairFormatter(coreFactory::newTextSameLineAssertionPairFormatter) /** * Uses [CoreFactory.newTextNextLineAssertionPairFormatter] as [AssertionPairFormatter]. */ - fun withTextNextLineAssertionPairFormatter(): TextAssertionFormatterOption - = withTextAssertionPairFormatter(coreFactory::newTextNextLineAssertionPairFormatter) + fun withTextNextLineAssertionPairFormatter(): TextAssertionFormatterOption = + withTextAssertionPairFormatter(coreFactory::newTextNextLineAssertionPairFormatter) /** * Uses the given [factory] to build a custom [AssertionPairFormatter]. @@ -41,13 +41,12 @@ interface AssertionPairFormatterOption { assertionFormatterFacade: AssertionFormatterFacade, objectFormatter: ObjectFormatter, translator: Translator - ): AssertionPairFormatterOption - = create(AssertionFormatterChosenOptions( - assertionFormatterFacade, objectFormatter, translator - )) + ): AssertionPairFormatterOption = create( + AssertionFormatterChosenOptions(assertionFormatterFacade, objectFormatter, translator) + ) - fun create(options: AssertionFormatterChosenOptions): AssertionPairFormatterOption - = AssertionPairFormatterOptionImpl(options) + fun create(options: AssertionFormatterChosenOptions): AssertionPairFormatterOption = + AssertionPairFormatterOptionImpl(options) } } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AtriumErrorAdjusterCommonOption.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AtriumErrorAdjusterCommonOption.kt index b8a52721b..7ebba89fb 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AtriumErrorAdjusterCommonOption.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/AtriumErrorAdjusterCommonOption.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.reporting.AtriumErrorAdjuster /** * Provides common options to create an [AtriumErrorAdjuster]. */ -interface AtriumErrorAdjusterCommonOption { +interface AtriumErrorAdjusterCommonOption { /** * Uses an [AtriumErrorAdjuster] which removes stackBacktrace frames of test runners from a given [AtriumError]. diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/LocaleOrderDeciderOption.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/LocaleOrderDeciderOption.kt index bb078b10a..86f1c2b92 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/LocaleOrderDeciderOption.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/LocaleOrderDeciderOption.kt @@ -26,7 +26,7 @@ interface LocaleOrderDeciderOption { fun withLocaleOrderDecider(localeOrderDecider: LocaleOrderDecider): TranslatorOption companion object { - fun create(translationSupplier: TranslationSupplier): LocaleOrderDeciderOption - = LocaleOrderDeciderOptionImpl(translationSupplier) + fun create(translationSupplier: TranslationSupplier): LocaleOrderDeciderOption = + LocaleOrderDeciderOptionImpl(translationSupplier) } } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ObjectFormatterOption.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ObjectFormatterOption.kt index 9db99e355..4b8dcf40c 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ObjectFormatterOption.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ObjectFormatterOption.kt @@ -26,7 +26,6 @@ interface ObjectFormatterOption { fun withObjectFormatter(factory: (Translator) -> ObjectFormatter): AssertionFormatterControllerOption companion object { - fun create(translator: Translator): ObjectFormatterOption - = ObjectFormatterOptionImpl(translator) + fun create(translator: Translator): ObjectFormatterOption = ObjectFormatterOptionImpl(translator) } } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilder.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilder.kt index 68aac9b5b..2fe8a1224 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilder.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilder.kt @@ -8,7 +8,10 @@ import ch.tutteli.atrium.reporting.translating.* * Entry point to build a [Reporter] * -- the first step provides options to create a [Translator] or a [TranslationSupplier]. */ -@Deprecated("use ExpectIml.reporterBuilder instead; will be removed with 1.0.0", ReplaceWith("ExpectImpl.reporterBuilder", "ch.tutteli.atrium.domain.builders.ExpectImpl")) +@Deprecated( + "use ExpectIml.reporterBuilder instead; will be removed with 1.0.0", + ReplaceWith("ExpectImpl.reporterBuilder", "ch.tutteli.atrium.domain.builders.ExpectImpl") +) val reporterBuilder: ReporterBuilder = ReporterBuilderImpl diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilderFinalStep.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilderFinalStep.kt index 55e6e3763..941e97ea6 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilderFinalStep.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilderFinalStep.kt @@ -14,7 +14,6 @@ interface ReporterBuilderFinalStep { fun build(): Reporter companion object { - fun create(factory: () -> Reporter): ReporterBuilderFinalStep - = ReporterBuilderFinalStepImpl(factory) + fun create(factory: () -> Reporter): ReporterBuilderFinalStep = ReporterBuilderFinalStepImpl(factory) } } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TextAssertionFormatterOption.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TextAssertionFormatterOption.kt index 2a3f762ff..81392eb16 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TextAssertionFormatterOption.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TextAssertionFormatterOption.kt @@ -12,7 +12,7 @@ import kotlin.reflect.KClass * Provides options to register [AssertionFormatter]s to the chosen [AssertionFormatterFacade] -- the platform * specific interface might provide further options. */ -expect interface TextAssertionFormatterOption : TextAssertionFormatterOptionCommon{ +expect interface TextAssertionFormatterOption : TextAssertionFormatterOptionCommon { companion object { fun create( options: AssertionFormatterChosenOptions, diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TranslatorOption.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TranslatorOption.kt index b50dffa5c..4b7f78864 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TranslatorOption.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TranslatorOption.kt @@ -6,7 +6,7 @@ import ch.tutteli.atrium.reporting.translating.* /** * Provides options to create a [Translator] -- the platform specific interface might provide further options. */ -expect interface TranslatorOption: TranslatorOptionCommon +expect interface TranslatorOption : TranslatorOptionCommon /** * Provides options to create a [Translator] -- those options have to be provided on all platforms. diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionFormatterControllerOptionImpl.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionFormatterControllerOptionImpl.kt index 2fb6dbc14..11533e189 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionFormatterControllerOptionImpl.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionFormatterControllerOptionImpl.kt @@ -12,9 +12,9 @@ internal class AssertionFormatterControllerOptionImpl( override val translator: Translator ) : AssertionFormatterControllerOption { - override fun withDefaultAssertionFormatterController() - = withAssertionFormatterController(coreFactory.newAssertionFormatterController()) + override fun withDefaultAssertionFormatterController() = + withAssertionFormatterController(coreFactory.newAssertionFormatterController()) - override fun withAssertionFormatterController(assertionFormatterController: AssertionFormatterController) - = AssertionFormatterFacadeOption.create(assertionFormatterController, objectFormatter, translator) + override fun withAssertionFormatterController(assertionFormatterController: AssertionFormatterController) = + AssertionFormatterFacadeOption.create(assertionFormatterController, objectFormatter, translator) } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionFormatterFacadeOptionImpl.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionFormatterFacadeOptionImpl.kt index ec36c2110..6d38b96cb 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionFormatterFacadeOptionImpl.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionFormatterFacadeOptionImpl.kt @@ -14,9 +14,9 @@ internal class AssertionFormatterFacadeOptionImpl( override val translator: Translator ) : AssertionFormatterFacadeOption { - override fun withDefaultAssertionFormatterFacade() - = withAssertionFormatterFacade(coreFactory::newAssertionFormatterFacade) + override fun withDefaultAssertionFormatterFacade() = + withAssertionFormatterFacade(coreFactory::newAssertionFormatterFacade) - override fun withAssertionFormatterFacade(factory: (AssertionFormatterController) -> AssertionFormatterFacade) - = AssertionPairFormatterOption.create(factory(assertionFormatterController), objectFormatter, translator) + override fun withAssertionFormatterFacade(factory: (AssertionFormatterController) -> AssertionFormatterFacade) = + AssertionPairFormatterOption.create(factory(assertionFormatterController), objectFormatter, translator) } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionPairFormatterOptionImpl.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionPairFormatterOptionImpl.kt index a51d46f5d..81c33ada7 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionPairFormatterOptionImpl.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/AssertionPairFormatterOptionImpl.kt @@ -11,6 +11,6 @@ internal class AssertionPairFormatterOptionImpl( override val options: AssertionFormatterChosenOptions ) : AssertionPairFormatterOption { - override fun withTextAssertionPairFormatter(factory: (ObjectFormatter, Translator) -> AssertionPairFormatter) - = TextAssertionFormatterOption.create(options, factory(options.objectFormatter, options.translator)) + override fun withTextAssertionPairFormatter(factory: (ObjectFormatter, Translator) -> AssertionPairFormatter) = + TextAssertionFormatterOption.create(options, factory(options.objectFormatter, options.translator)) } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/LocaleOrderDeciderOptionImpl.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/LocaleOrderDeciderOptionImpl.kt index e4482cc3d..fe87b0516 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/LocaleOrderDeciderOptionImpl.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/LocaleOrderDeciderOptionImpl.kt @@ -9,9 +9,8 @@ internal class LocaleOrderDeciderOptionImpl( override val translationSupplier: TranslationSupplier ) : LocaleOrderDeciderOption { - override fun withDefaultLocaleOrderDecider() - = withLocaleOrderDecider(coreFactory.newLocaleOrderDecider()) + override fun withDefaultLocaleOrderDecider() = withLocaleOrderDecider(coreFactory.newLocaleOrderDecider()) - override fun withLocaleOrderDecider(localeOrderDecider: LocaleOrderDecider) - = TranslatorOptionImpl(translationSupplier, localeOrderDecider) + override fun withLocaleOrderDecider(localeOrderDecider: LocaleOrderDecider) = + TranslatorOptionImpl(translationSupplier, localeOrderDecider) } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ObjectFormatterOptionImpl.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ObjectFormatterOptionImpl.kt index 1f4432ef9..05474b824 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ObjectFormatterOptionImpl.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ObjectFormatterOptionImpl.kt @@ -10,9 +10,8 @@ internal class ObjectFormatterOptionImpl( override val translator: Translator ) : ObjectFormatterOption { - override fun withDetailedObjectFormatter() - = withObjectFormatter(coreFactory::newDetailedObjectFormatter) + override fun withDetailedObjectFormatter() = withObjectFormatter(coreFactory::newDetailedObjectFormatter) - override fun withObjectFormatter(factory: (Translator) -> ObjectFormatter) - = AssertionFormatterControllerOption.create(factory(translator), translator) + override fun withObjectFormatter(factory: (Translator) -> ObjectFormatter) = + AssertionFormatterControllerOption.create(factory(translator), translator) } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/TranslatorOptionImpl.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/TranslatorOptionImpl.kt index 9eceed028..8266311eb 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/TranslatorOptionImpl.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/TranslatorOptionImpl.kt @@ -12,8 +12,8 @@ internal class TranslatorOptionImpl( override val localeOrderDecider: LocaleOrderDecider ) : TranslatorOption { - override fun withDefaultTranslator(primaryLocale: Locale, vararg fallbackLocales: Locale) - = ObjectFormatterOptionImpl( + override fun withDefaultTranslator(primaryLocale: Locale, vararg fallbackLocales: Locale) = + ObjectFormatterOptionImpl( coreFactory.newTranslator( translationSupplier, localeOrderDecider, @@ -22,6 +22,6 @@ internal class TranslatorOptionImpl( ) ) - override fun withTranslator(factory: (TranslationSupplier, LocaleOrderDecider) -> Translator) - = ObjectFormatterOptionImpl(factory(translationSupplier, localeOrderDecider)) + override fun withTranslator(factory: (TranslationSupplier, LocaleOrderDecider) -> Translator) = + ObjectFormatterOptionImpl(factory(translationSupplier, localeOrderDecider)) } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/containsValidators.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/containsValidators.kt index 0b3a8ed36..e3dd02f2e 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/containsValidators.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/containsValidators.kt @@ -11,7 +11,8 @@ fun validateAtMost( exactlyCall: (Int) -> String ) { require(1 != times) { - "use ${exactlyCall(times)} instead of ${atMostCall(times)}; ${atMostCall(times)} defines implicitly ${atLeastCall(1)} as well" + "use ${exactlyCall(times)} instead of ${atMostCall(times)}; " + + "${atMostCall(times)} defines implicitly ${atLeastCall(1)} as well" } } diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/groupsToList.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/groupsToList.kt index fbd293b8d..a984ea618 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/groupsToList.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/groupsToList.kt @@ -14,13 +14,13 @@ interface Group { * Represents a group of [T] (where `T: Any`) which can be converted to a [List]`` */ @Deprecated("Use super-type Group instead; will be removed with 1.0.0", ReplaceWith("Group")) -interface GroupWithoutNullableEntries: Group +interface GroupWithoutNullableEntries : Group /** * Represents a group of [T] (where `T: Any?`) which can be converted to a [List]`` */ @Deprecated("Use super-type Group instead; will be removed with 1.0.0", ReplaceWith("Group")) -interface GroupWithNullableEntries: Group +interface GroupWithNullableEntries : Group /** * Adds the given [firstGroup], the [secondGroup] and the [otherGroups] into a new [List] and returns it. diff --git a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/nullable.kt b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/nullable.kt index 1b288fa28..92aee6258 100644 --- a/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/nullable.kt +++ b/domain/builders/atrium-domain-builders-common/src/main/kotlin/ch/tutteli/atrium/domain/builders/utils/nullable.kt @@ -2,8 +2,8 @@ package ch.tutteli.atrium.domain.builders.utils -import kotlin.reflect.* import kotlin.jvm.JvmName +import kotlin.reflect.* /** @@ -63,7 +63,7 @@ inline fun nullableContainer(arr: Array): Array = arr * compiler that we expect a nullable type and not a non-nullable one). For instance, instead of writing * `getPersons() as Map` you can write `nullableKeyMap(getPersons())` */ -inline fun nullableKeyMap(map: Map): Map = map +inline fun nullableKeyMap(map: Map): Map = map /** * Turns a [Map] into a map with a nullable value type. @@ -76,7 +76,7 @@ inline fun nullableKeyMap(map: Map): Map = map * compiler that we expect a nullable type and not a non-nullable one). For instance, instead of writing * `getPersons() as Map` you can write `nullableValueMap(getPersons())` */ -inline fun nullableValueMap(map: Map): Map = map +inline fun nullableValueMap(map: Map): Map = map /** * Turns a [Map] into a map with a nullable key and a nullable value type. @@ -139,4 +139,5 @@ inline fun nullable(t: KFunction4): KFunc * type) of your function into a nullable type. */ @JvmName("nullable5") -inline fun nullable(t: KFunction5): KFunction5 = t +inline fun nullable(t: KFunction5): KFunction5 = + t diff --git a/domain/builders/atrium-domain-builders-common/src/test/kotlin/ch/tutteli/atrium/domain/builders/utils/MapArgumentsSpec.kt b/domain/builders/atrium-domain-builders-common/src/test/kotlin/ch/tutteli/atrium/domain/builders/utils/MapArgumentsSpec.kt index 3d637a018..7e42be931 100644 --- a/domain/builders/atrium-domain-builders-common/src/test/kotlin/ch/tutteli/atrium/domain/builders/utils/MapArgumentsSpec.kt +++ b/domain/builders/atrium-domain-builders-common/src/test/kotlin/ch/tutteli/atrium/domain/builders/utils/MapArgumentsSpec.kt @@ -2,13 +2,13 @@ package ch.tutteli.atrium.domain.builders.utils import ch.tutteli.atrium.api.fluent.en_GB.* import ch.tutteli.atrium.api.verbs.internal.expect -import ch.tutteli.atrium.verbs.internal.assert as deprecatedAssert import ch.tutteli.atrium.domain.builders.ExpectImpl import ch.tutteli.atrium.domain.builders.creating.PleaseUseReplacementException import ch.tutteli.atrium.domain.builders.migration.asAssert import ch.tutteli.atrium.domain.builders.migration.asExpect import org.spekframework.spek2.Spek import org.spekframework.spek2.style.specification.describe +import ch.tutteli.atrium.verbs.internal.assert as deprecatedAssert object MapArgumentsSpec : Spek({ @@ -31,7 +31,7 @@ object MapArgumentsSpec : Spek({ .second.asIterable().containsExactly("b.", "c.") } - it("toExpect"){ + it("toExpect") { fun it(i: String, vararg iX: String) = mapArguments(i, iX).toExpect { startsWith(it) } diff --git a/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/registerServices.kt b/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/registerServices.kt index 27a40bd4e..4e7499a24 100644 --- a/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/registerServices.kt +++ b/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/registerServices.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION") + package ch.tutteli.atrium.domain.builders import ch.tutteli.atrium.core.polyfills.registerService diff --git a/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilder.kt b/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilder.kt index 5e2287900..7193e7796 100644 --- a/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilder.kt +++ b/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/ReporterBuilder.kt @@ -6,4 +6,4 @@ import ch.tutteli.atrium.reporting.translating.Translator /** * Provides options to create a [Translator] or [TranslationSupplier]. */ -actual interface ReporterBuilder: ReporterBuilderCommon +actual interface ReporterBuilder : ReporterBuilderCommon diff --git a/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TranslatorOption.kt b/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TranslatorOption.kt index f28bd6af3..6ca64958e 100644 --- a/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TranslatorOption.kt +++ b/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/TranslatorOption.kt @@ -5,4 +5,4 @@ import ch.tutteli.atrium.reporting.translating.Translator /** * Provides options to create a [Translator]. */ -actual interface TranslatorOption: TranslatorOptionCommon +actual interface TranslatorOption : TranslatorOptionCommon diff --git a/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ReporterBuilderImpl.kt b/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ReporterBuilderImpl.kt index fd69362c8..4a453ec75 100644 --- a/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ReporterBuilderImpl.kt +++ b/domain/builders/atrium-domain-builders-js/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ReporterBuilderImpl.kt @@ -10,15 +10,12 @@ import ch.tutteli.atrium.reporting.translating.UsingDefaultTranslator internal actual object ReporterBuilderImpl : ReporterBuilder { - override fun withoutTranslations(primaryLocale: Locale) - = withTranslator(UsingDefaultTranslator(primaryLocale)) + override fun withoutTranslations(primaryLocale: Locale) = withTranslator(UsingDefaultTranslator(primaryLocale)) - override fun withTranslator(translator: Translator) - = ObjectFormatterOption.create(translator) + override fun withTranslator(translator: Translator) = ObjectFormatterOption.create(translator) - override fun withDefaultTranslationSupplier() - = TODO("we have to implement a translation supplier for JS") + override fun withDefaultTranslationSupplier() = TODO("we have to implement a translation supplier for JS") - override fun withTranslationSupplier(translationSupplier: TranslationSupplier) - = LocaleOrderDeciderOption.create(translationSupplier) + override fun withTranslationSupplier(translationSupplier: TranslationSupplier) = + LocaleOrderDeciderOption.create(translationSupplier) } diff --git a/domain/builders/atrium-domain-builders-jvm/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ReporterBuilderImpl.kt b/domain/builders/atrium-domain-builders-jvm/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ReporterBuilderImpl.kt index bcc8d9adf..e55a49584 100644 --- a/domain/builders/atrium-domain-builders-jvm/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ReporterBuilderImpl.kt +++ b/domain/builders/atrium-domain-builders-jvm/src/main/kotlin/ch/tutteli/atrium/domain/builders/reporting/impl/ReporterBuilderImpl.kt @@ -11,15 +11,13 @@ import ch.tutteli.atrium.reporting.translating.UsingDefaultTranslator internal actual object ReporterBuilderImpl : ReporterBuilder { - override fun withoutTranslations(primaryLocale: Locale) - = withTranslator(UsingDefaultTranslator(primaryLocale)) + override fun withoutTranslations(primaryLocale: Locale) = withTranslator(UsingDefaultTranslator(primaryLocale)) - override fun withTranslator(translator: Translator) - = ObjectFormatterOption.create(translator) + override fun withTranslator(translator: Translator) = ObjectFormatterOption.create(translator) - override fun withDefaultTranslationSupplier() - = withTranslationSupplier(coreFactory.newPropertiesBasedTranslationSupplier()) + override fun withDefaultTranslationSupplier() = + withTranslationSupplier(coreFactory.newPropertiesBasedTranslationSupplier()) - override fun withTranslationSupplier(translationSupplier: TranslationSupplier) - = LocaleOrderDeciderOption.create(translationSupplier) + override fun withTranslationSupplier(translationSupplier: TranslationSupplier) = + LocaleOrderDeciderOption.create(translationSupplier) } diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-android/build.gradle b/domain/robstoll-lib/atrium-domain-robstoll-lib-android/build.gradle index ac61fd203..35873b796 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-android/build.gradle +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-android/build.gradle @@ -1,7 +1,7 @@ description = 'Contains the bits and pieces behind robstoll\'s implementation' + - 'of the domain of Atrium for Android. You should only depend on this module if you are ' + - 'providing an implementation as well and want to reuse certain artifacts. ' + - 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' + 'of the domain of Atrium for Android. You should only depend on this module if you are ' + + 'providing an implementation as well and want to reuse certain artifacts. ' + + 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' dependencies { api prefixedProject('domain-builders-android') diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/build.gradle b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/build.gradle index 32c3838cb..1c076db22 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/build.gradle +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/build.gradle @@ -1,7 +1,7 @@ description = 'Contains the bits and pieces behind robstoll\'s implementation' + - 'of the domain of Atrium as common module. You should only depend on this module if you are ' + - 'providing an implementation as well and want to reuse certain artifacts. ' + - 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' + 'of the domain of Atrium as common module. You should only depend on this module if you are ' + + 'providing an implementation as well and want to reuse certain artifacts. ' + + 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' dependencies { api prefixedProject('domain-builders-common') diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/assertions/composers/descriptiveWithFailureHint.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/assertions/composers/descriptiveWithFailureHint.kt index 43084e082..a826c80ac 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/assertions/composers/descriptiveWithFailureHint.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/assertions/composers/descriptiveWithFailureHint.kt @@ -19,7 +19,7 @@ fun _createDescriptiveWithFailureHint( true } return if (holds || !showHint()) { - AssertImpl.builder.createDescriptive(description, representation){ holds } + AssertImpl.builder.createDescriptive(description, representation) { holds } } else { AssertImpl.builder.fixedClaimGroup .withListType diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/creators/TypeTransformationAssertionCreator.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/creators/TypeTransformationAssertionCreator.kt index 266e92138..1addf0175 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/creators/TypeTransformationAssertionCreator.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/creators/TypeTransformationAssertionCreator.kt @@ -17,15 +17,17 @@ class TypeTransformationAssertionCreator : AnyTypeTransformati ) { val (description, representation, subjectPlant, assertionCreator) = parameterObject subjectPlant.maybeSubject - .filter { it != null && canBeTransformed(it) } + .filter { it != null && canBeTransformed(it) } .fold({ failureHandler.createAndAddAssertionToPlant(parameterObject) - }){ + }) { @Suppress("DEPRECATION") val plant = AssertImpl.changeSubject(subjectPlant) { transform(it as S) } - plant.addAssertion(AssertImpl.builder.descriptive - .holding - .withDescriptionAndRepresentation(description, representation) - .build()) + plant.addAssertion( + AssertImpl.builder.descriptive + .holding + .withDescriptionAndRepresentation(description, representation) + .build() + ) plant.addAssertionsCreatedBy(assertionCreator) } } diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandler.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandler.kt index c9917abdc..82081f47f 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandler.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandler.kt @@ -8,8 +8,8 @@ import ch.tutteli.atrium.reporting.translating.Translatable @Deprecated("will be removed with 1.0.0") class ExplanatoryFailureHandler : ExplanatoryFailureHandlerBase() { - override fun createFailingAssertion(description: Translatable, representation: Any) - = AssertImpl.builder.descriptive + override fun createFailingAssertion(description: Translatable, representation: Any) = + AssertImpl.builder.descriptive .failing .withDescriptionAndRepresentation(description, representation) .build() diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandlerBase.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandlerBase.kt index 0b4f9dd96..9e605d931 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandlerBase.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandlerBase.kt @@ -14,7 +14,9 @@ import ch.tutteli.atrium.reporting.translating.Translatable abstract class ExplanatoryFailureHandlerBase : AnyTypeTransformation.FailureHandler { override fun createAndAddAssertionToPlant(parameterObject: ParameterObject) { - val explanatoryAssertions = collectAssertions(parameterObject.warningTransformationFailed, parameterObject.assertionCreator) + val explanatoryAssertions = collectAssertions( + parameterObject.warningTransformationFailed, parameterObject.assertionCreator + ) val assertion = AssertImpl.builder.invisibleGroup .withAssertions( createFailingAssertion(parameterObject.description, parameterObject.representation), diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandlerWithHint.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandlerWithHint.kt index f92927e59..49901e15d 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandlerWithHint.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/any/typetransformation/failurehandlers/ExplanatoryFailureHandlerWithHint.kt @@ -15,9 +15,9 @@ class ExplanatoryFailureHandlerWithHint( override fun createFailingAssertion(description: Translatable, representation: Any): Assertion { val failingAssertion = AssertImpl.builder.descriptive - .failing - .withDescriptionAndRepresentation(description, representation) - .build() + .failing + .withDescriptionAndRepresentation(description, representation) + .build() return if (showHint()) { AssertImpl.builder.invisibleGroup .withAssertions(failingAssertion, failureHintFactory()) diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectionAssertionsDeprecated.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectionAssertionsDeprecated.kt index c17128baf..a2c5b0c0a 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectionAssertionsDeprecated.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectionAssertionsDeprecated.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.domain.robstoll.lib.creating import ch.tutteli.atrium.api.cc.en_GB.property diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectors/AssertionCollectorForExplanationImpl.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectors/AssertionCollectorForExplanationImpl.kt index a4fc462e5..7e407cdd8 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectors/AssertionCollectorForExplanationImpl.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectors/AssertionCollectorForExplanationImpl.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.domain.robstoll.lib.creating.collectors import ch.tutteli.atrium.assertions.Assertion diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectors/collectOrExplainDeprecated.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectors/collectOrExplainDeprecated.kt index 3ab356da8..5137ceefc 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectors/collectOrExplainDeprecated.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/collectors/collectOrExplainDeprecated.kt @@ -5,7 +5,7 @@ package ch.tutteli.atrium.domain.robstoll.lib.creating.collectors import ch.tutteli.atrium.assertions.AssertionGroup import ch.tutteli.atrium.creating.BaseAssertionPlant import ch.tutteli.atrium.creating.BaseCollectingAssertionPlant -import ch.tutteli.atrium.creating.MaybeSubject.* +import ch.tutteli.atrium.creating.MaybeSubject.Absent import ch.tutteli.atrium.domain.builders.AssertImpl import ch.tutteli.atrium.reporting.translating.Translatable diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/feature/extract/creators/FeatureExtractorCreatorImpl.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/feature/extract/creators/FeatureExtractorCreatorImpl.kt index 8f41ea88f..0e90a8b76 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/feature/extract/creators/FeatureExtractorCreatorImpl.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/feature/extract/creators/FeatureExtractorCreatorImpl.kt @@ -3,13 +3,13 @@ package ch.tutteli.atrium.domain.robstoll.lib.creating.feature.extract.creators import ch.tutteli.atrium.assertions.Assertion +import ch.tutteli.atrium.assertions.builders.fixedClaimGroup +import ch.tutteli.atrium.assertions.builders.partiallyFixedClaimGroup import ch.tutteli.atrium.assertions.builders.withExplanatoryAssertion import ch.tutteli.atrium.core.coreFactory import ch.tutteli.atrium.core.falseProvider import ch.tutteli.atrium.creating.* import ch.tutteli.atrium.domain.builders.AssertImpl -import ch.tutteli.atrium.assertions.builders.fixedClaimGroup -import ch.tutteli.atrium.assertions.builders.partiallyFixedClaimGroup import ch.tutteli.atrium.domain.creating.feature.extract.FeatureExtractor import ch.tutteli.atrium.reporting.RawString import ch.tutteli.atrium.reporting.SHOULD_NOT_BE_SHOWN_TO_THE_USER_BUG_TRANSLATABLE @@ -26,35 +26,41 @@ abstract class BaseFeatureExtractorCreator( +class FeatureExtractorCreatorImpl( featureRepresentation: Translatable, parameterObject: FeatureExtractor.ParameterObject ) : FeatureExtractor.Creator, @@ -109,7 +116,7 @@ class FeatureExtractorCreatorImpl( @Suppress("DEPRECATION") @Deprecated("use _extractFeature instead; will be removed with 1.0.0") -class FeatureExtractorCreatorNullableImpl( +class FeatureExtractorCreatorNullableImpl( featureRepresentation: Translatable, parameterObject: FeatureExtractor.ParameterObject ) : FeatureExtractor.CreatorNullable, diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InAnyOrderEntriesDeprecatedAssertionCreator.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InAnyOrderEntriesDeprecatedAssertionCreator.kt index 695665043..336568c68 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InAnyOrderEntriesDeprecatedAssertionCreator.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InAnyOrderEntriesDeprecatedAssertionCreator.kt @@ -43,10 +43,17 @@ class InAnyOrderEntriesDeprecatedAssertionCreator.() -> Unit)?, IterableContains.Checker>(searchBehaviour, checkers), IterableContains.Creator.() -> Unit)?> { - override fun searchAndCreateAssertion(subjectProvider: SubjectProvider, searchCriterion: (AssertionPlant.() -> Unit)?, featureFactory: (Int, Translatable) -> AssertionGroup): AssertionGroup { + override fun searchAndCreateAssertion( + subjectProvider: SubjectProvider, + searchCriterion: (AssertionPlant.() -> Unit)?, + featureFactory: (Int, Translatable) -> AssertionGroup + ): AssertionGroup { val iterable = subjectProvider.maybeSubject.getOrElse { emptyList() } val hasElementAssertion = createHasElementAssertion(iterable) - val (explanatoryAssertions, count) = createExplanatoryAssertionsAndMatchingCount(iterable.iterator(), searchCriterion) + val (explanatoryAssertions, count) = createExplanatoryAssertionsAndMatchingCount( + iterable.iterator(), + searchCriterion + ) val explanatoryGroup = AssertImpl.builder.explanatoryGroup .withDefaultType .withAssertions(explanatoryAssertions) @@ -68,14 +75,20 @@ class InAnyOrderEntriesDeprecatedAssertionCreator, assertionCreator: (AssertionPlant.() -> Unit)?): Pair, Int> { + private fun createExplanatoryAssertionsAndMatchingCount( + itr: Iterator, + assertionCreator: (AssertionPlant.() -> Unit)? + ): Pair, Int> { return if (itr.hasNext()) { val (firstNonNullOrNull, sequence) = getFirstNonNullAndSequence(itr, sequenceOf()) val group = collectIterableAssertionsForExplanationWithFirst(assertionCreator, firstNonNullOrNull) val count = sequence.count { allCreatedAssertionsHold(it, assertionCreator) } group to count } else { - val group = collectIterableAssertionsForExplanation(assertionCreator, ch.tutteli.atrium.creating.MaybeSubject.Absent) + val group = collectIterableAssertionsForExplanation( + assertionCreator, + ch.tutteli.atrium.creating.MaybeSubject.Absent + ) group to 0 } } diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InAnyOrderOnlyEntriesDeprecatedAssertionCreator.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InAnyOrderOnlyEntriesDeprecatedAssertionCreator.kt index 78952b1f5..8a4fac873 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InAnyOrderOnlyEntriesDeprecatedAssertionCreator.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InAnyOrderOnlyEntriesDeprecatedAssertionCreator.kt @@ -27,7 +27,10 @@ class InAnyOrderOnlyEntriesDeprecatedAssertionCreator.() -> Unit)?>(searchBehaviour) { - override fun createAssertionForSearchCriterionAndRemoveMatchFromList(searchCriterion: (AssertionPlant.() -> Unit)?, list: MutableList): Pair { + override fun createAssertionForSearchCriterionAndRemoveMatchFromList( + searchCriterion: (AssertionPlant.() -> Unit)?, + list: MutableList + ): Pair { @Suppress("DEPRECATION") val explanatoryAssertions = createExplanatoryAssertions(searchCriterion, list) val found = removeMatch(list, searchCriterion) diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyDeprecatedAssertionCreator.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyDeprecatedAssertionCreator.kt index ec2ea9f0c..ad770a025 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyDeprecatedAssertionCreator.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyDeprecatedAssertionCreator.kt @@ -32,16 +32,22 @@ abstract class InOrderOnlyDeprecatedAssertionCreator, SC>( private val searchBehaviour: InOrderOnlySearchBehaviour ) : IterableContains.Creator, //TODO use protected visibility once https://youtrack.jetbrains.com/issue/KT-24328 is implemented - InOrderOnlyDeprecatedMatcher -{ + InOrderOnlyDeprecatedMatcher { - final override fun createAssertionGroup(subjectProvider: SubjectProvider, searchCriteria: List): AssertionGroup { + final override fun createAssertionGroup( + subjectProvider: SubjectProvider, + searchCriteria: List + ): AssertionGroup { return LazyThreadUnsafeAssertionGroup { - val subject = subjectProvider.maybeSubject.fold({ emptyList()}){ it.toList() } + val subject = subjectProvider.maybeSubject.fold({ emptyList() }) { it.toList() } val assertion = AssertImpl.collector.collect({ subject }) { var index = 0 searchCriteria.forEachIndexed { currentIndex, searchCriterion -> - createSingleEntryAssertion(currentIndex, searchCriterion, DescriptionIterableAssertion.ENTRY_WITH_INDEX) + createSingleEntryAssertion( + currentIndex, + searchCriterion, + DescriptionIterableAssertion.ENTRY_WITH_INDEX + ) index = currentIndex } ++index diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyEntriesDeprecatedMatcher.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyEntriesDeprecatedMatcher.kt index ddddac44c..2bcee3543 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyEntriesDeprecatedMatcher.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyEntriesDeprecatedMatcher.kt @@ -8,10 +8,10 @@ import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.createEx @Suppress("DEPRECATION") @Deprecated("Switch from Assert to Expect and use InOrderOnlyEntriesMatcher; will be removed with 1.0.0") -class InOrderOnlyEntriesDeprecatedMatcher : InOrderOnlyDeprecatedMatcher.() -> Unit)?> { +class InOrderOnlyEntriesDeprecatedMatcher : InOrderOnlyDeprecatedMatcher.() -> Unit)?> { - override fun matches(actual: E?, searchCriterion: (AssertionPlant.() -> Unit)?): Boolean - = allCreatedAssertionsHold(actual, searchCriterion) + override fun matches(actual: E?, searchCriterion: (AssertionPlant.() -> Unit)?): Boolean = + allCreatedAssertionsHold(actual, searchCriterion) override fun entryAssertionCreator( subjectProvider: () -> List, diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyGroupedDeprecatedAssertionCreator.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyGroupedDeprecatedAssertionCreator.kt index 9d67fce9f..ddd3f1eea 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyGroupedDeprecatedAssertionCreator.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyGroupedDeprecatedAssertionCreator.kt @@ -27,7 +27,7 @@ abstract class InOrderOnlyGroupedDeprecatedAssertionCreator> ): AssertionGroup { return LazyThreadUnsafeAssertionGroup { - val subject = subjectProvider.maybeSubject.fold({emptyList()}){ it.toList() } + val subject = subjectProvider.maybeSubject.fold({ emptyList() }) { it.toList() } val assertion = AssertImpl.collector.collect({ subject }) { var index = 0 diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyGroupedEntriesDeprecatedAssertionCreator.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyGroupedEntriesDeprecatedAssertionCreator.kt index 920aa5ff4..f883914f0 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyGroupedEntriesDeprecatedAssertionCreator.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/InOrderOnlyGroupedEntriesDeprecatedAssertionCreator.kt @@ -13,11 +13,15 @@ import ch.tutteli.atrium.domain.creating.iterable.contains.searchbehaviours.InOr class InOrderOnlyGroupedEntriesDeprecatedAssertionCreator>( searchBehaviour: InOrderOnlyGroupedSearchBehaviour ) : InOrderOnlyGroupedDeprecatedAssertionCreator.() -> Unit)?>(searchBehaviour), - InOrderOnlyDeprecatedMatcher.() -> Unit)?> by InOrderOnlyEntriesDeprecatedMatcher() -{ + InOrderOnlyDeprecatedMatcher.() -> Unit)?> by InOrderOnlyEntriesDeprecatedMatcher() { override fun Assert>.createSublistAssertion(groupOfSearchCriteria: List<(AssertionPlant.() -> Unit)?>) { val inAnyOrderOnly = contains.inAnyOrder.only - addAssertion(AssertImpl.iterable.contains.entriesInAnyOrderOnlyWithAssert(inAnyOrderOnly, groupOfSearchCriteria)) + addAssertion( + AssertImpl.iterable.contains.entriesInAnyOrderOnlyWithAssert( + inAnyOrderOnly, + groupOfSearchCriteria + ) + ) } } diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/creatorsDeprecated.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/creatorsDeprecated.kt index 2d6b7a77e..45f908de7 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/creatorsDeprecated.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterable/contains/creators/creatorsDeprecated.kt @@ -15,15 +15,18 @@ import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.builders fun > _containsEntriesInAnyOrder( checkerOption: IterableContains.CheckerOption, assertionCreators: List<(AssertionPlant.() -> Unit)?> -): Assertion - = createAssertionGroup(checkerOption, assertionCreators, ::InAnyOrderEntriesDeprecatedAssertionCreator) +): Assertion = createAssertionGroup(checkerOption, assertionCreators, ::InAnyOrderEntriesDeprecatedAssertionCreator) fun > _containsEntriesInAnyOrderOnly( builder: IterableContains.Builder, assertionCreators: List<(AssertionPlant.() -> Unit)?> ): Assertion { val checkerBuilder = NoOpCheckerOption(builder) - return createAssertionGroupWithoutChecker(checkerBuilder, assertionCreators, ::InAnyOrderOnlyEntriesDeprecatedAssertionCreator) + return createAssertionGroupWithoutChecker( + checkerBuilder, + assertionCreators, + ::InAnyOrderOnlyEntriesDeprecatedAssertionCreator + ) } fun > _containsEntriesInOrderOnly( @@ -31,7 +34,11 @@ fun > _containsEntriesInOrderOnly( assertionCreators: List<(AssertionPlant.() -> Unit)?> ): Assertion { val checkerBuilder = NoOpCheckerOption(builder) - return createAssertionGroupWithoutChecker(checkerBuilder, assertionCreators, ::InOrderOnlyEntriesDeprecatedAssertionCreator) + return createAssertionGroupWithoutChecker( + checkerBuilder, + assertionCreators, + ::InOrderOnlyEntriesDeprecatedAssertionCreator + ) } fun > _containsEntriesInOrderOnlyGrouped( @@ -39,7 +46,11 @@ fun > _containsEntriesInOrderOnlyGrouped( groups: List.() -> Unit)?>> ): Assertion { val checkerBuilder = NoOpCheckerOption(builder) - return createAssertionGroupWithoutChecker(checkerBuilder, groups, ::InOrderOnlyGroupedEntriesDeprecatedAssertionCreator) + return createAssertionGroupWithoutChecker( + checkerBuilder, + groups, + ::InOrderOnlyGroupedEntriesDeprecatedAssertionCreator + ) } private fun , SC, S : IterableContains.SearchBehaviour> createAssertionGroupWithoutChecker( diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterableAssertionsDeprecated.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterableAssertionsDeprecated.kt index e982ef322..bb5d268c3 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterableAssertionsDeprecated.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/iterableAssertionsDeprecated.kt @@ -1,12 +1,13 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.domain.robstoll.lib.creating import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.assertions.AssertionGroup +import ch.tutteli.atrium.assertions.builders.fixedClaimGroup import ch.tutteli.atrium.assertions.builders.invisibleGroup import ch.tutteli.atrium.creating.AssertionPlant import ch.tutteli.atrium.domain.builders.AssertImpl -import ch.tutteli.atrium.assertions.builders.fixedClaimGroup import ch.tutteli.atrium.domain.robstoll.lib.assertions.LazyThreadUnsafeAssertionGroup import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.allCreatedAssertionsHold import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.createExplanatoryAssertions @@ -27,14 +28,16 @@ fun _iterableAll( assertions.add(createExplanatoryAssertionGroup(assertionCreator, list)) val mismatches = createMismatchAssertions(list, assertionCreator) - assertions.add(AssertImpl.builder.explanatoryGroup - .withWarningType - .withAssertion(AssertImpl.builder.list - .withDescriptionAndEmptyRepresentation(WARNING_MISMATCHES) - .withAssertions(mismatches) + assertions.add( + AssertImpl.builder.explanatoryGroup + .withWarningType + .withAssertion( + AssertImpl.builder.list + .withDescriptionAndEmptyRepresentation(WARNING_MISMATCHES) + .withAssertions(mismatches) + .build() + ) .build() - ) - .build() ) AssertImpl.builder.invisibleGroup diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/listAssertionsDeprecated.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/listAssertionsDeprecated.kt index adcedcbae..d504b4bc8 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/listAssertionsDeprecated.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/listAssertionsDeprecated.kt @@ -1,6 +1,7 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) @file:JvmMultifileClass @file:JvmName("ListAssertionsKt") + package ch.tutteli.atrium.domain.robstoll.lib.creating import ch.tutteli.atrium.assertions.Assertion diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/mapAssertionsDeprecated.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/mapAssertionsDeprecated.kt index 5e8579e49..93d723a09 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/mapAssertionsDeprecated.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/mapAssertionsDeprecated.kt @@ -17,7 +17,6 @@ import ch.tutteli.atrium.domain.robstoll.lib.assertions.LazyThreadUnsafeAssertio import ch.tutteli.atrium.reporting.RawString import ch.tutteli.atrium.reporting.translating.TranslatableWithArgs import ch.tutteli.atrium.translations.DescriptionBasic -import ch.tutteli.atrium.translations.DescriptionCollectionAssertion.EMPTY import ch.tutteli.atrium.translations.DescriptionMapAssertion import kotlin.jvm.JvmMultifileClass import kotlin.jvm.JvmName @@ -32,23 +31,27 @@ fun _contains( fun _containsKeyWithValueAssertion( plant: AssertionPlant>, keyValues: List.() -> Unit)?>> -): Assertion = containsNullable(plant, keyValues.map{ it }) { assertionCreator -> +): Assertion = containsNullable(plant, keyValues.map { it }) { assertionCreator -> // we can pretend that the subject is null if maybeSubject is None as we have to be in an explaining like context in such a case - val subjectIsNull = this.maybeSubject.fold({true}) { it == null } + val subjectIsNull = this.maybeSubject.fold({ true }) { it == null } if (assertionCreator != null && !subjectIsNull) { @Suppress("DEPRECATION" /* TODO switch to Expect */) ExpectImpl.changeSubject.unreported(this) { it as V }.assertionCreator() - } else if (subjectIsNull && assertionCreator == null){ + } else if (subjectIsNull && assertionCreator == null) { addAssertion(AssertImpl.builder.createDescriptive(DescriptionBasic.IS, RawString.NULL, trueProvider)) } else { - addAssertion(AssertImpl.builder.explanatoryGroup - .withDefaultType - .withAssertions(AssertImpl.collector.forExplanation.throwIfNoAssertionIsCollected.collect( - DescriptionMapAssertion.CANNOT_EVALUATE_KEY_DOES_NOT_EXIST, - MaybeSubject.Absent, - assertionCreator) - ) - .build()) + addAssertion( + AssertImpl.builder.explanatoryGroup + .withDefaultType + .withAssertions( + AssertImpl.collector.forExplanation.throwIfNoAssertionIsCollected.collect( + DescriptionMapAssertion.CANNOT_EVALUATE_KEY_DOES_NOT_EXIST, + MaybeSubject.Absent, + assertionCreator + ) + ) + .build() + ) } } @@ -62,11 +65,11 @@ private fun containsNullable( assertionCreator ) -private fun , C : BaseCollectingAssertionPlant> contains( +private fun , C : BaseCollectingAssertionPlant> contains( pairs: List>, @Suppress("DEPRECATION") parameterObjectOption: (FeatureExtractor.ParameterObjectOption, K) -> FeatureExtractor.CreatorLike, V, A, C>, assertionCreator: C.(M) -> Unit -): Assertion = LazyThreadUnsafeAssertionGroup { +): Assertion = LazyThreadUnsafeAssertionGroup { //TODO we should actually make MethodCallFormatter configurable in ReporterBuilder and then get it via AssertionPlant val methodCallFormatter = AssertImpl.coreFactory.newMethodCallFormatter() val assertions = pairs.map { (key: K, matcher: M) -> @@ -75,7 +78,7 @@ private fun , C : BaseCollectingAssertion TranslatableWithArgs(DescriptionMapAssertion.ENTRY_WITH_KEY, methodCallFormatter.formatArgument(key)) ) parameterObjectOption(option, key) - .extractAndAssertIt{ assertionCreator(matcher) } + .extractAndAssertIt { assertionCreator(matcher) } } AssertImpl.builder.list .withDescriptionAndEmptyRepresentation(DescriptionMapAssertion.CONTAINS_IN_ANY_ORDER) @@ -84,8 +87,8 @@ private fun , C : BaseCollectingAssertion } -fun _getExisting(plant: AssertionPlant>, key: K): AssertionPlant - = extractorForGetCall(key) +fun _getExisting(plant: AssertionPlant>, key: K): AssertionPlant = + extractorForGetCall(key) .withParameterObject(createGetParameterObject(plant, key)) .extract() @@ -97,8 +100,8 @@ fun _getExisting( .withParameterObject(createGetParameterObject(plant, key)) .extractAndAssertIt(assertionCreator) -fun _getExistingNullable(plant: AssertionPlant>, key: K): AssertionPlantNullable - = extractorForGetCall(key) +fun _getExistingNullable(plant: AssertionPlant>, key: K): AssertionPlantNullable = + extractorForGetCall(key) .withParameterObjectNullable(createGetParameterObject(plant, key)) .extract() @@ -123,7 +126,8 @@ private fun createGetParameterObject( warningCannotEvaluate = DescriptionMapAssertion.CANNOT_EVALUATE_KEY_DOES_NOT_EXIST, canBeExtracted = { it.containsKey(key) }, featureExtraction = { - @Suppress("UNCHECKED_CAST" + @Suppress( + "UNCHECKED_CAST" /* UNCHECKED_CAST is OK as this function will only be called if the key exists, so the value should be V One note though, if one deals with a Map returned by Java code and forgot that the Map actually contains diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/mapEntryAssertionsDeprecated.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/mapEntryAssertionsDeprecated.kt index 96e18decf..1fad0ac57 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/mapEntryAssertionsDeprecated.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/mapEntryAssertionsDeprecated.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.domain.robstoll.lib.creating import ch.tutteli.atrium.api.cc.en_GB.property @@ -17,20 +18,20 @@ fun _keyValue( addAssertion(AssertImpl.map.entry.value(this) { toBe(value) }) } -fun _key(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion - = AssertImpl.collector.collect(plant) { property(Map.Entry::key, assertionCreator) } +fun _key(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion = + AssertImpl.collector.collect(plant) { property(Map.Entry::key, assertionCreator) } -fun _value(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion - = AssertImpl.collector.collect(plant) { property(Map.Entry<*, V>::value, assertionCreator) } +fun _value( + plant: AssertionPlant>, + assertionCreator: AssertionPlant.() -> Unit +): Assertion = AssertImpl.collector.collect(plant) { property(Map.Entry<*, V>::value, assertionCreator) } fun _nullableKey( plant: AssertionPlant>, assertionCreator: AssertionPlantNullable.() -> Unit -): Assertion - = AssertImpl.collector.collect(plant) { property(Map.Entry::key).assertionCreator() } +): Assertion = AssertImpl.collector.collect(plant) { property(Map.Entry::key).assertionCreator() } fun _nullableValue( plant: AssertionPlant>, assertionCreator: AssertionPlantNullable.() -> Unit -): Assertion - = AssertImpl.collector.collect(plant) { property(Map.Entry<*, V>::value).assertionCreator() } +): Assertion = AssertImpl.collector.collect(plant) { property(Map.Entry<*, V>::value).assertionCreator() } diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/pairAssertionsDeprecated.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/pairAssertionsDeprecated.kt index 341552efb..fd666692c 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/pairAssertionsDeprecated.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/pairAssertionsDeprecated.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION" /* will be removed with 1.0.0 */) + package ch.tutteli.atrium.domain.robstoll.lib.creating import ch.tutteli.atrium.api.cc.en_GB.property @@ -7,20 +8,18 @@ import ch.tutteli.atrium.creating.AssertionPlant import ch.tutteli.atrium.creating.AssertionPlantNullable import ch.tutteli.atrium.domain.builders.AssertImpl -fun _first(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion - = AssertImpl.collector.collect(plant) { property(Pair::first, assertionCreator) } +fun _first(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion = + AssertImpl.collector.collect(plant) { property(Pair::first, assertionCreator) } -fun _second(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion - = AssertImpl.collector.collect(plant) { property(Pair<*, V>::second, assertionCreator) } +fun _second(plant: AssertionPlant>, assertionCreator: AssertionPlant.() -> Unit): Assertion = + AssertImpl.collector.collect(plant) { property(Pair<*, V>::second, assertionCreator) } fun _nullableFirst( plant: AssertionPlant>, assertionCreator: AssertionPlantNullable.() -> Unit -): Assertion - = AssertImpl.collector.collect(plant) { property(Pair::first).assertionCreator() } +): Assertion = AssertImpl.collector.collect(plant) { property(Pair::first).assertionCreator() } fun _nullableSecond( plant: AssertionPlant>, assertionCreator: AssertionPlantNullable.() -> Unit -): Assertion - = AssertImpl.collector.collect(plant) { property(Pair<*, V>::second).assertionCreator() } +): Assertion = AssertImpl.collector.collect(plant) { property(Pair<*, V>::second).assertionCreator() } diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/throwable/thrown/creators/ThrowableThrownAssertionCreator.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/throwable/thrown/creators/ThrowableThrownAssertionCreator.kt index cc3dce924..2c4693689 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/throwable/thrown/creators/ThrowableThrownAssertionCreator.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/throwable/thrown/creators/ThrowableThrownAssertionCreator.kt @@ -21,18 +21,24 @@ class ThrowableThrownAssertionCreator( private val absentThrowableMessageProvider: ThrowableThrown.AbsentThrowableMessageProvider ) : ThrowableThrown.Creator { - override fun executeActAssertNothingThrown(throwableThrownBuilder: ThrowableThrown.Builder){ + override fun executeActAssertNothingThrown(throwableThrownBuilder: ThrowableThrown.Builder) { val throwable: Throwable? = catchThrowableAndAdjust(throwableThrownBuilder) val subjectPlant = createReportingPlantForThrowable(throwableThrownBuilder, throwable) - if (throwable == null){ + if (throwable == null) { subjectPlant.addAssertion( - AssertImpl.builder.createDescriptive(IS_NOT_THROWN_1, RawString.create(IS_NOT_THROWN_2)) {true} + AssertImpl.builder.createDescriptive(IS_NOT_THROWN_1, RawString.create(IS_NOT_THROWN_2)) { true } ) } else { - val explainingAssertion = AssertImpl.any.typeTransformation.failureHandlers.newExplanatoryWithHint( - showHint = trueProvider, - failureHintFactory = { ThrowableThrownFailureHandler.propertiesOfException(throwable, maxStackTrace = 15) } - ).createFailingAssertion(IS_NOT_THROWN_1, RawString.create(IS_NOT_THROWN_2)) + val explainingAssertion = + AssertImpl.any.typeTransformation.failureHandlers.newExplanatoryWithHint( + showHint = trueProvider, + failureHintFactory = { + ThrowableThrownFailureHandler.propertiesOfException( + throwable, + maxStackTrace = 15 + ) + } + ).createFailingAssertion(IS_NOT_THROWN_1, RawString.create(IS_NOT_THROWN_2)) subjectPlant.addAssertion(explainingAssertion) } } diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-js/build.gradle b/domain/robstoll-lib/atrium-domain-robstoll-lib-js/build.gradle index d6b19a80c..cd7fa2123 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-js/build.gradle +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-js/build.gradle @@ -1,7 +1,7 @@ description = 'Contains the bits and pieces behind robstoll\'s implementation' + - 'of the domain of Atrium for the JS platform. You should only depend on this module if you are ' + - 'providing an implementation as well and want to reuse certain artifacts. ' + - 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' + 'of the domain of Atrium for the JS platform. You should only depend on this module if you are ' + + 'providing an implementation as well and want to reuse certain artifacts. ' + + 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' dependencies { api prefixedProject('domain-builders-js') diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/build.gradle b/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/build.gradle index de7758352..6512fb906 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/build.gradle +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/build.gradle @@ -1,7 +1,7 @@ description = 'Contains the bits and pieces behind robstoll\'s implementation' + - 'of the domain of Atrium for the JVM platform. You should only depend on this module if you are ' + - 'providing an implementation as well and want to reuse certain artifacts. ' + - 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' + 'of the domain of Atrium for the JVM platform. You should only depend on this module if you are ' + + 'providing an implementation as well and want to reuse certain artifacts. ' + + 'If you are a consumer of Atrium, then you should depend on atrium-domain-robstoll instead.' ext.jacoco_additional = [ prefixedProject('core-robstoll-jvm'), diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/floatingPointJvmAssertions.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/floatingPointJvmAssertions.kt index 4697a4955..c83e8fe6c 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/floatingPointJvmAssertions.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/lib/creating/floatingPointJvmAssertions.kt @@ -7,7 +7,11 @@ import ch.tutteli.atrium.assertions.Assertion import ch.tutteli.atrium.creating.SubjectProvider import java.math.BigDecimal -fun _toBeWithErrorTolerance(subjectProvider: SubjectProvider, expected: T, tolerance: T): Assertion { +fun _toBeWithErrorTolerance( + subjectProvider: SubjectProvider, + expected: T, + tolerance: T +): Assertion { val absDiff = { subject: BigDecimal -> (subject - expected).abs() } return toBeWithErrorTolerance(subjectProvider, expected, tolerance, absDiff) { subject -> listOf( diff --git a/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/src/test/kotlin/ch/tutteli/atrium/assertions/LazyThreadUnsafeAssertionGroupSpec.kt b/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/src/test/kotlin/ch/tutteli/atrium/assertions/LazyThreadUnsafeAssertionGroupSpec.kt index 1e4ee317b..f8170c4f6 100644 --- a/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/src/test/kotlin/ch/tutteli/atrium/assertions/LazyThreadUnsafeAssertionGroupSpec.kt +++ b/domain/robstoll-lib/atrium-domain-robstoll-lib-jvm/src/test/kotlin/ch/tutteli/atrium/assertions/LazyThreadUnsafeAssertionGroupSpec.kt @@ -2,9 +2,9 @@ package ch.tutteli.atrium.assertions import ch.tutteli.atrium.api.fluent.en_GB.containsExactly import ch.tutteli.atrium.api.fluent.en_GB.toBe +import ch.tutteli.atrium.api.verbs.internal.expect import ch.tutteli.atrium.domain.builders.AssertImpl import ch.tutteli.atrium.domain.robstoll.lib.assertions.LazyThreadUnsafeAssertionGroup -import ch.tutteli.atrium.api.verbs.internal.expect import org.jetbrains.spek.api.Spek import org.jetbrains.spek.api.dsl.describe import org.jetbrains.spek.api.dsl.it diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/CharSequenceAssertionsImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/CharSequenceAssertionsImpl.kt index 340883011..d62837354 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/CharSequenceAssertionsImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/CharSequenceAssertionsImpl.kt @@ -2,44 +2,33 @@ package ch.tutteli.atrium.domain.robstoll.creating import ch.tutteli.atrium.creating.SubjectProvider import ch.tutteli.atrium.domain.creating.CharSequenceAssertions -import ch.tutteli.atrium.domain.robstoll.lib.creating._containsBuilder -import ch.tutteli.atrium.domain.robstoll.lib.creating._containsNotBuilder -import ch.tutteli.atrium.domain.robstoll.lib.creating._endsNotWith -import ch.tutteli.atrium.domain.robstoll.lib.creating._endsWith -import ch.tutteli.atrium.domain.robstoll.lib.creating._isEmpty -import ch.tutteli.atrium.domain.robstoll.lib.creating._isNotBlank -import ch.tutteli.atrium.domain.robstoll.lib.creating._isNotEmpty -import ch.tutteli.atrium.domain.robstoll.lib.creating._startsNotWith -import ch.tutteli.atrium.domain.robstoll.lib.creating._startsWith +import ch.tutteli.atrium.domain.robstoll.lib.creating.* -class CharSequenceAssertionsImpl: CharSequenceAssertions { +class CharSequenceAssertionsImpl : CharSequenceAssertions { - override fun containsBuilder(subjectProvider: SubjectProvider) - = _containsBuilder(subjectProvider) + override fun containsBuilder(subjectProvider: SubjectProvider) = + _containsBuilder(subjectProvider) - override fun containsNotBuilder(subjectProvider: SubjectProvider) - = _containsNotBuilder(subjectProvider) + override fun containsNotBuilder(subjectProvider: SubjectProvider) = + _containsNotBuilder(subjectProvider) - override fun startsWith(subjectProvider: SubjectProvider, expected: CharSequence) - = _startsWith(subjectProvider, expected) + override fun startsWith(subjectProvider: SubjectProvider, expected: CharSequence) = + _startsWith(subjectProvider, expected) - override fun startsNotWith(subjectProvider: SubjectProvider, expected: CharSequence) - = _startsNotWith(subjectProvider, expected) + override fun startsNotWith(subjectProvider: SubjectProvider, expected: CharSequence) = + _startsNotWith(subjectProvider, expected) - override fun endsWith(subjectProvider: SubjectProvider, expected: CharSequence) - = _endsWith(subjectProvider, expected) + override fun endsWith(subjectProvider: SubjectProvider, expected: CharSequence) = + _endsWith(subjectProvider, expected) - override fun endsNotWith(subjectProvider: SubjectProvider, expected: CharSequence) - = _endsNotWith(subjectProvider, expected) + override fun endsNotWith(subjectProvider: SubjectProvider, expected: CharSequence) = + _endsNotWith(subjectProvider, expected) - override fun isEmpty(subjectProvider: SubjectProvider) - = _isEmpty(subjectProvider) + override fun isEmpty(subjectProvider: SubjectProvider) = _isEmpty(subjectProvider) - override fun isNotEmpty(subjectProvider: SubjectProvider) - = _isNotEmpty(subjectProvider) + override fun isNotEmpty(subjectProvider: SubjectProvider) = _isNotEmpty(subjectProvider) - override fun isNotBlank(subjectProvider: SubjectProvider) - = _isNotBlank(subjectProvider) + override fun isNotBlank(subjectProvider: SubjectProvider) = _isNotBlank(subjectProvider) } diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/ThrowableAssertionsImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/ThrowableAssertionsImpl.kt index a660bf14b..4dec5c5e2 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/ThrowableAssertionsImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/ThrowableAssertionsImpl.kt @@ -6,9 +6,12 @@ import ch.tutteli.atrium.domain.robstoll.lib.creating._thrownBuilder import ch.tutteli.atrium.reporting.Reporter import ch.tutteli.atrium.reporting.translating.Translatable -class ThrowableAssertionsImpl: ThrowableAssertions { +class ThrowableAssertionsImpl : ThrowableAssertions { - override fun thrownBuilder(assertionVerb: Translatable, act: () -> Unit, reporter: Reporter): ThrowableThrown.Builder - = _thrownBuilder(assertionVerb, act, reporter) + override fun thrownBuilder( + assertionVerb: Translatable, + act: () -> Unit, + reporter: Reporter + ): ThrowableThrown.Builder = _thrownBuilder(assertionVerb, act, reporter) } diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/any/typetransformation/creators/AnyTypeTransformationAssertionsImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/any/typetransformation/creators/AnyTypeTransformationAssertionsImpl.kt index af9219e89..dc647943a 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/any/typetransformation/creators/AnyTypeTransformationAssertionsImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/any/typetransformation/creators/AnyTypeTransformationAssertionsImpl.kt @@ -7,7 +7,10 @@ import ch.tutteli.atrium.creating.AssertionPlantNullable import ch.tutteli.atrium.creating.BaseAssertionPlant import ch.tutteli.atrium.domain.creating.any.typetransformation.AnyTypeTransformation import ch.tutteli.atrium.domain.creating.any.typetransformation.creators.AnyTypeTransformationAssertions -import ch.tutteli.atrium.domain.robstoll.lib.creating.any.typetransformation.creators.* +import ch.tutteli.atrium.domain.robstoll.lib.creating.any.typetransformation.creators._downCast +import ch.tutteli.atrium.domain.robstoll.lib.creating.any.typetransformation.creators._isA +import ch.tutteli.atrium.domain.robstoll.lib.creating.any.typetransformation.creators._isNotNull +import ch.tutteli.atrium.domain.robstoll.lib.creating.any.typetransformation.creators._typeTransformation import ch.tutteli.atrium.reporting.translating.Translatable import kotlin.reflect.KClass diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/any/typetransformation/failurehandlers/FailureHandlerFactoryImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/any/typetransformation/failurehandlers/FailureHandlerFactoryImpl.kt index bc947cb81..22e6fe554 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/any/typetransformation/failurehandlers/FailureHandlerFactoryImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/any/typetransformation/failurehandlers/FailureHandlerFactoryImpl.kt @@ -12,12 +12,11 @@ import ch.tutteli.atrium.domain.robstoll.lib.creating.any.typetransformation.fai @Deprecated("use _changeSubject or _extractFeature instead; will be removed with 1.0.0") class FailureHandlerFactoryImpl : FailureHandlerFactory { - override fun newExplanatory(): AnyTypeTransformation.FailureHandler - = ExplanatoryFailureHandler() + override fun newExplanatory(): AnyTypeTransformation.FailureHandler = + ExplanatoryFailureHandler() override fun newExplanatoryWithHint( showHint: () -> Boolean, failureHintFactory: () -> Assertion - ): AnyTypeTransformation.FailureHandler - = ExplanatoryFailureHandlerWithHint(showHint, failureHintFactory) + ): AnyTypeTransformation.FailureHandler = ExplanatoryFailureHandlerWithHint(showHint, failureHintFactory) } diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/charsequence/contains/creators/CharSequenceContainsAssertionsImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/charsequence/contains/creators/CharSequenceContainsAssertionsImpl.kt index d4d9281b7..8d1781559 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/charsequence/contains/creators/CharSequenceContainsAssertionsImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/charsequence/contains/creators/CharSequenceContainsAssertionsImpl.kt @@ -9,7 +9,7 @@ import ch.tutteli.atrium.domain.robstoll.lib.creating.charsequence.contains.crea import ch.tutteli.atrium.reporting.translating.Translatable -class CharSequenceContainsAssertionsImpl: CharSequenceContainsAssertions { +class CharSequenceContainsAssertionsImpl : CharSequenceContainsAssertions { override fun values( checkerOption: CharSequenceContains.CheckerOption, diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/charsequence/contains/searchbehaviours/SearchBehaviourFactoryImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/charsequence/contains/searchbehaviours/SearchBehaviourFactoryImpl.kt index e2317d9bd..bfb6d1ce3 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/charsequence/contains/searchbehaviours/SearchBehaviourFactoryImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/charsequence/contains/searchbehaviours/SearchBehaviourFactoryImpl.kt @@ -11,6 +11,5 @@ class SearchBehaviourFactoryImpl : SearchBehaviourFactory { override fun ignoringCase( containsBuilder: CharSequenceContains.Builder - ): CharSequenceContains.Builder - = _containsIgnoringCase(containsBuilder) + ): CharSequenceContains.Builder = _containsIgnoringCase(containsBuilder) } diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/feature/extract/creators/FeatureExtractorCreatorFactoryImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/feature/extract/creators/FeatureExtractorCreatorFactoryImpl.kt index 9198e3cc0..d13336d36 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/feature/extract/creators/FeatureExtractorCreatorFactoryImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/feature/extract/creators/FeatureExtractorCreatorFactoryImpl.kt @@ -9,19 +9,18 @@ import ch.tutteli.atrium.domain.robstoll.lib.creating.feature.extract.creators.F import ch.tutteli.atrium.reporting.translating.Translatable @Deprecated("use FeatureExtractorImpl instead; will be removed with 1.0.0") -class FeatureExtractorCreatorFactoryImpl: FeatureExtractorCreatorFactory { +class FeatureExtractorCreatorFactoryImpl : FeatureExtractorCreatorFactory { - override fun create( + override fun create( featureRepresentation: Translatable, parameterObject: FeatureExtractor.ParameterObject - ): FeatureExtractor.Creator - = FeatureExtractorCreatorImpl(featureRepresentation, parameterObject) + ): FeatureExtractor.Creator = FeatureExtractorCreatorImpl(featureRepresentation, parameterObject) override fun createNullable( featureRepresentation: Translatable, parameterObject: FeatureExtractor.ParameterObject - ): FeatureExtractor.CreatorNullable - = FeatureExtractorCreatorNullableImpl(featureRepresentation, parameterObject) + ): FeatureExtractor.CreatorNullable = + FeatureExtractorCreatorNullableImpl(featureRepresentation, parameterObject) } diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/iterable/contains/creators/IterableContainsAssertionsDeprecatedImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/iterable/contains/creators/IterableContainsAssertionsDeprecatedImpl.kt index 33ab36c1a..424346aae 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/iterable/contains/creators/IterableContainsAssertionsDeprecatedImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/iterable/contains/creators/IterableContainsAssertionsDeprecatedImpl.kt @@ -8,7 +8,10 @@ import ch.tutteli.atrium.domain.creating.iterable.contains.searchbehaviours.InAn import ch.tutteli.atrium.domain.creating.iterable.contains.searchbehaviours.InAnyOrderSearchBehaviour import ch.tutteli.atrium.domain.creating.iterable.contains.searchbehaviours.InOrderOnlyGroupedSearchBehaviour import ch.tutteli.atrium.domain.creating.iterable.contains.searchbehaviours.InOrderOnlySearchBehaviour -import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.creators.* +import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.creators._containsEntriesInAnyOrder +import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.creators._containsEntriesInAnyOrderOnly +import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.creators._containsEntriesInOrderOnly +import ch.tutteli.atrium.domain.robstoll.lib.creating.iterable.contains.creators._containsEntriesInOrderOnlyGrouped abstract class IterableContainsAssertionsDeprecatedImpl : IterableContainsAssertions { diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/iterable/contains/searchbehaviours/SearchBehaviourFactoryImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/iterable/contains/searchbehaviours/SearchBehaviourFactoryImpl.kt index bf8189a1c..e6fa17224 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/iterable/contains/searchbehaviours/SearchBehaviourFactoryImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/iterable/contains/searchbehaviours/SearchBehaviourFactoryImpl.kt @@ -9,31 +9,26 @@ class SearchBehaviourFactoryImpl : SearchBehaviourFactory { override fun > inAnyOrder( builder: IterableContains.Builder - ): IterableContains.Builder - = _containsInAnyOrder(builder) + ): IterableContains.Builder = _containsInAnyOrder(builder) override fun > inAnyOrderOnly( builder: IterableContains.Builder - ): IterableContains.Builder - = _containsInAnyOrderOnly(builder) + ): IterableContains.Builder = _containsInAnyOrderOnly(builder) override fun > inOrder( builder: IterableContains.Builder - ): IterableContains.Builder - = _containsInOrder(builder) + ): IterableContains.Builder = _containsInOrder(builder) override fun > inOrderOnly( builder: IterableContains.Builder - ): IterableContains.Builder - = _containsInOrderOnly(builder) + ): IterableContains.Builder = _containsInOrderOnly(builder) override fun > inOrderOnlyGrouped( builder: IterableContains.Builder - ): IterableContains.Builder - = _containsInOrderOnlyGrouped(builder) + ): IterableContains.Builder = _containsInOrderOnlyGrouped(builder) override fun > inOrderOnlyGroupedWithin( builder: IterableContains.Builder - ): IterableContains.Builder - = _containsInOrderOnlyGroupedWithing(builder) + ): IterableContains.Builder = + _containsInOrderOnlyGroupedWithing(builder) } diff --git a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/throwable/thrown/providers/AbsentThrowableMessageProviderFactoryImpl.kt b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/throwable/thrown/providers/AbsentThrowableMessageProviderFactoryImpl.kt index 526ad1811..2d0dabc2f 100644 --- a/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/throwable/thrown/providers/AbsentThrowableMessageProviderFactoryImpl.kt +++ b/domain/robstoll/atrium-domain-robstoll-common/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/creating/throwable/thrown/providers/AbsentThrowableMessageProviderFactoryImpl.kt @@ -10,6 +10,6 @@ import ch.tutteli.atrium.reporting.translating.Translatable @Deprecated("will be removed with 1.0.0") class AbsentThrowableMessageProviderFactoryImpl : AbsentThrowableMessageProviderFactory { - override fun translatableBased(translatable: Translatable): ThrowableThrown.AbsentThrowableMessageProvider - = _translatableBased(translatable) + override fun translatableBased(translatable: Translatable): ThrowableThrown.AbsentThrowableMessageProvider = + _translatableBased(translatable) } diff --git a/domain/robstoll/atrium-domain-robstoll-js/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/registerServices.kt b/domain/robstoll/atrium-domain-robstoll-js/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/registerServices.kt index 276510c99..3473df665 100644 --- a/domain/robstoll/atrium-domain-robstoll-js/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/registerServices.kt +++ b/domain/robstoll/atrium-domain-robstoll-js/src/main/kotlin/ch/tutteli/atrium/domain/robstoll/registerServices.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION") + package ch.tutteli.atrium.domain.robstoll import ch.tutteli.atrium.core.polyfills.registerService diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 000000000..7fc6f1ff2 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +kotlin.code.style=official diff --git a/misc/atrium-bc-test/build.gradle b/misc/atrium-bc-test/build.gradle index d5c28bd2b..bc020efc0 100644 --- a/misc/atrium-bc-test/build.gradle +++ b/misc/atrium-bc-test/build.gradle @@ -142,15 +142,15 @@ def createBcAndBbcTasks(String apiName, String oldVersion, String forgive) { } if (oldVersion == '0.6.0') { add(confCommon, prefixedProject("api-cc-en_UK")) { //required by atrium-spec - exclude group: '*' + exclude group: '*' } } else { - add(confCommon, prefixedProject("api-cc-en_GB-jvm")){ //required by atrium-spec - exclude group: '*' + add(confCommon, prefixedProject("api-cc-en_GB-jvm")) { //required by atrium-spec + exclude group: '*' } if (!apiName.endsWith('cc-de_CH')) { add(confCommon, prefixedProject("verbs-internal-jvm")) { //required by spec in the APIs - exclude group: '*' + exclude group: '*' } } } @@ -336,7 +336,7 @@ createBcAndBbcTasksForApis('0.8.0', //@formatter:on def apis = ['cc-de_CH', 'cc-en_GB', 'cc-infix-en_GB'] -apis.each {apiName -> +apis.each { apiName -> createFixSrcTask(apiName, '0.7.0', 'ArrayAsIterableAssertionsSpec.kt') { String content -> return content.replaceAll(/Assert>::asIterable.name/, '"asIterable"') } diff --git a/misc/atrium-bc-test/src/main/kotlin/ch/tutteli/atrium/spec/ForgivingTest.kt b/misc/atrium-bc-test/src/main/kotlin/ch/tutteli/atrium/spec/ForgivingTest.kt index 40447b9ea..56c04ca50 100644 --- a/misc/atrium-bc-test/src/main/kotlin/ch/tutteli/atrium/spec/ForgivingTest.kt +++ b/misc/atrium-bc-test/src/main/kotlin/ch/tutteli/atrium/spec/ForgivingTest.kt @@ -1,4 +1,3 @@ - package ch.tutteli.atrium.spec import org.jetbrains.spek.api.dsl.TestBody @@ -27,9 +26,9 @@ class ForgivingTest(private val test: Test) : test.body.invoke(object : TestBody {}) } catch (e: AssertionError) { println("forgiving $test") - } catch (@Suppress("DEPRECATION") e: ch.tutteli.atrium.creating.PlantHasNoSubjectException){ + } catch (@Suppress("DEPRECATION") e: ch.tutteli.atrium.creating.PlantHasNoSubjectException) { println("forgiving $test") - } catch(e: IllegalArgumentException){ + } catch (e: IllegalArgumentException) { println("forgiving $test") } return context diff --git a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesAssertionsSpec.kt b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesAssertionsSpec.kt index 33485b85c..9f39feef9 100644 --- a/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesAssertionsSpec.kt +++ b/misc/specs/atrium-specs-common/src/main/kotlin/ch/tutteli/atrium/specs/integration/IterableContainsNotValuesAssertionsSpec.kt @@ -1,6 +1,9 @@ package ch.tutteli.atrium.specs.integration -import ch.tutteli.atrium.api.fluent.en_GB.* +import ch.tutteli.atrium.api.fluent.en_GB.containsNot +import ch.tutteli.atrium.api.fluent.en_GB.containsRegex +import ch.tutteli.atrium.api.fluent.en_GB.message +import ch.tutteli.atrium.api.fluent.en_GB.toThrow import ch.tutteli.atrium.api.verbs.internal.expect import ch.tutteli.atrium.creating.Expect import ch.tutteli.atrium.specs.* diff --git a/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/dsl/GroupScope.kt b/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/dsl/GroupScope.kt index b3696c17a..717ed1f2e 100644 --- a/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/dsl/GroupScope.kt +++ b/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/dsl/GroupScope.kt @@ -1,4 +1,3 @@ package org.spekframework.spek2.dsl -interface GroupBody { -} +interface GroupBody diff --git a/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/dsl/Root.kt b/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/dsl/Root.kt index b657a2148..a5f538b30 100644 --- a/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/dsl/Root.kt +++ b/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/dsl/Root.kt @@ -3,6 +3,7 @@ package org.spekframework.spek2.dsl import org.spekframework.spek2.lifecycle.CachingMode import org.spekframework.spek2.style.specification.MemoizedValue -interface Root: GroupBody { - fun memoized(mode: CachingMode = CachingMode.EACH_GROUP, body: () -> T): MemoizedValue = throw IllegalStateException("not implemented") +interface Root : GroupBody { + fun memoized(mode: CachingMode = CachingMode.EACH_GROUP, body: () -> T): MemoizedValue = + throw IllegalStateException("not implemented") } diff --git a/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/style/specification/describe.kt b/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/style/specification/describe.kt index 3036f7e1a..4b4e9e0d4 100644 --- a/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/style/specification/describe.kt +++ b/misc/specs/atrium-specs-js/src/main/kotlin/org/spekframework/spek2/style/specification/describe.kt @@ -11,10 +11,10 @@ interface MemoizedValue { operator fun provideDelegate(thisRef: Any?, property: KProperty<*>): ReadOnlyProperty } -interface Suite{ - fun it(description: String, body: Suite.() -> Unit){} - fun context(description: String, body: Suite.() -> Unit){} - fun beforeEachTest(body: Suite.() -> Unit){} +interface Suite { + fun it(description: String, body: Suite.() -> Unit) {} + fun context(description: String, body: Suite.() -> Unit) {} + fun beforeEachTest(body: Suite.() -> Unit) {} } -fun GroupBody.describe(description: String, body: Suite.() -> Unit){} +fun GroupBody.describe(description: String, body: Suite.() -> Unit) {} diff --git a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/reporting/translating/TranslatorIntSpec.kt b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/reporting/translating/TranslatorIntSpec.kt index e97a7a362..1e586fbe8 100644 --- a/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/reporting/translating/TranslatorIntSpec.kt +++ b/misc/specs/atrium-specs-jvm/src/main/kotlin/ch/tutteli/atrium/specs/reporting/translating/TranslatorIntSpec.kt @@ -230,7 +230,7 @@ abstract class TranslatorIntSpec( } prefixedDescribe("primary locale is 'de_CH', fallback is 'fr' and then 'it'") { - context("properties file for ${AssertionVerb::class.simpleName} is not provided for 'de_CH' nor one of its parents"){ + context("properties file for ${AssertionVerb::class.simpleName} is not provided for 'de_CH' nor one of its parents") { describe("translation for $descriptionComparableAssertion.${DescriptionComparableAssertion.IS_LESS_THAN} is not provided for 'fr' nor for 'it'") { it("throws an AssertionError which message contains the default of $descriptionComparableAssertion.${DescriptionComparableAssertion.IS_LESS_THAN}") { expect { diff --git a/misc/verbs-internal/atrium-verbs-internal-common/src/main/kotlin/ch/tutteli/atrium/verbs/internal/atriumVerbs.kt b/misc/verbs-internal/atrium-verbs-internal-common/src/main/kotlin/ch/tutteli/atrium/verbs/internal/atriumVerbs.kt index c94b8d6ed..62fbf4588 100644 --- a/misc/verbs-internal/atrium-verbs-internal-common/src/main/kotlin/ch/tutteli/atrium/verbs/internal/atriumVerbs.kt +++ b/misc/verbs-internal/atrium-verbs-internal-common/src/main/kotlin/ch/tutteli/atrium/verbs/internal/atriumVerbs.kt @@ -11,19 +11,22 @@ import ch.tutteli.atrium.reporting.reporter import ch.tutteli.atrium.reporting.translating.StringBasedTranslatable @Suppress("DEPRECATION") -fun assert(subject: T) - = AssertImpl.coreFactory.newReportingPlant(AssertionVerb.ASSERT, { subject }, reporter) +fun assert(subject: T) = AssertImpl.coreFactory.newReportingPlant(AssertionVerb.ASSERT, { subject }, reporter) @Suppress("DEPRECATION") -fun assert(subject: T, assertionCreator: Assert.() -> Unit) - = AssertImpl.coreFactory.newReportingPlantAndAddAssertionsCreatedBy(AssertionVerb.ASSERT, { subject }, reporter, assertionCreator) +fun assert(subject: T, assertionCreator: Assert.() -> Unit) = + AssertImpl.coreFactory.newReportingPlantAndAddAssertionsCreatedBy( + AssertionVerb.ASSERT, + { subject }, + reporter, + assertionCreator + ) @Suppress("DEPRECATION") -fun assert(subject: T) - = AssertImpl.coreFactory.newReportingPlantNullable(AssertionVerb.ASSERT, { subject }, reporter) +fun assert(subject: T) = + AssertImpl.coreFactory.newReportingPlantNullable(AssertionVerb.ASSERT, { subject }, reporter) -fun expect(act: () -> Unit) - = AssertImpl.throwable.thrownBuilder(AssertionVerb.EXPECT_THROWN, act, reporter) +fun expect(act: () -> Unit) = AssertImpl.throwable.thrownBuilder(AssertionVerb.EXPECT_THROWN, act, reporter) enum class AssertionVerb(override val value: String) : StringBasedTranslatable { ASSERT("assert"), @@ -54,7 +57,8 @@ class NoAdjustingReporterFactory : ReporterFactory { .withOnlyFailureReporter() .build() } + companion object { - const val ID = "default-no-adjusting" + const val ID = "default-no-adjusting" } } diff --git a/misc/verbs-internal/atrium-verbs-internal-js/src/main/kotlin/ch/tutteli/atrium/verbs/internal/registerServices.kt b/misc/verbs-internal/atrium-verbs-internal-js/src/main/kotlin/ch/tutteli/atrium/verbs/internal/registerServices.kt index 731f2adec..7ee6f1658 100644 --- a/misc/verbs-internal/atrium-verbs-internal-js/src/main/kotlin/ch/tutteli/atrium/verbs/internal/registerServices.kt +++ b/misc/verbs-internal/atrium-verbs-internal-js/src/main/kotlin/ch/tutteli/atrium/verbs/internal/registerServices.kt @@ -1,4 +1,5 @@ @file:Suppress("DEPRECATION") + package ch.tutteli.atrium.verbs.internal import ch.tutteli.atrium.core.polyfills.registerService diff --git a/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionAnyAssertion.kt b/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionAnyAssertion.kt index fa7281b77..91c76d9a1 100644 --- a/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionAnyAssertion.kt +++ b/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionAnyAssertion.kt @@ -7,9 +7,15 @@ import ch.tutteli.atrium.reporting.translating.StringBasedTranslatable * Contains the [DescriptiveAssertion.description]s of the assertion functions which are applicable to [Any]. */ enum class DescriptionAnyAssertion(override val value: String) : StringBasedTranslatable { - @Deprecated("Will be removed in version 1.0.0.", ReplaceWith("DescriptionBasic.TO_BE", imports = ["ch.tutteli.atrium.translations.DescriptionBasic"])) + @Deprecated( + "Will be removed in version 1.0.0.", + ReplaceWith("DescriptionBasic.TO_BE", imports = ["ch.tutteli.atrium.translations.DescriptionBasic"]) + ) TO_BE(DescriptionBasic.TO_BE.value), - @Deprecated("Will be removed in version 1.0.0.", ReplaceWith("DescriptionBasic.NOT_TO_BE", imports = ["ch.tutteli.atrium.translations.DescriptionBasic"])) + @Deprecated( + "Will be removed in version 1.0.0.", + ReplaceWith("DescriptionBasic.NOT_TO_BE", imports = ["ch.tutteli.atrium.translations.DescriptionBasic"]) + ) NOT_TO_BE(DescriptionBasic.NOT_TO_BE.value), IS_A("ist eine Instanz vom Typ"), IS_SAME("ist dieselbe Instanz wie"), diff --git a/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionIterableAssertion.kt b/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionIterableAssertion.kt index 1d0d8bcc9..d7c3ecd7b 100644 --- a/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionIterableAssertion.kt +++ b/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionIterableAssertion.kt @@ -33,5 +33,7 @@ enum class DescriptionIterableAssertion(override val value: String) : StringBase WARNING_MISMATCHES_ADDITIONAL_ENTRIES("Diskrepanzen und zusätzliche Einträge entdeckt"), } -internal const val COULD_NOT_EVALUATE_DEFINED_ASSERTIONS = "Konnte die zusätzlichen Aussagen (Assertions) nicht auswerten" -internal const val VISIT_COULD_NOT_EVALUATE_ASSERTIONS = "Besuchen Sie die folgende Website für weiterführende Informationen (in Englisch): https://docs.atriumlib.org/could-not-evaluate-assertions" +internal const val COULD_NOT_EVALUATE_DEFINED_ASSERTIONS = + "Konnte die zusätzlichen Aussagen (Assertions) nicht auswerten" +internal const val VISIT_COULD_NOT_EVALUATE_ASSERTIONS = + "Besuchen Sie die folgende Website für weiterführende Informationen (in Englisch): https://docs.atriumlib.org/could-not-evaluate-assertions" diff --git a/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionThrowableAssertion.kt b/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionThrowableAssertion.kt index 6b2ca83b6..17c364e95 100644 --- a/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionThrowableAssertion.kt +++ b/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionThrowableAssertion.kt @@ -7,7 +7,10 @@ import ch.tutteli.atrium.reporting.translating.StringBasedTranslatable * Contains the [DescriptiveAssertion.description]s of the assertion functions which are applicable to [Throwable]. */ enum class DescriptionThrowableAssertion(override val value: String) : StringBasedTranslatable { - @Deprecated("use DescriptionAnyAssertion.IS_A; will be removed with 1.0.0", ReplaceWith("ch.tutteli.atrium.translations.DescriptionAnyAssertion.IS_A")) + @Deprecated( + "use DescriptionAnyAssertion.IS_A; will be removed with 1.0.0", + ReplaceWith("ch.tutteli.atrium.translations.DescriptionAnyAssertion.IS_A") + ) IS_A("ist eine"), NO_EXCEPTION_OCCURRED("keine Exception wurde geworfen"), OCCURRED_EXCEPTION_CAUSE("cause"), diff --git a/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionTypeTransformationAssertion.kt b/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionTypeTransformationAssertion.kt index a8bea63d9..c604a5c91 100644 --- a/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionTypeTransformationAssertion.kt +++ b/translations/de_CH/atrium-translations-de_CH-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionTypeTransformationAssertion.kt @@ -11,7 +11,13 @@ import ch.tutteli.atrium.reporting.translating.StringBasedTranslatable @Suppress("DEPRECATION") @Deprecated("Use DescriptionAnyAssertion instead; will be removed with 1.0.0") enum class DescriptionTypeTransformationAssertion(override val value: String) : StringBasedTranslatable { - @Deprecated("Use DescriptionAnyAssertion", ReplaceWith("DescriptionAnyAssertion.IS_INSTANCE_OF_TYPE", "ch.tutteli.atrium.translations.DescriptionAnyAssertion")) + @Deprecated( + "Use DescriptionAnyAssertion", + ReplaceWith( + "DescriptionAnyAssertion.IS_INSTANCE_OF_TYPE", + "ch.tutteli.atrium.translations.DescriptionAnyAssertion" + ) + ) IS_A("ist vom Typ oder ein Subtyp von"), WARNING_DOWN_CAST_FAILED("$COULD_NOT_EVALUATE_DEFINED_ASSERTIONS -- down-cast zu %s schlug fehl.\n$VISIT_COULD_NOT_EVALUATE_ASSERTIONS"), } diff --git a/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionAnyAssertion.kt b/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionAnyAssertion.kt index a3e82bf34..587149d40 100644 --- a/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionAnyAssertion.kt +++ b/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionAnyAssertion.kt @@ -7,9 +7,15 @@ import ch.tutteli.atrium.reporting.translating.StringBasedTranslatable * Contains the [DescriptiveAssertion.description]s of the assertion functions which are applicable to [Any]. */ enum class DescriptionAnyAssertion(override val value: String) : StringBasedTranslatable { - @Deprecated("Will be removed in version 1.0.0.", ReplaceWith("DescriptionBasic.TO_BE", imports = ["ch.tutteli.atrium.translations.DescriptionBasic"])) + @Deprecated( + "Will be removed in version 1.0.0.", + ReplaceWith("DescriptionBasic.TO_BE", imports = ["ch.tutteli.atrium.translations.DescriptionBasic"]) + ) TO_BE(DescriptionBasic.TO_BE.value), - @Deprecated("Will be removed in version 1.0.0.", ReplaceWith("DescriptionBasic.NOT_TO_BE", imports = ["ch.tutteli.atrium.translations.DescriptionBasic"])) + @Deprecated( + "Will be removed in version 1.0.0.", + ReplaceWith("DescriptionBasic.NOT_TO_BE", imports = ["ch.tutteli.atrium.translations.DescriptionBasic"]) + ) NOT_TO_BE(DescriptionBasic.NOT_TO_BE.value), IS_A("is instance of type"), IS_SAME("is the same as"), diff --git a/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionIterableAssertion.kt b/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionIterableAssertion.kt index 0030c8d90..ff9f66693 100644 --- a/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionIterableAssertion.kt +++ b/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionIterableAssertion.kt @@ -34,4 +34,5 @@ enum class DescriptionIterableAssertion(override val value: String) : StringBase } internal const val COULD_NOT_EVALUATE_DEFINED_ASSERTIONS = "Could not evaluate the defined assertion(s)" -internal const val VISIT_COULD_NOT_EVALUATE_ASSERTIONS = "Visit the following site for an explanation: https://docs.atriumlib.org/could-not-evaluate-assertions" +internal const val VISIT_COULD_NOT_EVALUATE_ASSERTIONS = + "Visit the following site for an explanation: https://docs.atriumlib.org/could-not-evaluate-assertions" diff --git a/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionThrowableAssertion.kt b/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionThrowableAssertion.kt index a136a4a68..18420a256 100644 --- a/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionThrowableAssertion.kt +++ b/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionThrowableAssertion.kt @@ -7,7 +7,10 @@ import ch.tutteli.atrium.reporting.translating.StringBasedTranslatable * Contains the [DescriptiveAssertion.description]s of the assertion functions which are applicable to [Throwable]. */ enum class DescriptionThrowableAssertion(override val value: String) : StringBasedTranslatable { - @Deprecated("use DescriptionAnyAssertion.IS_A; will be removed with 1.0.0", ReplaceWith("ch.tutteli.atrium.translations.DescriptionAnyAssertion.IS_A")) + @Deprecated( + "use DescriptionAnyAssertion.IS_A; will be removed with 1.0.0", + ReplaceWith("ch.tutteli.atrium.translations.DescriptionAnyAssertion.IS_A") + ) IS_A("is a"), NO_EXCEPTION_OCCURRED("no exception occurred"), OCCURRED_EXCEPTION_CAUSE("cause"), diff --git a/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionTypeTransformationAssertion.kt b/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionTypeTransformationAssertion.kt index d5ba24e57..790b25529 100644 --- a/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionTypeTransformationAssertion.kt +++ b/translations/en_GB/atrium-translations-en_GB-common/src/main/kotlin/ch/tutteli/atrium/translations/DescriptionTypeTransformationAssertion.kt @@ -11,7 +11,10 @@ import ch.tutteli.atrium.reporting.translating.StringBasedTranslatable @Suppress("DEPRECATION") @Deprecated("Use DescriptionAnyAssertion instead; will be removed with 1.0.0") enum class DescriptionTypeTransformationAssertion(override val value: String) : StringBasedTranslatable { - @Deprecated("Use DescriptionAnyAssertion", ReplaceWith("DescriptionAnyAssertion.IS_A", "ch.tutteli.atrium.translations.DescriptionAnyAssertion")) + @Deprecated( + "Use DescriptionAnyAssertion", + ReplaceWith("DescriptionAnyAssertion.IS_A", "ch.tutteli.atrium.translations.DescriptionAnyAssertion") + ) IS_A("is type or sub-type of"), WARNING_DOWN_CAST_FAILED("$COULD_NOT_EVALUATE_DEFINED_ASSERTIONS -- the down-cast to %s failed.\n$VISIT_COULD_NOT_EVALUATE_ASSERTIONS"), }