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 2021/07/04 09:06:05 UTC
[isis] branch master updated: ISIS-2787: adds menubar testing infra.
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new da34190 ISIS-2787: adds menubar testing infra.
da34190 is described below
commit da341907092c0c97bbcba8cd2b91b27cdbb7d61c
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Jul 4 11:05:55 2021 +0200
ISIS-2787: adds menubar testing infra.
---
.../services/grid/GridInferringRoundtripTest.java | 7 +-
.../menubars/MenuBarsLoaderServiceDefault.java | 3 +-
.../menubars/bootstrap3/MenuBarsServiceBS3.java | 15 ++--
.../bootstrap3/MenuBarsServiceBS3Test.java | 81 ++++++++++++++++++++++
4 files changed, 95 insertions(+), 11 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridInferringRoundtripTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridInferringRoundtripTest.java
index 70d8aed..1be0cf0 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridInferringRoundtripTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/services/grid/GridInferringRoundtripTest.java
@@ -48,11 +48,10 @@ extends MetaModelTestAbstract {
val xml = layoutService.toXml(Bar.class, Style.NORMALIZED);
- System.out.println(xml);
+ //System.out.println(xml);
-
- //TODO compare loaded with generated
- //TODO inspect ObjectNamed and MemberNamed (canonical) facets
+ //TODO[ISIS-2787] compare loaded with generated
+ //TODO[ISIS-2787] verify ObjectNamed and MemberNamed (canonical) facets
}
// -- HELPER
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
index 264555c..eabdaf7 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/MenuBarsLoaderServiceDefault.java
@@ -46,7 +46,8 @@ import lombok.extern.log4j.Log4j2;
@Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("Default")
@Log4j2
-public class MenuBarsLoaderServiceDefault implements MenuBarsLoaderService {
+public class MenuBarsLoaderServiceDefault
+implements MenuBarsLoaderService {
private final IsisSystemEnvironment isisSystemEnvironment;
private final JaxbService jaxbService;
diff --git a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
index cc9068b..9de5cdb 100644
--- a/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
+++ b/core/runtimeservices/src/main/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3.java
@@ -63,6 +63,7 @@ import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.feature.MixedIn;
import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
+import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.extern.log4j.Log4j2;
@@ -70,8 +71,10 @@ import lombok.extern.log4j.Log4j2;
@Named("isis.runtimeservices.MenuBarsServiceBS3")
@Priority(PriorityPrecedence.MIDPOINT)
@Qualifier("BS3")
+@RequiredArgsConstructor(onConstructor_ = {@Inject})
@Log4j2
-public class MenuBarsServiceBS3 implements MenuBarsService {
+public class MenuBarsServiceBS3
+implements MenuBarsService {
public static final String MB3_TNS = "http://isis.apache.org/applib/layout/menubars/bootstrap3";
public static final String MB3_SCHEMA_LOCATION = "http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd";
@@ -82,11 +85,11 @@ public class MenuBarsServiceBS3 implements MenuBarsService {
public static final String LINKS_TNS = GridServiceDefault.LINKS_TNS;
public static final String LINKS_SCHEMA_LOCATION = GridServiceDefault.LINKS_SCHEMA_LOCATION;
- @Inject private MenuBarsLoaderService menuBarsLoaderService;
- @Inject private MessageService messageService;
- @Inject private JaxbService jaxbService;
- @Inject private IsisSystemEnvironment isisSystemEnvironment;
- @Inject private MetaModelContext metaModelContext;
+ private final MenuBarsLoaderService menuBarsLoaderService;
+ private final MessageService messageService;
+ private final JaxbService jaxbService;
+ private final IsisSystemEnvironment isisSystemEnvironment;
+ private final MetaModelContext metaModelContext;
BS3MenuBars menuBars;
diff --git a/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3Test.java b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3Test.java
new file mode 100644
index 0000000..555fbb3
--- /dev/null
+++ b/core/runtimeservices/src/test/java/org/apache/isis/core/runtimeservices/menubars/bootstrap3/MenuBarsServiceBS3Test.java
@@ -0,0 +1,81 @@
+/*
+ * 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.core.runtimeservices.menubars.bootstrap3;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import org.apache.isis.applib.services.jaxb.JaxbService;
+import org.apache.isis.applib.services.message.MessageService;
+import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
+import org.apache.isis.core.metamodel.context.HasMetaModelContext;
+import org.apache.isis.core.metamodel.context.MetaModelContext;
+import org.apache.isis.core.runtimeservices.menubars.MenuBarsLoaderServiceDefault;
+
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+
+import lombok.Getter;
+import lombok.val;
+
+class MenuBarsServiceBS3Test
+implements HasMetaModelContext {
+
+ @Getter(onMethod_ = {@Override})
+ private MetaModelContext metaModelContext;
+
+ private MenuBarsServiceBS3 menuBarsService;
+
+ @BeforeEach
+ void setUp() throws Exception {
+ metaModelContext = MetaModelContext_forTesting
+ .builder()
+ .build();
+
+
+ val messageService = metaModelContext.getServiceRegistry().lookupServiceElseFail(MessageService.class);
+ val jaxbService = metaModelContext.getServiceRegistry().lookupServiceElseFail(JaxbService.class);
+
+ val menuBarsLoaderService = new MenuBarsLoaderServiceDefault(
+ metaModelContext.getSystemEnvironment(),
+ jaxbService,
+ metaModelContext.getConfiguration());
+
+ menuBarsService = new MenuBarsServiceBS3(
+ menuBarsLoaderService,
+ messageService,
+ jaxbService,
+ metaModelContext.getSystemEnvironment(),
+ metaModelContext);
+
+ }
+
+ @AfterEach
+ void tearDown() throws Exception {
+ metaModelContext.getSpecificationLoader().disposeMetaModel();
+ }
+
+ @Test
+ void test() {
+ val menuBars = menuBarsService.menuBars();
+ assertNotNull(menuBars);
+ //TODO[ISIS-2787] setup a sample Service that contributes a menu, then verify
+ }
+
+}