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 2021/10/05 16:11:30 UTC
[isis-app-demo] branch main updated (91da056 -> 9f15d3f)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git.
from 91da056 adds reason property to Visit
add aa793ad adds visits mixin collection for Pet
add fbf30e6 adds bookVisit mixin action for Pet
add 4d5bfbb adds layout file for Visit
add 392a964 adds png for Visit
add 1907f06 adds columnOrder for visits collection of Pet
new 8ca2f34 adds Maven dependency to test libraries, for visits module.
new 9f15d3f adds unit test for Pets_bookVisit
The 2 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:
.../pets/dom/pet/Pet#visits.columnOrder.txt | 2 +
module-visits/pom.xml | 15 ++++++
.../visits/contributions/pet/Pet_bookVisit.java | 57 +++++++++++++++++++++
.../visits/contributions/pet/Pet_visits.java | 14 ++---
.../modules/visits/dom/visit/Visit.layout.xml | 1 -
.../petclinic/modules/visits/dom/visit/Visit.png | Bin 0 -> 701 bytes
.../contributions/pet/Pet_bookVisit_Test.java | 51 ++++++++++++++++++
7 files changed, 133 insertions(+), 7 deletions(-)
create mode 100644 module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet#visits.columnOrder.txt
create mode 100644 module-visits/src/main/java/petclinic/modules/visits/contributions/pet/Pet_bookVisit.java
copy module-pets/src/main/java/petclinic/modules/pets/dom/pet/PetOwner_pets.java => module-visits/src/main/java/petclinic/modules/visits/contributions/pet/Pet_visits.java (55%)
copy module-pets/src/main/java/petclinic/modules/pets/dom/pet/Pet.layout.xml => module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.layout.xml (97%)
create mode 100644 module-visits/src/main/java/petclinic/modules/visits/dom/visit/Visit.png
create mode 100644 module-visits/src/test/java/petclinic/modules/visits/contributions/pet/Pet_bookVisit_Test.java
[isis-app-demo] 02/02: adds unit test for Pets_bookVisit
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 9f15d3f876a64bf0d7fa1a6a6104410b0ec49b09
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 17:10:30 2021 +0100
adds unit test for Pets_bookVisit
---
.../contributions/pet/Pet_bookVisit_Test.java | 51 ++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/module-visits/src/test/java/petclinic/modules/visits/contributions/pet/Pet_bookVisit_Test.java b/module-visits/src/test/java/petclinic/modules/visits/contributions/pet/Pet_bookVisit_Test.java
new file mode 100644
index 0000000..77e22ce
--- /dev/null
+++ b/module-visits/src/test/java/petclinic/modules/visits/contributions/pet/Pet_bookVisit_Test.java
@@ -0,0 +1,51 @@
+package petclinic.modules.visits.contributions.pet;
+
+import java.time.LocalDateTime;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import org.apache.isis.applib.clock.VirtualClock;
+import org.apache.isis.applib.services.clock.ClockService;
+
+@ExtendWith(MockitoExtension.class)
+class Pet_bookVisit_Test {
+
+ @Mock ClockService mockClockService;
+ @Mock VirtualClock mockVirtualClock;
+
+ @BeforeEach
+ void setup() {
+ Mockito.when(mockClockService.getClock()).thenReturn(mockVirtualClock);
+ }
+
+ @Nested
+ class default0 {
+
+ @Test
+ void defaults_to_9am_tomorrow_morning() {
+
+ // given
+ Pet_bookVisit mixin = new Pet_bookVisit(null);
+ mixin.clockService = mockClockService;
+
+ LocalDateTime now = LocalDateTime.of(2021, 10, 21, 16, 37, 45);
+
+ // expecting
+ Mockito.when(mockVirtualClock.nowAsLocalDateTime()).thenReturn(now);
+
+ // when
+ LocalDateTime localDateTime = mixin.default0Act();
+
+ // then
+ Assertions.assertThat(localDateTime)
+ .isEqualTo(LocalDateTime.of(2021,10,22,9,0,0));
+ }
+ }
+}
[isis-app-demo] 01/02: adds Maven dependency to test libraries,
for visits module.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/isis-app-demo.git
commit 8ca2f34d4d729623cfa5fac36b8a75e381a91e35
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Oct 5 16:49:37 2021 +0100
adds Maven dependency to test libraries, for visits module.
---
module-visits/pom.xml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/module-visits/pom.xml b/module-visits/pom.xml
index d0f47fe..3a0a436 100644
--- a/module-visits/pom.xml
+++ b/module-visits/pom.xml
@@ -62,6 +62,21 @@
<optional>true</optional>
</dependency>
+ <!-- TESTS -->
+
+ <dependency>
+ <groupId>org.apache.isis.mavendeps</groupId>
+ <artifactId>isis-mavendeps-unittests</artifactId>
+ <type>pom</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</project>