[isis] branch master updated: ISIS-2787: convert jmock to mockito test (for learning purposes)

[ah...@apache.org]

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 84bd660  ISIS-2787: convert jmock to mockito test (for learning purposes)
84bd660 is described below

commit 84bd660b283f0548c65eba110899cd06dc2203e7
Author: andi-huber <ah...@apache.org>
AuthorDate: Sun Jul 4 05:36:29 2021 +0200

    ISIS-2787: convert jmock to mockito test (for learning purposes)
---
 .../collections/JavaCollectionFacetTest.java       | 67 ++++++----------------
 .../SpecificationLoaderTestAbstract.java           |  3 +-
 2 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
index df9c27f..bc58578 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/collections/JavaCollectionFacetTest.java
@@ -19,73 +19,44 @@
 
 package org.apache.isis.core.metamodel.facets.collections;
 
-import java.util.Collection;
+import java.util.ArrayList;
 import java.util.Optional;
-import java.util.stream.Stream;
 
-import org.jmock.Expectations;
-import org.jmock.auto.Mock;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
-import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2;
-import org.apache.isis.core.internaltestsupport.jmocking.JUnitRuleMockery2.Mode;
 import org.apache.isis.core.metamodel._testing.MetaModelContext_forTesting;
+import org.apache.isis.core.metamodel.context.MetaModelContext;
 import org.apache.isis.core.metamodel.facetapi.FacetHolder;
 import org.apache.isis.core.metamodel.facets.collections.javautilcollection.JavaCollectionFacet;
 import org.apache.isis.core.metamodel.spec.ManagedObject;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-public class JavaCollectionFacetTest {
+import lombok.val;
 
-    private JavaCollectionFacet facet;
+class JavaCollectionFacetTest {
 
-    @Rule
-    public JUnitRuleMockery2 context = JUnitRuleMockery2.createFor(Mode.INTERFACES_AND_CLASSES);
+    private MetaModelContext metaModelContext;
 
-    @Mock private FacetHolder mockFacetHolder;
-    @Mock private ManagedObject mockCollection;
-    @Mock private Collection<ManagedObject> mockWrappedCollection;
-
-    private MetaModelContext_forTesting metaModelContext;
-
-    @Before
-    public void setUp() throws Exception {
-        facet = new JavaCollectionFacet(mockFacetHolder);
-        
-        metaModelContext = MetaModelContext_forTesting.builder()
-//                .objectAdapterProvider(mockOAProvider)
-                .build();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        facet = null;
+    @BeforeEach
+    void setUp() throws Exception {
+        metaModelContext = MetaModelContext_forTesting.buildDefault();
     }
 
     @Test
-    public void firstElementForEmptyCollectionIsNull() {
-        context.checking(new Expectations() {
-            {
-                                
-                allowing(mockCollection).getPojo();
-                will(returnValue(mockWrappedCollection));
+    void firstElementForEmptyCollectionIsNull() {
+
+        val mockFacetHolder = mock(FacetHolder.class);
+        when(mockFacetHolder.getMetaModelContext()).thenReturn(metaModelContext);
 
-                allowing(mockWrappedCollection).stream();
-                will(returnValue(Stream.empty()));
-                
-                allowing(mockWrappedCollection).size();
-                will(returnValue(0));
-                
-                allowing(mockFacetHolder).getMetaModelContext();
-                will(returnValue(metaModelContext));
+        val mockCollection = mock(ManagedObject.class);
+        when(mockCollection.getPojo()).thenReturn(new ArrayList<Object>());
 
-            }
-        });
+        val facet = new JavaCollectionFacet(mockFacetHolder);
         assertThat(facet.firstElement(mockCollection), is(Optional.empty()));
     }
 
diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
index d44d446..4ba0e0b 100644
--- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
+++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/specloader/SpecificationLoaderTestAbstract.java
@@ -53,8 +53,7 @@ abstract class SpecificationLoaderTestAbstract {
 
         // PRODUCTION
 
-        metaModelContext = MetaModelContext_forTesting.builder()
-                .build();
+        metaModelContext = MetaModelContext_forTesting.buildDefault();
 
         val specificationLoader = metaModelContext.getSpecificationLoader();