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/03/09 13:29:11 UTC
[isis] branch master updated (91a8259 -> 02dcf68)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git.
from 91a8259 ISIS-1779: factors failing RO applib tests into contract tests.
new 41e1082 ISIS-1779: more contract tests for JAX-RS plugins
new 197f9af ISIS-1888: fixes test per new rules for CSS class names (don't force to lower case)
new f8bc09b ISIS-1891: fixes classpath issues for unit tests of jaxrs plugins
new f03e561 ISIS-1753: fixes classpath issues for unit tests of eventbus plugins
new 222998e ISIS-1903: fixes helloworld and simpleapp classpath issues, now build from mvn ok.
new 02dcf68 ISIS-1810: no longer skip tests in gitlab
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitlab-ci.yml | 2 +-
core/plugins/eventbus-guava/pom.xml | 7 +++++++
core/plugins/jaxrs-resteasy-3/pom.xml | 8 +++++++-
.../ResourceContext_ensureCompatibleAcceptHeader_Test.java} | 8 +++-----
core/plugins/jaxrs-resteasy-4/pom.xml | 7 +++++++
.../ResourceContext_ensureCompatibleAcceptHeader_Test.java} | 8 +++-----
...esourceContext_ensureCompatibleAcceptHeader_ContractTest.java} | 2 +-
.../org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java | 4 ++--
example/application/helloworld/pom.xml | 5 ++++-
example/application/simpleapp/pom.xml | 5 ++++-
10 files changed, 39 insertions(+), 17 deletions(-)
copy core/{applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutDataOwner.java => plugins/jaxrs-resteasy-3/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_Test.java} (81%)
copy core/{applib/src/main/java/org/apache/isis/applib/layout/component/CollectionLayoutDataOwner.java => plugins/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_Test.java} (81%)
rename core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/{ResourceContextTest_ensureCompatibleAcceptHeader.java => ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java} (99%)
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 04/06: ISIS-1753: fixes classpath issues for unit tests of
eventbus plugins
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f03e561c9b2cafe4569e35d2d95fe4af3b847227
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 9 13:13:00 2018 +0000
ISIS-1753: fixes classpath issues for unit tests of eventbus plugins
---
core/plugins/eventbus-guava/pom.xml | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/core/plugins/eventbus-guava/pom.xml b/core/plugins/eventbus-guava/pom.xml
index 8b22398..66662cd 100644
--- a/core/plugins/eventbus-guava/pom.xml
+++ b/core/plugins/eventbus-guava/pom.xml
@@ -70,6 +70,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 01/06: ISIS-1779: more contract tests for JAX-RS plugins
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 41e1082d669404c6a21e38af61281a67ab2e306d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 9 13:06:38 2018 +0000
ISIS-1779: more contract tests for JAX-RS plugins
---
...eContext_ensureCompatibleAcceptHeader_Test.java | 24 ++++++++++++++++++++++
...eContext_ensureCompatibleAcceptHeader_Test.java | 24 ++++++++++++++++++++++
...ensureCompatibleAcceptHeader_ContractTest.java} | 2 +-
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/core/plugins/jaxrs-resteasy-3/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_Test.java b/core/plugins/jaxrs-resteasy-3/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_Test.java
new file mode 100644
index 0000000..703ee64
--- /dev/null
+++ b/core/plugins/jaxrs-resteasy-3/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_Test.java
@@ -0,0 +1,24 @@
+/*
+ * 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 agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.viewer.restfulobjects.server;
+
+public class ResourceContext_ensureCompatibleAcceptHeader_Test extends
+ ResourceContext_ensureCompatibleAcceptHeader_ContractTest {
+
+}
diff --git a/core/plugins/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_Test.java b/core/plugins/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_Test.java
new file mode 100644
index 0000000..703ee64
--- /dev/null
+++ b/core/plugins/jaxrs-resteasy-4/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_Test.java
@@ -0,0 +1,24 @@
+/*
+ * 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 agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.isis.viewer.restfulobjects.server;
+
+public class ResourceContext_ensureCompatibleAcceptHeader_Test extends
+ ResourceContext_ensureCompatibleAcceptHeader_ContractTest {
+
+}
diff --git a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
similarity index 99%
rename from core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
rename to core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
index b65bc91..10f5b02 100644
--- a/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContextTest_ensureCompatibleAcceptHeader.java
+++ b/core/viewer-restfulobjects-server/src/test/java/org/apache/isis/viewer/restfulobjects/server/ResourceContext_ensureCompatibleAcceptHeader_ContractTest.java
@@ -51,7 +51,7 @@ import org.apache.isis.viewer.restfulobjects.rendering.RestfulObjectsApplication
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public class ResourceContextTest_ensureCompatibleAcceptHeader {
+public abstract class ResourceContext_ensureCompatibleAcceptHeader_ContractTest {
@Rule
public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(JUnitRuleMockery2.Mode.INTERFACES_AND_CLASSES);
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 05/06: ISIS-1903: fixes helloworld and simpleapp classpath
issues, now build from mvn ok.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 222998e7e631d6736613235efaa900c7fbc89344
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 9 13:27:26 2018 +0000
ISIS-1903: fixes helloworld and simpleapp classpath issues, now build from mvn ok.
---
example/application/helloworld/pom.xml | 5 ++++-
example/application/simpleapp/pom.xml | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/example/application/helloworld/pom.xml b/example/application/helloworld/pom.xml
index dcf4672..308060d 100644
--- a/example/application/helloworld/pom.xml
+++ b/example/application/helloworld/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>2</version>
+ <version>4</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
@@ -42,6 +42,9 @@
<compiler-plugin.target>1.8</compiler-plugin.target>
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
+ <!-- override incode-build -->
+ <datanucleus-core.version>5.1.6</datanucleus-core.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/example/application/simpleapp/pom.xml b/example/application/simpleapp/pom.xml
index 2876899..087544d 100644
--- a/example/application/simpleapp/pom.xml
+++ b/example/application/simpleapp/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.incode</groupId>
<artifactId>incode-build</artifactId>
- <version>2</version>
+ <version>4</version>
</parent>
<groupId>org.apache.isis.example.application</groupId>
@@ -43,6 +43,9 @@
<compiler-plugin.target>1.8</compiler-plugin.target>
<compiler-plugin.compilerArgument>-parameters</compiler-plugin.compilerArgument>
+ <!-- override incode-build -->
+ <datanucleus-core.version>5.1.6</datanucleus-core.version>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
</properties>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 06/06: ISIS-1810: no longer skip tests in gitlab
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 02dcf68c57df0507caa64183ed1674c94aaadb32
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 9 13:29:04 2018 +0000
ISIS-1810: no longer skip tests in gitlab
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9c4db51..18071dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,5 +4,5 @@ stages:
maven-build:
image: maven:3-jdk-8
stage: build
- script: "mvn package -DskipTests -B"
+ script: "mvn package -B"
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 02/06: ISIS-1888: fixes test per new rules for CSS class
names (don't force to lower case)
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 197f9afd09769728c08d5c2b6d353592a519e043
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 9 13:07:11 2018 +0000
ISIS-1888: fixes test per new rules for CSS class names (don't force to lower case)
---
.../java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java b/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
index fccbca6..6bf34da 100644
--- a/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
+++ b/core/viewer-wicket-ui/src/test/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstractTest.java
@@ -31,12 +31,12 @@ public abstract class PageAbstractTest {
@Test
public void withSpacesAndCapitals() throws Exception {
- assertThat(CssClassAppender.asCssStyle("Simple App"), is("simple-app"));
+ assertThat(CssClassAppender.asCssStyle("Simple App"), is("Simple-App"));
}
@Test
public void withOtherCharacters() throws Exception {
- assertThat(CssClassAppender.asCssStyle("Kitchen Sink (Demo) App"), is("kitchen-sink-demo-app"));
+ assertThat(CssClassAppender.asCssStyle("Kitchen Sink (Demo) App"), is("Kitchen-Sink-Demo-App"));
}
}
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.
[isis] 03/06: ISIS-1891: fixes classpath issues for unit tests of
jaxrs plugins
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit f8bc09b997b6e991f747cb515ceabee70e5c784d
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Mar 9 13:12:26 2018 +0000
ISIS-1891: fixes classpath issues for unit tests of jaxrs plugins
---
core/plugins/jaxrs-resteasy-3/pom.xml | 8 +++++++-
core/plugins/jaxrs-resteasy-4/pom.xml | 7 +++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/core/plugins/jaxrs-resteasy-3/pom.xml b/core/plugins/jaxrs-resteasy-3/pom.xml
index 3c6c359..7c0d33c 100644
--- a/core/plugins/jaxrs-resteasy-3/pom.xml
+++ b/core/plugins/jaxrs-resteasy-3/pom.xml
@@ -148,7 +148,13 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
-
+
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
diff --git a/core/plugins/jaxrs-resteasy-4/pom.xml b/core/plugins/jaxrs-resteasy-4/pom.xml
index 0105a16..1399419 100644
--- a/core/plugins/jaxrs-resteasy-4/pom.xml
+++ b/core/plugins/jaxrs-resteasy-4/pom.xml
@@ -149,6 +149,13 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.jdo</groupId>
+ <artifactId>jdo-api</artifactId>
+ <version>${jdo-api.version}</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
--
To stop receiving notification emails like this one, please contact
danhaywood@apache.org.