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 2018/10/09 09:27:13 UTC
[isis] 03/03: ISIS-2003: uses folders instead of filenames for
received vs approved
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2003
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 3bcd905eb2103c0d70861706aa773c507be37f39
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 9 10:14:49 2018 +0100
ISIS-2003: uses folders instead of filenames for received vs approved
---
.../application/integtests/mml/.gitignore | 1 -
.../integtests/mml/MetaModelService_IntegTest.java | 29 +++++++++++++++++++---
...mainAppFixtureScriptsSpecificationProvider.xml} | 0
...lication.services.homepage.HomePageService.xml} | 0
...cation.services.homepage.HomePageViewModel.xml} | 0
...inapp.modules.simple.dom.impl.SimpleObject.xml} | 0
...napp.modules.simple.dom.impl.SimpleObjects.xml} | 0
.../java.lang.Long.xml} | 0
.../java.lang.Object.xml} | 0
.../java.lang.String.xml} | 0
.../java.net.URL.xml} | 0
.../java.sql.Timestamp.xml} | 0
.../java.util.List.xml} | 0
...applib.services.layout.LayoutService$Style.xml} | 0
.../org.apache.isis.applib.value.Clob.xml} | 0
.../mml/{_void.approved.xml => approved/void.xml} | 0
.../application/integtests/mml/received/.gitignore | 1 +
17 files changed, 27 insertions(+), 4 deletions(-)
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/.gitignore b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/.gitignore
deleted file mode 100644
index 83387df..0000000
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.received.xml
\ No newline at end of file
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
index 0ff283a..cd48c3f 100644
--- a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/MetaModelService_IntegTest.java
@@ -18,6 +18,7 @@
*/
package domainapp.application.integtests.mml;
+import java.io.File;
import java.util.List;
import javax.inject.Inject;
@@ -94,7 +95,7 @@ public class MetaModelService_IntegTest extends DomainAppIntegTestAbstract {
@Test
public void _2_verify() throws Exception {
- assumeThat(System.getProperty("lockdown.verify"), is(notNullValue()));
+ //assumeThat(System.getProperty("lockdown.verify"), is(notNullValue()));
// when
MetamodelDto metamodelDto =
@@ -116,9 +117,31 @@ public class MetaModelService_IntegTest extends DomainAppIntegTestAbstract {
private void verifyClass(final DomainClassDto domainClass) {
String asXml = jaxbService.toXml(domainClass);
- verify(new ApprovalTextWriter(asXml, "xml"), new StackTraceNamer() {
+ verify(new ApprovalTextWriter(asXml, "xml"){
+ @Override public String writeReceivedFile(final String received) throws Exception {
+ return super.writeReceivedFile(received);
+ }
+
+ @Override public String getReceivedFilename(final String base) {
+ return toFilename("received", base);
+ }
+
+ @Override public String getApprovalFilename(final String base) {
+ return toFilename("approved", base);
+ }
+
+ private String toFilename(final String prefix, final String base) {
+ final File file = new File(base);
+ final File parentFile = file.getParentFile();
+ final String localName = file.getName();
+ final File newDir = new File(parentFile, prefix);
+ final File newFile = new File(newDir, localName + ".xml");
+ return newFile.toString();
+ }
+
+ }, new StackTraceNamer() {
@Override public String getApprovalName() {
- return "_" + domainClass.getId();
+ return domainClass.getId();
}
}, getReporter());
}
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.fixture.DomainAppFixtureScriptsSpecificationProvider.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.application.services.homepage.HomePageService.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageService.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.application.services.homepage.HomePageService.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageService.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.application.services.homepage.HomePageViewModel.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.application.services.homepage.HomePageViewModel.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.application.services.homepage.HomePageViewModel.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.modules.simple.dom.impl.SimpleObject.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.modules.simple.dom.impl.SimpleObject.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObject.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.modules.simple.dom.impl.SimpleObjects.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_domainapp.modules.simple.dom.impl.SimpleObjects.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/domainapp.modules.simple.dom.impl.SimpleObjects.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.lang.Long.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Long.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.lang.Long.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Long.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.lang.Object.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Object.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.lang.Object.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.Object.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.lang.String.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.String.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.lang.String.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.lang.String.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.net.URL.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.net.URL.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.net.URL.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.net.URL.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.sql.Timestamp.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.sql.Timestamp.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.sql.Timestamp.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.sql.Timestamp.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.util.List.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.List.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_java.util.List.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/java.util.List.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_org.apache.isis.applib.services.layout.LayoutService$Style.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.services.layout.LayoutService$Style.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_org.apache.isis.applib.services.layout.LayoutService$Style.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.services.layout.LayoutService$Style.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_org.apache.isis.applib.value.Clob.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.value.Clob.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_org.apache.isis.applib.value.Clob.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/org.apache.isis.applib.value.Clob.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_void.approved.xml b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/void.xml
similarity index 100%
rename from example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/_void.approved.xml
rename to example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/approved/void.xml
diff --git a/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/received/.gitignore b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/received/.gitignore
new file mode 100644
index 0000000..b81c795
--- /dev/null
+++ b/example/application/simpleapp/application/src/test/java/domainapp/application/integtests/mml/received/.gitignore
@@ -0,0 +1 @@
+*.xml
\ No newline at end of file