You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2018/11/23 09:36:18 UTC
[isis] branch 2039-Redesign_of_Config updated: ISIS-2039: proposed
test fix
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2039-Redesign_of_Config
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/2039-Redesign_of_Config by this push:
new 5e68e65 ISIS-2039: proposed test fix
5e68e65 is described below
commit 5e68e65454d9d28cbf6a9b7512eb447ad7c51df6
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Nov 23 10:36:12 2018 +0100
ISIS-2039: proposed test fix
also cleaning up verbose tests
Task-Url: https://issues.apache.org/jira/browse/ISIS-2039
---
.../metamodel/services/swagger/internal/Generation.java | 2 +-
.../JodaLocalDateTimeValueSemanticsProviderTest.java | 2 +-
.../isis/core/metamodel/services/grid/BS3GridTest.java | 13 +++++++++----
.../core/metamodel/services/menubars/BS3MenuBarsTest.java | 8 ++++++--
.../services/metamodel/MetaModelServiceDefaultTest.java | 2 +-
.../isis/core/runtime/threadpool/ThreadPoolSupportTest.java | 3 ---
6 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Generation.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Generation.java
index 7707b08..abd5304 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Generation.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/swagger/internal/Generation.java
@@ -172,7 +172,7 @@ class Generation {
// objectSpecification.getCorrespondingClass().getName())
// .toSortedList(Ordering.natural());
// final String all = Joiner.on(",").join(specs);
-// System.out.println(all);
+// System .out.println(all);
// }
void appendObjectPathsAndDefinitions() {
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
index dac7f34..d294bae 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/datetimejodalocal/JodaLocalDateTimeValueSemanticsProviderTest.java
@@ -48,7 +48,7 @@ public class JodaLocalDateTimeValueSemanticsProviderTest {
@Before
public void setUp() throws Exception {
-
+ _Config.clear();
_Config.acceptBuilder(config->{
config.put("isis.value.format.datetime", "iso_encoding");
});
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
index 9333ea2..1864463 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/BS3GridTest.java
@@ -140,7 +140,7 @@ public class BS3GridTest {
final String schemaLocations = gridServiceDefault.tnsAndSchemaLocation(bs3Grid);
String xml = jaxbService.toXml(bs3Grid,
_Maps.unmodifiable(Marshaller.JAXB_SCHEMA_LOCATION, schemaLocations));
- System.out.println(xml);
+ println(xml);
BS3Grid bs3Pageroundtripped = jaxbService.fromXml(BS3Grid.class, xml);
String xmlRoundtripped = jaxbService.toXml(bs3Pageroundtripped,
@@ -148,7 +148,7 @@ public class BS3GridTest {
assertThat(xml, is(equalTo(xmlRoundtripped)));
- System.out.println("==========");
+ println("==========");
dumpXsd(bs3Grid);
}
@@ -156,8 +156,13 @@ public class BS3GridTest {
protected void dumpXsd(final BS3Grid bs3Page) {
Map<String, String> schemas = jaxbService.toXsd(bs3Page, JaxbService.IsisSchemas.INCLUDE);
for (Map.Entry<String, String> entry : schemas.entrySet()) {
- System.out.println(entry.getKey() + ":");
- System.out.println(entry.getValue());
+ println(entry.getKey() + ":");
+ println(entry.getValue());
}
}
+
+ private void println(String string) {
+ //for test debugging only
+ }
+
}
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
index 0d0a508..a196127 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/menubars/BS3MenuBarsTest.java
@@ -50,9 +50,13 @@ public class BS3MenuBarsTest {
Map<String, String> schemas = jaxbService.toXsd(menuBars, JaxbService.IsisSchemas.INCLUDE);
for (Map.Entry<String, String> entry : schemas.entrySet()) {
- System.out.println(entry.getKey() + ":");
- System.out.println(entry.getValue());
+ println(entry.getKey() + ":");
+ println(entry.getValue());
}
}
+
+ private void println(String string) {
+ //for test debugging only
+ }
}
\ No newline at end of file
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
index d686418..2d8e80f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelServiceDefaultTest.java
@@ -148,7 +148,7 @@ class MetaModelServiceDefaultTest {
Marshaller jaxbMarshaller = jaxbContext.createMarshaller();
jaxbMarshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
- jaxbMarshaller.marshal(domainMembers, System.out);
+ jaxbMarshaller.marshal(domainMembers, noopOutput());
}
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/runtime/threadpool/ThreadPoolSupportTest.java b/core/metamodel/src/test/java/org/apache/isis/core/runtime/threadpool/ThreadPoolSupportTest.java
index bfd0b59..ae6372f 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/runtime/threadpool/ThreadPoolSupportTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/runtime/threadpool/ThreadPoolSupportTest.java
@@ -50,9 +50,6 @@ class ThreadPoolSupportTest {
@Test
void shouldPreserveSequence_whenNoThread() {
-
- System.out.println(""+pool);
-
buffer.append("A");
buffer.append("B");
buffer.append("C");