You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2019/09/24 23:31:35 UTC
[isis] 05/07: ISIS-2062: refactors testing guides, include partials
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch v2
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 784208bbc29fe916a08f4ccadbc5a2a6bfbda5a3
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Sep 24 23:36:06 2019 +0100
ISIS-2062: refactors testing guides, include partials
---
.../toc/modules/devguide/pages/ide/intellij.adoc | 3 +-
.../pages/classes/AppManifest-bootstrapping.adoc | 2 +-
.../pages/classes/AppManifest2-bootstrapping.adoc | 2 +-
.../application-layer-api/WrapperFactory.adoc | 2 +-
.../apache-isis-vs/mvc-server-side.adoc | 2 +-
core/testsupport/_adoc/modules/ROOT/nav.adoc | 32 ----------------------
.../_adoc/modules/ROOT/pages/bdd-spec-support.adoc | 3 ++
.../ROOT/pages/bdd-spec-support/how-it-works.adoc | 1 +
.../bdd-spec-support/maven-configuration.adoc | 1 +
.../pages/bdd-spec-support/writing-a-bdd-spec.adoc | 1 +
.../_adoc/modules/ROOT/pages/fixture-scripts.adoc | 6 ++++
.../ROOT/pages/fixture-scripts/api-and-usage.adoc | 1 +
.../ROOT/pages/fixture-scripts/sudo-service.adoc | 1 +
.../fixture-scripts/ticking-clock-fixture.adoc | 1 +
.../modules/ROOT/pages/integ-test-support.adoc | 6 ++++
.../pages/integ-test-support/abstract-class.adoc | 7 +++--
.../pages/integ-test-support/bootstrapping.adoc | 1 +
.../configuration-properties.adoc | 1 +
.../integ-test-support/maven-configuration.adoc | 1 +
.../pages/integ-test-support/typical-usage.adoc | 1 +
.../pages/integ-test-support/wrapper-factory.adoc | 1 +
.../_adoc/modules/ROOT/pages/overview.adoc | 4 +--
.../modules/ROOT/pages/unit-test-support.adoc | 8 ++++--
.../pages/unit-test-support/contract-tests.adoc | 1 +
.../pages/unit-test-support/jmock-extensions.adoc | 1 +
.../unit-test-support/maven-configuration.adoc | 1 +
.../soap-fake-server-junit-rule.adoc | 1 +
27 files changed, 47 insertions(+), 45 deletions(-)
diff --git a/antora/components/toc/modules/devguide/pages/ide/intellij.adoc b/antora/components/toc/modules/devguide/pages/ide/intellij.adoc
index c65a8d3..a77dc2c 100644
--- a/antora/components/toc/modules/devguide/pages/ide/intellij.adoc
+++ b/antora/components/toc/modules/devguide/pages/ide/intellij.adoc
@@ -247,7 +247,8 @@ Confirm that it's ok to ignore these modules:
.IntelliJ Maven Module Management - Ignoring Modules (ctd)
image::intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png[width="300px",link="{imagesdir}/intellij-idea/100-maven-module-mgmt/050-ignoring-modules-2.png"]
-All being well you should see that the _Projects_ window now only contains the code you are working on. Its classpath dependencies will be adjusted (eg to resolve to Apache Isis core from `.m2/repository`):
+All being well you should see that the _Projects_ window now only contains the code you are working on.
+Its classpath dependencies will be adjusted (eg to resolve to Apache Isis core from `.m2/repository`):
.IntelliJ Maven Module Management - Updated Projects Window
image::intellij-idea/100-maven-module-mgmt/060-ignored-modules.png[width="730px",link="{imagesdir}/intellij-idea/100-maven-module-mgmt/060-ignored-modules.png"]
diff --git a/core/_adoc-rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc b/core/_adoc-rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
index f4cc797..e354413 100644
--- a/core/_adoc-rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
+++ b/core/_adoc-rg/modules/cms/pages/classes/AppManifest-bootstrapping.adoc
@@ -221,7 +221,7 @@ java org.apache.isis.WebServer -m com.mycompany.myapp.MyAppAppManifestWithFixtur
* the third case is within an integration test. +
+
-The code to boostrap an integration test is shown in the xref:testing:ROOT:integ-test-support/bootstrapping.adoc[testing guide], but once again an `AppManifest` is required.
+The code to boostrap an integration test is shown in the xref:testing:ROOT:integ-test-support.adoc#bootstrapping[testing guide], but once again an `AppManifest` is required.
In some cases an integration test uses the exact same `AppManifest` as the regular webapp.
Sometimes though it is necessary to "tweak" the `AppManifest`:
diff --git a/core/_adoc-rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc b/core/_adoc-rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
index 4c1b523..bfc4f5c 100644
--- a/core/_adoc-rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
+++ b/core/_adoc-rg/modules/cms/pages/classes/AppManifest2-bootstrapping.adoc
@@ -185,6 +185,6 @@ The `AppManifest` implementation must (necessarily) reference all the modules wt
(As noted above), the `IntegrationTestAbstract3` adapter class is bootstrapped from a `Module` rather than an `AppManifest`.
This therefore allows the integration tests to reside alongside the module that they exercise, and to bootstrap only the subset of the application required (that is, the module being tested and any of its transitive dependencies)..
-For more on `IntegrationTestAbstract3`, see the xref:testing:ROOT:integ-test-support/bootstrapping.adoc[testing user guide].
+For more on `IntegrationTestAbstract3`, see the xref:testing:ROOT:integ-test-support.adoc#bootstrapping[testing user guide].
diff --git a/core/_adoc-rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc b/core/_adoc-rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
index 75aa92e..b8cf76a 100644
--- a/core/_adoc-rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
+++ b/core/_adoc-rg/modules/svc/pages/application-layer-api/WrapperFactory.adoc
@@ -15,7 +15,7 @@ Said another way: interactions are performed "as if" they are through the viewer
[NOTE]
====
-For a discussion of the use of the `WrapperFactory` within integration tests (the primary or at least original use case for this service) can be found xref:testing:ROOT:integ-test-support/wrapper-factory.adoc[here]
+For a discussion of the use of the `WrapperFactory` within integration tests (the primary or at least original use case for this service) can be found xref:testing:ROOT:integ-test-support.adoc#wrapper-factory[here]
====
This capability goes beyond enforcing the (imperative) constraints within the `hideXxx()`, `disableXxx()` and `validateXxx()` supporting methods; it also enforces (declarative) constraints such as those represented by annotations, eg `@Parameter(maxLength=...)` or `@Property(mustSatisfy=...)`.
diff --git a/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
index 396bd0d..8ee0e3e 100644
--- a/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
+++ b/core/_adoc-ug/modules/fun/pages/core-concepts/apache-isis-vs/mvc-server-side.adoc
@@ -25,5 +25,5 @@ Again, these addons can be plugged into any Isis app.
In terms of testing support, each of these other frameworks provide mechanisms to allow the webapp to be tested from within a JUnit test harness.
Apache Isis' support is similar.
Where Apache Isis differs though is that it enables end-to-end testing without the need for slow and fragile Selenium tests.
-Instead, Apache Isis provides a "xref:testing:ROOT:integ-test-support/wrapper-factory.adoc[WrapperFactory]" domain service that allows the generic UI provided to in essence be simulated.
+Instead, Apache Isis provides a "xref:testing:ROOT:integ-test-support.adoc#wrapper-factory[WrapperFactory]" domain service that allows the generic UI provided to in essence be simulated.
On a more pragmatic level, the link:https://platform.incode.org[Incode Platform^]'s fakedata module does "what it says on the tin", allowing both unit- and integration-tests to focus on the salient data and fake out the rest.
diff --git a/core/testsupport/_adoc/modules/ROOT/nav.adoc b/core/testsupport/_adoc/modules/ROOT/nav.adoc
index 8516a1c..57aee1a 100644
--- a/core/testsupport/_adoc/modules/ROOT/nav.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/nav.adoc
@@ -1,39 +1,7 @@
* xref:about.adoc[Testing]
-
** xref:overview.adoc[Overview]
-
-
-
** xref:unit-test-support.adoc[Unit Test Support]
-*** xref:unit-test-support/contract-tests.adoc[Contract Tests]
-*** xref:unit-test-support/jmock-extensions.adoc[JMock Extensions]
-*** xref:unit-test-support/soap-fake-server-rule.adoc[SOAP Fake Server Rule]
-*** xref:unit-test-support/maven-configuration.adoc[Maven Configuration]
-
-
-
** xref:integ-test-support.adoc[Integ Test Support]
-*** xref:integ-test-support/typical-usage.adoc[Typical Usage]
-*** xref:integ-test-support/bootstrapping.adoc[Bootstrapping]
-*** xref:integ-test-support/abstract-class.adoc[Abstract Class]
-*** xref:integ-test-support/configuration-properties.adoc[Configuration Properties]
-*** xref:integ-test-support/wrapper-factory.adoc[Wrapper Factory]
-*** xref:integ-test-support/maven-configuration.adoc[Maven Configuration]
-
-
-
** xref:bdd-spec-support.adoc[BDD Spec Support]
-*** xref:bdd-spec-support/how-it-works.adoc[How it Works]
-*** xref:bdd-spec-support/writing-a-bdd-spec.adoc[Writing a BDD Spec]
-*** xref:bdd-spec-support/maven-configuration.adoc[Maven Configuration]
-
-
-
** xref:fixture-scripts.adoc[Fixture Scripts]
-*** xref:fixture-scripts/api-and-usage.adoc[API and Usage]
-*** xref:fixture-scripts/ticking-clock-fixture.adoc[Ticking Clock Fixture]
-*** xref:fixture-scripts/sudo-service.adoc[Sudo Service]
-
-
-
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support.adoc
index 818e0fd..cde0219 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support.adoc
@@ -12,3 +12,6 @@ There are many BDD tools out there; Apache Isis provides an integration with lin
+include::bdd-spec-support/how-it-works.adoc[leveloffset=+1]
+include::bdd-spec-support/writing-a-bdd-spec.adoc[leveloffset=+1]
+include::bdd-spec-support/maven-configuration.adoc[leveloffset=+1]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc
index cea6e6c..24ed4af 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/how-it-works.adoc
@@ -1,3 +1,4 @@
+[[how-it-works]]
= How it works
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc
index b623270..dd472d7 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/maven-configuration.adoc
@@ -1,3 +1,4 @@
+[[maven-configuration]]
= Maven Configuration
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc
index 294bd65..4e05dde 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/bdd-spec-support/writing-a-bdd-spec.adoc
@@ -1,3 +1,4 @@
+[[writing-a-bdd-spec]]
= Writing a BDD spec
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts.adoc
index bd049a2..ed6c30d 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts.adoc
@@ -45,3 +45,9 @@ The following sections explain the API and how to go about using the API.
+include::fixture-scripts/api-and-usage.adoc[leveloffset=+1]
+include::fixture-scripts/ticking-clock-fixture.adoc[leveloffset=+1]
+include::fixture-scripts/sudo-service.adoc[leveloffset=+1]
+
+
+
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
index b93809e..f22d3b5 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/api-and-usage.adoc
@@ -1,3 +1,4 @@
+[[api-and-usage]]
= API and Usage
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/sudo-service.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/sudo-service.adoc
index dac27ff..c533c66 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/sudo-service.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/sudo-service.adoc
@@ -1,3 +1,4 @@
+[[sudo-service]]
= `SudoService`
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc
index 20b2823..8c270c1 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/fixture-scripts/ticking-clock-fixture.adoc
@@ -1,3 +1,4 @@
+[[ticking-clock-fixture]]
= Ticking Clock Fixture
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support.adoc
index 398d43b..a2569ea 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support.adoc
@@ -16,3 +16,9 @@ We'll get to all that shortly, but let's start by taking a look at what a typica
+include::integ-test-support/typical-usage.adoc[leveloffset=+1]
+include::integ-test-support/bootstrapping.adoc[leveloffset=+1]
+include::integ-test-support/abstract-class.adoc[leveloffset=+1]
+include::integ-test-support/configuration-properties.adoc[leveloffset=+1]
+include::integ-test-support/wrapper-factory.adoc[leveloffset=+1]
+include::integ-test-support/maven-configuration.adoc[leveloffset=+1]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
index 426c076..f477835 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/abstract-class.adoc
@@ -1,3 +1,4 @@
+[[abstract-class]]
= Abstract class
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
@@ -6,14 +7,14 @@ include::_attributes.adoc[]
When writing integration tests, it's easiest to inherit from the `IntegrationTestAbstract3` base class.
-This base class xref:testing:ROOT:integ-test-support/bootstrapping.adoc[bootstraps] the framework (caching the framework on a thread-local), and provides various utility methods and framework-provided services for use by your application's subclass tests.
+This base class xref:testing:ROOT:integ-test-support.adoc#bootstrapping[bootstraps] the framework (caching the framework on a thread-local), and provides various utility methods and framework-provided services for use by your application's subclass tests.
== `IntegrationTestAbstract3`
We recommend that your integration tests inherit from Apache Isis' `IntegrationTestAbstract3` class.
-The primary benefit over its predecessor, `IntegrationTestAbstract2` (discussed xref:testing:ROOT:integ-test-support/abstract-class/adoc#IntegrationTestAbstract2[below] is that it allows the test to be bootstrapped by passing in a `Module` rather than an `AppManifest`.
+The primary benefit over its predecessor, `IntegrationTestAbstract2` (discussed xref:testing:ROOT:integ-test-support.adoc#IntegrationTestAbstract2[below] is that it allows the test to be bootstrapped by passing in a `Module` rather than an `AppManifest`.
For example:
@@ -64,7 +65,7 @@ public ExceptionRecognizerTranslate exceptionRecognizerTranslations = // <4>
ExceptionRecognizerTranslate.create();
----
<1> ensures an Apache Isis session/transaction running for each test
-<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:testing:ROOT:unit-test-support/jmock-extensions.adoc[JMock Extensions].
+<2> sets up a JMock context (using Apache Isis' extension to JMock as described in xref:testing:ROOT:unit-test-support.adoc#jmock-extensions[JMock Extensions].
<3> standard JUnit rule for writing tests that throw exceptions
<4> to capture messages that require translation, as described in xref:ug:btb:i18n.adoc[i18 support].
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/bootstrapping.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/bootstrapping.adoc
index cb74bc3..de0f187 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/bootstrapping.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/bootstrapping.adoc
@@ -1,3 +1,4 @@
+[[bootstrapping]]
= Bootstrapping
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/configuration-properties.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/configuration-properties.adoc
index e922312..100070a 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/configuration-properties.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/configuration-properties.adoc
@@ -1,3 +1,4 @@
+[[configuration-properties]]
= Configuration Properties
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/maven-configuration.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/maven-configuration.adoc
index 8fd33d2..15d2b27 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/maven-configuration.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/maven-configuration.adoc
@@ -1,3 +1,4 @@
+[[maven-configuration]]
= Maven Configuration
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/typical-usage.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/typical-usage.adoc
index 0944025..105ec31 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/typical-usage.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/typical-usage.adoc
@@ -1,3 +1,4 @@
+[[typical-usage]]
= Typical Usage
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
index 08ace3f..28be294 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/integ-test-support/wrapper-factory.adoc
@@ -1,3 +1,4 @@
+[[wrapper-factory]]
= Wrapper Factory
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/overview.adoc b/core/testsupport/_adoc/modules/ROOT/pages/overview.adoc
index 0c529ca..3943791 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/overview.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/overview.adoc
@@ -7,11 +7,11 @@ include::_attributes.adoc[]
We divide automated tests into two broad categories:
-- unit tests exercise a single unit (usually a method) of a domain object, in isolation. +
+* unit tests exercise a single unit (usually a method) of a domain object, in isolation. +
+
Dependencies of that object are mocked out. These are written by a developer and for a developer; they are to ensure that a particular "cog in the machine" works correctly
-- integration tests exercise the application as a whole, usually focusing on one particular business operation (action). +
+* integration tests exercise the application as a whole, usually focusing on one particular business operation (action). +
+
These are tests that represent the acceptance criteria of some business story; their intent should make sense to the domain expert (even if the domain expert is "non-technical")
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support.adoc
index 0485ff3..9aad8e3 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support.adoc
@@ -2,7 +2,9 @@
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
-Isis Core provides a number of unit test helpers for you to use (if you wish) to unit test your domain objects.
-
-
+Apache Isis provides a number of unit test helpers for you to use (if you wish) to unit test your domain objects.
+include::unit-test-support/contract-tests.adoc[leveloffset=+1]
+include::unit-test-support/jmock-extensions.adoc[leveloffset=+1]
+include::unit-test-support/soap-fake-server-junit-rule.adoc[leveloffset=+1]
+include::unit-test-support/maven-configuration.adoc[leveloffset=+1]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/contract-tests.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/contract-tests.adoc
index 54db1e9..80bee3f 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/contract-tests.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/contract-tests.adoc
@@ -1,3 +1,4 @@
+[[contract-tests]]
= Contract Tests
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc
index 796c835..0fec7cc 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/jmock-extensions.adoc
@@ -1,3 +1,4 @@
+[[jmock-extensions]]
= JMock Extensions
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/maven-configuration.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/maven-configuration.adoc
index ff8d074..fef964f 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/maven-configuration.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/maven-configuration.adoc
@@ -1,3 +1,4 @@
+[[maven-configuration]]
= Maven Configuration
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]
diff --git a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc
index 791f088..953e2808 100644
--- a/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc
+++ b/core/testsupport/_adoc/modules/ROOT/pages/unit-test-support/soap-fake-server-junit-rule.adoc
@@ -1,3 +1,4 @@
+[[soap-fake-server-junit-rule]]
= SOAP Fake Endpoints
:Notice: Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file distributed with this work for additional information regarding copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at. http://www.apache.org/licenses/LICENSE-2.0 . Unless required by applicable law or ag [...]
include::_attributes.adoc[]