model) {
+ return "pets/createOrUpdateVisitForm";
+ }
- // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called
- @PostMapping("/owners/{ownerId}/pets/{petId}/visits/new")
- public String processNewVisitForm(@Valid Visit visit, BindingResult result) {
- if (result.hasErrors()) {
- return "pets/createOrUpdateVisitForm";
- } else {
- this.visits.save(visit);
- return "redirect:/owners/{ownerId}";
- }
- }
+ // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called
+ @PostMapping("/owners/{ownerId}/pets/{petId}/visits/new")
+ public String processNewVisitForm(@Valid Visit visit, BindingResult result) {
+ if (result.hasErrors()) {
+ return "pets/createOrUpdateVisitForm";
+ }
+ else {
+ this.visits.save(visit);
+ return "redirect:/owners/{ownerId}";
+ }
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java b/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
index 9d4a53c6480..0a96582c9be 100755
--- a/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
+++ b/src/main/java/org/springframework/samples/petclinic/system/CacheConfiguration.java
@@ -16,37 +16,40 @@
package org.springframework.samples.petclinic.system;
+import javax.cache.configuration.MutableConfiguration;
+
import org.springframework.boot.autoconfigure.cache.JCacheManagerCustomizer;
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
-import javax.cache.configuration.MutableConfiguration;
-
/**
- * Cache configuration intended for caches providing the JCache API. This configuration creates the used cache for the
- * application and enables statistics that become accessible via JMX.
+ * Cache configuration intended for caches providing the JCache API. This configuration
+ * creates the used cache for the application and enables statistics that become
+ * accessible via JMX.
*/
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableCaching
class CacheConfiguration {
- @Bean
- public JCacheManagerCustomizer petclinicCacheConfigurationCustomizer() {
- return cm -> {
- cm.createCache("vets", cacheConfiguration());
- };
- }
+ @Bean
+ public JCacheManagerCustomizer petclinicCacheConfigurationCustomizer() {
+ return cm -> {
+ cm.createCache("vets", cacheConfiguration());
+ };
+ }
- /**
- * Create a simple configuration that enable statistics via the JCache programmatic configuration API.
- *
- * Within the configuration object that is provided by the JCache API standard, there is only a very limited set of
- * configuration options. The really relevant configuration options (like the size limit) must be set via a
- * configuration mechanism that is provided by the selected JCache implementation.
- */
- private javax.cache.configuration.Configuration cacheConfiguration() {
- return new MutableConfiguration<>().setStatisticsEnabled(true);
- }
+ /**
+ * Create a simple configuration that enable statistics via the JCache programmatic
+ * configuration API.
+ *
+ * Within the configuration object that is provided by the JCache API standard, there
+ * is only a very limited set of configuration options. The really relevant
+ * configuration options (like the size limit) must be set via a configuration
+ * mechanism that is provided by the selected JCache implementation.
+ */
+ private javax.cache.configuration.Configuration cacheConfiguration() {
+ return new MutableConfiguration<>().setStatisticsEnabled(true);
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java b/src/main/java/org/springframework/samples/petclinic/system/CrashController.java
index 05be70429dc..2b28600fde5 100644
--- a/src/main/java/org/springframework/samples/petclinic/system/CrashController.java
+++ b/src/main/java/org/springframework/samples/petclinic/system/CrashController.java
@@ -28,10 +28,10 @@
@Controller
class CrashController {
- @GetMapping("/oups")
- public String triggerException() {
- throw new RuntimeException("Expected: controller used to showcase what "
- + "happens when an exception is thrown");
- }
+ @GetMapping("/oups")
+ public String triggerException() {
+ throw new RuntimeException(
+ "Expected: controller used to showcase what " + "happens when an exception is thrown");
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java
index 7e96848b654..9224015bcd3 100644
--- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java
+++ b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java
@@ -16,15 +16,15 @@
package org.springframework.samples.petclinic.system;
-
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.GetMapping;
@Controller
class WelcomeController {
- @GetMapping("/")
- public String welcome() {
- return "welcome";
- }
+ @GetMapping("/")
+ public String welcome() {
+ return "welcome";
+ }
+
}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
index 33b44912956..014becfce18 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/Vet.java
@@ -45,35 +45,35 @@
@Table(name = "vets")
public class Vet extends Person {
- @ManyToMany(fetch = FetchType.EAGER)
- @JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"), inverseJoinColumns = @JoinColumn(name = "specialty_id"))
- private Set specialties;
+ @ManyToMany(fetch = FetchType.EAGER)
+ @JoinTable(name = "vet_specialties", joinColumns = @JoinColumn(name = "vet_id"),
+ inverseJoinColumns = @JoinColumn(name = "specialty_id"))
+ private Set specialties;
- protected Set getSpecialtiesInternal() {
- if (this.specialties == null) {
- this.specialties = new HashSet<>();
- }
- return this.specialties;
- }
+ protected Set getSpecialtiesInternal() {
+ if (this.specialties == null) {
+ this.specialties = new HashSet<>();
+ }
+ return this.specialties;
+ }
- protected void setSpecialtiesInternal(Set specialties) {
- this.specialties = specialties;
- }
+ protected void setSpecialtiesInternal(Set specialties) {
+ this.specialties = specialties;
+ }
- @XmlElement
- public List getSpecialties() {
- List sortedSpecs = new ArrayList<>(getSpecialtiesInternal());
- PropertyComparator.sort(sortedSpecs,
- new MutableSortDefinition("name", true, true));
- return Collections.unmodifiableList(sortedSpecs);
- }
+ @XmlElement
+ public List getSpecialties() {
+ List sortedSpecs = new ArrayList<>(getSpecialtiesInternal());
+ PropertyComparator.sort(sortedSpecs, new MutableSortDefinition("name", true, true));
+ return Collections.unmodifiableList(sortedSpecs);
+ }
- public int getNrOfSpecialties() {
- return getSpecialtiesInternal().size();
- }
+ public int getNrOfSpecialties() {
+ return getSpecialtiesInternal().size();
+ }
- public void addSpecialty(Specialty specialty) {
- getSpecialtiesInternal().add(specialty);
- }
+ public void addSpecialty(Specialty specialty) {
+ getSpecialtiesInternal().add(specialty);
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetController.java b/src/main/java/org/springframework/samples/petclinic/vet/VetController.java
index f15f40b2c6b..fb5e321baf1 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/VetController.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/VetController.java
@@ -30,29 +30,29 @@
@Controller
class VetController {
- private final VetRepository vets;
-
- public VetController(VetRepository clinicService) {
- this.vets = clinicService;
- }
-
- @GetMapping("/vets.html")
- public String showVetList(Map model) {
- // Here we are returning an object of type 'Vets' rather than a collection of Vet
- // objects so it is simpler for Object-Xml mapping
- Vets vets = new Vets();
- vets.getVetList().addAll(this.vets.findAll());
- model.put("vets", vets);
- return "vets/vetList";
- }
-
- @GetMapping({ "/vets" })
- public @ResponseBody Vets showResourcesVetList() {
- // Here we are returning an object of type 'Vets' rather than a collection of Vet
- // objects so it is simpler for JSon/Object mapping
- Vets vets = new Vets();
- vets.getVetList().addAll(this.vets.findAll());
- return vets;
- }
+ private final VetRepository vets;
+
+ public VetController(VetRepository clinicService) {
+ this.vets = clinicService;
+ }
+
+ @GetMapping("/vets.html")
+ public String showVetList(Map model) {
+ // Here we are returning an object of type 'Vets' rather than a collection of Vet
+ // objects so it is simpler for Object-Xml mapping
+ Vets vets = new Vets();
+ vets.getVetList().addAll(this.vets.findAll());
+ model.put("vets", vets);
+ return "vets/vetList";
+ }
+
+ @GetMapping({ "/vets" })
+ public @ResponseBody Vets showResourcesVetList() {
+ // Here we are returning an object of type 'Vets' rather than a collection of Vet
+ // objects so it is simpler for JSon/Object mapping
+ Vets vets = new Vets();
+ vets.getVetList().addAll(this.vets.findAll());
+ return vets;
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
index 1f70182fd73..549b1c229e4 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/VetRepository.java
@@ -23,9 +23,10 @@
import org.springframework.transaction.annotation.Transactional;
/**
- * Repository class for Vet domain objects All method names are compliant with Spring Data naming
- * conventions so this interface can easily be extended for Spring Data.
- * See: https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
+ * Repository class for Vet domain objects All method names are compliant
+ * with Spring Data naming conventions so this interface can easily be extended for Spring
+ * Data. See:
+ * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
*
* @author Ken Krebs
* @author Juergen Hoeller
@@ -34,14 +35,12 @@
*/
public interface VetRepository extends Repository {
- /**
- * Retrieve all Vets from the data store.
- *
- * @return a Collection of Vets
- */
- @Transactional(readOnly = true)
- @Cacheable("vets")
- Collection findAll() throws DataAccessException;
-
+ /**
+ * Retrieve all Vets from the data store.
+ * @return a Collection of Vets
+ */
+ @Transactional(readOnly = true)
+ @Cacheable("vets")
+ Collection findAll() throws DataAccessException;
}
diff --git a/src/main/java/org/springframework/samples/petclinic/vet/Vets.java b/src/main/java/org/springframework/samples/petclinic/vet/Vets.java
index ab29f7a54db..cea6656291b 100644
--- a/src/main/java/org/springframework/samples/petclinic/vet/Vets.java
+++ b/src/main/java/org/springframework/samples/petclinic/vet/Vets.java
@@ -22,22 +22,22 @@
import javax.xml.bind.annotation.XmlRootElement;
/**
- * Simple domain object representing a list of veterinarians. Mostly here to be used for the 'vets' {@link
- * org.springframework.web.servlet.view.xml.MarshallingView}.
+ * Simple domain object representing a list of veterinarians. Mostly here to be used for
+ * the 'vets' {@link org.springframework.web.servlet.view.xml.MarshallingView}.
*
* @author Arjen Poutsma
*/
@XmlRootElement
public class Vets {
- private List vets;
+ private List vets;
- @XmlElement
- public List getVetList() {
- if (vets == null) {
- vets = new ArrayList<>();
- }
- return vets;
- }
+ @XmlElement
+ public List getVetList() {
+ if (vets == null) {
+ vets = new ArrayList<>();
+ }
+ return vets;
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/visit/Visit.java b/src/main/java/org/springframework/samples/petclinic/visit/Visit.java
index 03c9deedfac..df9f25fe03d 100755
--- a/src/main/java/org/springframework/samples/petclinic/visit/Visit.java
+++ b/src/main/java/org/springframework/samples/petclinic/visit/Visit.java
@@ -35,46 +35,46 @@
@Table(name = "visits")
public class Visit extends BaseEntity {
- @Column(name = "visit_date")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- private LocalDate date;
+ @Column(name = "visit_date")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate date;
- @NotEmpty
- @Column(name = "description")
- private String description;
+ @NotEmpty
+ @Column(name = "description")
+ private String description;
- @Column(name = "pet_id")
- private Integer petId;
+ @Column(name = "pet_id")
+ private Integer petId;
- /**
- * Creates a new instance of Visit for the current date
- */
- public Visit() {
- this.date = LocalDate.now();
- }
+ /**
+ * Creates a new instance of Visit for the current date
+ */
+ public Visit() {
+ this.date = LocalDate.now();
+ }
- public LocalDate getDate() {
- return this.date;
- }
+ public LocalDate getDate() {
+ return this.date;
+ }
- public void setDate(LocalDate date) {
- this.date = date;
- }
+ public void setDate(LocalDate date) {
+ this.date = date;
+ }
- public String getDescription() {
- return this.description;
- }
+ public String getDescription() {
+ return this.description;
+ }
- public void setDescription(String description) {
- this.description = description;
- }
+ public void setDescription(String description) {
+ this.description = description;
+ }
- public Integer getPetId() {
- return this.petId;
- }
+ public Integer getPetId() {
+ return this.petId;
+ }
- public void setPetId(Integer petId) {
- this.petId = petId;
- }
+ public void setPetId(Integer petId) {
+ this.petId = petId;
+ }
}
diff --git a/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java b/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java
index 42b58618bd3..d5a3334c642 100644
--- a/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java
+++ b/src/main/java/org/springframework/samples/petclinic/visit/VisitRepository.java
@@ -22,9 +22,10 @@
import org.springframework.samples.petclinic.model.BaseEntity;
/**
- * Repository class for Visit domain objects All method names are compliant with Spring Data naming
- * conventions so this interface can easily be extended for Spring Data.
- * See: https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
+ * Repository class for Visit domain objects All method names are compliant
+ * with Spring Data naming conventions so this interface can easily be extended for Spring
+ * Data. See:
+ * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
*
* @author Ken Krebs
* @author Juergen Hoeller
@@ -33,14 +34,13 @@
*/
public interface VisitRepository extends Repository {
- /**
- * Save a Visit to the data store, either inserting or updating it.
- *
- * @param visit the Visit to save
- * @see BaseEntity#isNew
- */
- void save(Visit visit) throws DataAccessException;
+ /**
+ * Save a Visit to the data store, either inserting or updating it.
+ * @param visit the Visit to save
+ * @see BaseEntity#isNew
+ */
+ void save(Visit visit) throws DataAccessException;
- List findByPetId(Integer petId);
+ List findByPetId(Integer petId);
}
diff --git a/src/main/resources/application-mysql.properties b/src/main/resources/application-mysql.properties
index 823b32b697f..6d54ddad7cb 100644
--- a/src/main/resources/application-mysql.properties
+++ b/src/main/resources/application-mysql.properties
@@ -1,7 +1,7 @@
# database init, supports mysql too
database=mysql
spring.datasource.url=jdbc:mysql://localhost/petclinic
-spring.datasource.username=root
+spring.datasource.username=petclinic
spring.datasource.password=petclinic
-# Uncomment this the first time the app runs
-# spring.datasource.initialization-mode=always
+# SQL is written to be idempotent so this is safe
+spring.datasource.initialization-mode=always
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index b93ff4de30b..4d4784e362d 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,5 +1,5 @@
# database init, supports mysql too
-database=hsqldb
+database=h2
spring.datasource.schema=classpath*:db/${database}/schema.sql
spring.datasource.data=classpath*:db/${database}/data.sql
@@ -8,12 +8,12 @@ spring.thymeleaf.mode=HTML
# JPA
spring.jpa.hibernate.ddl-auto=none
+spring.jpa.open-in-view=false
# Internationalization
spring.messages.basename=messages/messages
-# Actuator / Management
-management.endpoints.web.base-path=/manage
+# Actuator
management.endpoints.web.exposure.include=*
# Logging
diff --git a/src/main/resources/db/h2/data.sql b/src/main/resources/db/h2/data.sql
new file mode 100644
index 00000000000..16dda3e8485
--- /dev/null
+++ b/src/main/resources/db/h2/data.sql
@@ -0,0 +1,53 @@
+INSERT INTO vets VALUES (1, 'James', 'Carter');
+INSERT INTO vets VALUES (2, 'Helen', 'Leary');
+INSERT INTO vets VALUES (3, 'Linda', 'Douglas');
+INSERT INTO vets VALUES (4, 'Rafael', 'Ortega');
+INSERT INTO vets VALUES (5, 'Henry', 'Stevens');
+INSERT INTO vets VALUES (6, 'Sharon', 'Jenkins');
+
+INSERT INTO specialties VALUES (1, 'radiology');
+INSERT INTO specialties VALUES (2, 'surgery');
+INSERT INTO specialties VALUES (3, 'dentistry');
+
+INSERT INTO vet_specialties VALUES (2, 1);
+INSERT INTO vet_specialties VALUES (3, 2);
+INSERT INTO vet_specialties VALUES (3, 3);
+INSERT INTO vet_specialties VALUES (4, 2);
+INSERT INTO vet_specialties VALUES (5, 1);
+
+INSERT INTO types VALUES (1, 'cat');
+INSERT INTO types VALUES (2, 'dog');
+INSERT INTO types VALUES (3, 'lizard');
+INSERT INTO types VALUES (4, 'snake');
+INSERT INTO types VALUES (5, 'bird');
+INSERT INTO types VALUES (6, 'hamster');
+
+INSERT INTO owners VALUES (1, 'George', 'Franklin', '110 W. Liberty St.', 'Madison', '6085551023');
+INSERT INTO owners VALUES (2, 'Betty', 'Davis', '638 Cardinal Ave.', 'Sun Prairie', '6085551749');
+INSERT INTO owners VALUES (3, 'Eduardo', 'Rodriquez', '2693 Commerce St.', 'McFarland', '6085558763');
+INSERT INTO owners VALUES (4, 'Harold', 'Davis', '563 Friendly St.', 'Windsor', '6085553198');
+INSERT INTO owners VALUES (5, 'Peter', 'McTavish', '2387 S. Fair Way', 'Madison', '6085552765');
+INSERT INTO owners VALUES (6, 'Jean', 'Coleman', '105 N. Lake St.', 'Monona', '6085552654');
+INSERT INTO owners VALUES (7, 'Jeff', 'Black', '1450 Oak Blvd.', 'Monona', '6085555387');
+INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', '6085557683');
+INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435');
+INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487');
+
+INSERT INTO pets VALUES (1, 'Leo', '2010-09-07', 1, 1);
+INSERT INTO pets VALUES (2, 'Basil', '2012-08-06', 6, 2);
+INSERT INTO pets VALUES (3, 'Rosy', '2011-04-17', 2, 3);
+INSERT INTO pets VALUES (4, 'Jewel', '2010-03-07', 2, 3);
+INSERT INTO pets VALUES (5, 'Iggy', '2010-11-30', 3, 4);
+INSERT INTO pets VALUES (6, 'George', '2010-01-20', 4, 5);
+INSERT INTO pets VALUES (7, 'Samantha', '2012-09-04', 1, 6);
+INSERT INTO pets VALUES (8, 'Max', '2012-09-04', 1, 6);
+INSERT INTO pets VALUES (9, 'Lucky', '2011-08-06', 5, 7);
+INSERT INTO pets VALUES (10, 'Mulligan', '2007-02-24', 2, 8);
+INSERT INTO pets VALUES (11, 'Freddy', '2010-03-09', 5, 9);
+INSERT INTO pets VALUES (12, 'Lucky', '2010-06-24', 2, 10);
+INSERT INTO pets VALUES (13, 'Sly', '2012-06-08', 1, 10);
+
+INSERT INTO visits VALUES (1, 7, '2013-01-01', 'rabies shot');
+INSERT INTO visits VALUES (2, 8, '2013-01-02', 'rabies shot');
+INSERT INTO visits VALUES (3, 8, '2013-01-03', 'neutered');
+INSERT INTO visits VALUES (4, 7, '2013-01-04', 'spayed');
diff --git a/src/main/resources/db/h2/schema.sql b/src/main/resources/db/h2/schema.sql
new file mode 100644
index 00000000000..f3c6947b7db
--- /dev/null
+++ b/src/main/resources/db/h2/schema.sql
@@ -0,0 +1,64 @@
+DROP TABLE vet_specialties IF EXISTS;
+DROP TABLE vets IF EXISTS;
+DROP TABLE specialties IF EXISTS;
+DROP TABLE visits IF EXISTS;
+DROP TABLE pets IF EXISTS;
+DROP TABLE types IF EXISTS;
+DROP TABLE owners IF EXISTS;
+
+
+CREATE TABLE vets (
+ id INTEGER IDENTITY PRIMARY KEY,
+ first_name VARCHAR(30),
+ last_name VARCHAR(30)
+);
+CREATE INDEX vets_last_name ON vets (last_name);
+
+CREATE TABLE specialties (
+ id INTEGER IDENTITY PRIMARY KEY,
+ name VARCHAR(80)
+);
+CREATE INDEX specialties_name ON specialties (name);
+
+CREATE TABLE vet_specialties (
+ vet_id INTEGER NOT NULL,
+ specialty_id INTEGER NOT NULL
+);
+ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_vets FOREIGN KEY (vet_id) REFERENCES vets (id);
+ALTER TABLE vet_specialties ADD CONSTRAINT fk_vet_specialties_specialties FOREIGN KEY (specialty_id) REFERENCES specialties (id);
+
+CREATE TABLE types (
+ id INTEGER IDENTITY PRIMARY KEY,
+ name VARCHAR(80)
+);
+CREATE INDEX types_name ON types (name);
+
+CREATE TABLE owners (
+ id INTEGER IDENTITY PRIMARY KEY,
+ first_name VARCHAR(30),
+ last_name VARCHAR_IGNORECASE(30),
+ address VARCHAR(255),
+ city VARCHAR(80),
+ telephone VARCHAR(20)
+);
+CREATE INDEX owners_last_name ON owners (last_name);
+
+CREATE TABLE pets (
+ id INTEGER IDENTITY PRIMARY KEY,
+ name VARCHAR(30),
+ birth_date DATE,
+ type_id INTEGER NOT NULL,
+ owner_id INTEGER NOT NULL
+);
+ALTER TABLE pets ADD CONSTRAINT fk_pets_owners FOREIGN KEY (owner_id) REFERENCES owners (id);
+ALTER TABLE pets ADD CONSTRAINT fk_pets_types FOREIGN KEY (type_id) REFERENCES types (id);
+CREATE INDEX pets_name ON pets (name);
+
+CREATE TABLE visits (
+ id INTEGER IDENTITY PRIMARY KEY,
+ pet_id INTEGER NOT NULL,
+ visit_date DATE,
+ description VARCHAR(255)
+);
+ALTER TABLE visits ADD CONSTRAINT fk_visits_pets FOREIGN KEY (pet_id) REFERENCES pets (id);
+CREATE INDEX visits_pet_id ON visits (pet_id);
diff --git a/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt b/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt
index 92090668751..29bb601fe2c 100644
--- a/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt
+++ b/src/main/resources/db/mysql/petclinic_db_setup_mysql.txt
@@ -18,12 +18,15 @@
mysql_1_eedb4818d817 | MySQL init process done. Ready for start up.
...
-2) Create the PetClinic database and user by executing the "db/mysql/{schema,data}.sql"
- scripts (or set "spring.datasource.initialization-mode=always" the first time you run the app).
+2) (Once only) create the PetClinic database and user by executing the "db/mysql/user.sql"
+ scripts. You can connect to the database running in the docker container using
+ `mysql -u root -h localhost --protocol tcp`, but you don't need to run the script there
+ because the petclinic user is already set up if you use the provided `docker-compose.yaml`.
3) Run the app with `spring.profiles.active=mysql` (e.g. as a System property via the command
line, but any way that sets that property in a Spring Boot app should work).
N.B. the "petclinic" database has to exist for the app to work with the JDBC URL value
-as it is configured by default. This condition is taken care of by the docker-compose
-configuration provided, or by the `schema.sql` if you can run that as root.
\ No newline at end of file
+as it is configured by default. This condition is taken care of automatically by the
+docker-compose configuration provided, or by the `user.sql` script if you run that as
+root.
diff --git a/src/main/resources/db/mysql/schema.sql b/src/main/resources/db/mysql/schema.sql
index 6a982598373..eb5d7d5d0c2 100644
--- a/src/main/resources/db/mysql/schema.sql
+++ b/src/main/resources/db/mysql/schema.sql
@@ -1,13 +1,3 @@
-CREATE DATABASE IF NOT EXISTS petclinic;
-
-ALTER DATABASE petclinic
- DEFAULT CHARACTER SET utf8
- DEFAULT COLLATE utf8_general_ci;
-
-GRANT ALL PRIVILEGES ON petclinic.* TO pc@localhost IDENTIFIED BY 'pc';
-
-USE petclinic;
-
CREATE TABLE IF NOT EXISTS vets (
id INT(4) UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
first_name VARCHAR(30),
diff --git a/src/main/resources/db/mysql/user.sql b/src/main/resources/db/mysql/user.sql
new file mode 100644
index 00000000000..60abcee729a
--- /dev/null
+++ b/src/main/resources/db/mysql/user.sql
@@ -0,0 +1,7 @@
+CREATE DATABASE IF NOT EXISTS petclinic;
+
+ALTER DATABASE petclinic
+ DEFAULT CHARACTER SET utf8
+ DEFAULT COLLATE utf8_general_ci;
+
+GRANT ALL PRIVILEGES ON petclinic.* TO 'petclinic@%' IDENTIFIED BY 'petclinic';
diff --git a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java b/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
index 669dbddaa8d..226db01fe84 100644
--- a/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/PetclinicIntegrationTests.java
@@ -16,24 +16,21 @@
package org.springframework.samples.petclinic;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.samples.petclinic.vet.VetRepository;
-import org.springframework.test.context.junit4.SpringRunner;
-@RunWith(SpringRunner.class)
@SpringBootTest
-public class PetclinicIntegrationTests {
+class PetclinicIntegrationTests {
+
+ @Autowired
+ private VetRepository vets;
- @Autowired
- private VetRepository vets;
+ @Test
+ void testFindAll() throws Exception {
+ vets.findAll();
+ vets.findAll(); // served from cache
+ }
- @Test
- public void testFindAll() throws Exception {
- vets.findAll();
- vets.findAll(); // served from cache
- }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
index e37a9656255..8d754900d18 100644
--- a/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/model/ValidatorTests.java
@@ -22,8 +22,7 @@
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
@@ -33,30 +32,29 @@
* @author Michael Isvy Simple test to make sure that Bean Validation is working (useful
* when upgrading to a new version of Hibernate Validator/ Bean Validation)
*/
-public class ValidatorTests {
-
- private Validator createValidator() {
- LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
- localValidatorFactoryBean.afterPropertiesSet();
- return localValidatorFactoryBean;
- }
-
- @Test
- public void shouldNotValidateWhenFirstNameEmpty() {
-
- LocaleContextHolder.setLocale(Locale.ENGLISH);
- Person person = new Person();
- person.setFirstName("");
- person.setLastName("smith");
-
- Validator validator = createValidator();
- Set> constraintViolations = validator
- .validate(person);
-
- assertThat(constraintViolations).hasSize(1);
- ConstraintViolation violation = constraintViolations.iterator().next();
- assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName");
- assertThat(violation.getMessage()).isEqualTo("must not be empty");
- }
+class ValidatorTests {
+
+ private Validator createValidator() {
+ LocalValidatorFactoryBean localValidatorFactoryBean = new LocalValidatorFactoryBean();
+ localValidatorFactoryBean.afterPropertiesSet();
+ return localValidatorFactoryBean;
+ }
+
+ @Test
+ void shouldNotValidateWhenFirstNameEmpty() {
+
+ LocaleContextHolder.setLocale(Locale.ENGLISH);
+ Person person = new Person();
+ person.setFirstName("");
+ person.setLastName("smith");
+
+ Validator validator = createValidator();
+ Set> constraintViolations = validator.validate(person);
+
+ assertThat(constraintViolations).hasSize(1);
+ ConstraintViolation violation = constraintViolations.iterator().next();
+ assertThat(violation.getPropertyPath().toString()).isEqualTo("firstName");
+ assertThat(violation.getMessage()).isEqualTo("must not be empty");
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
index 5084f424559..1d6249c5d76 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
@@ -23,16 +23,13 @@
import org.assertj.core.util.Lists;
import org.hamcrest.BaseMatcher;
import org.hamcrest.Description;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.samples.petclinic.visit.Visit;
import org.springframework.samples.petclinic.visit.VisitRepository;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import static org.hamcrest.Matchers.empty;
@@ -51,185 +48,152 @@
*
* @author Colin But
*/
-@RunWith(SpringRunner.class)
@WebMvcTest(OwnerController.class)
-public class OwnerControllerTests {
-
- private static final int TEST_OWNER_ID = 1;
-
- @Autowired
- private MockMvc mockMvc;
-
- @MockBean
- private OwnerRepository owners;
-
- @MockBean
- private VisitRepository visits;
-
- private Owner george;
-
- @Before
- public void setup() {
- george = new Owner();
- george.setId(TEST_OWNER_ID);
- george.setFirstName("George");
- george.setLastName("Franklin");
- george.setAddress("110 W. Liberty St.");
- george.setCity("Madison");
- george.setTelephone("6085551023");
- Pet max = new Pet();
- PetType dog = new PetType();
- dog.setName("dog");
- max.setId(1);
- max.setType(dog);
- max.setName("Max");
- max.setBirthDate(LocalDate.now());
- george.setPetsInternal(Collections.singleton(max));
- given(this.owners.findById(TEST_OWNER_ID)).willReturn(george);
- Visit visit = new Visit();
- visit.setDate(LocalDate.now());
- given(this.visits.findByPetId(max.getId())).willReturn(Collections.singletonList(visit));
- }
-
- @Test
- public void testInitCreationForm() throws Exception {
- mockMvc.perform(get("/owners/new"))
- .andExpect(status().isOk())
- .andExpect(model().attributeExists("owner"))
- .andExpect(view().name("owners/createOrUpdateOwnerForm"));
- }
-
- @Test
- public void testProcessCreationFormSuccess() throws Exception {
- mockMvc.perform(post("/owners/new")
- .param("firstName", "Joe")
- .param("lastName", "Bloggs")
- .param("address", "123 Caramel Street")
- .param("city", "London")
- .param("telephone", "01316761638")
- )
- .andExpect(status().is3xxRedirection());
- }
-
- @Test
- public void testProcessCreationFormHasErrors() throws Exception {
- mockMvc.perform(post("/owners/new")
- .param("firstName", "Joe")
- .param("lastName", "Bloggs")
- .param("city", "London")
- )
- .andExpect(status().isOk())
- .andExpect(model().attributeHasErrors("owner"))
- .andExpect(model().attributeHasFieldErrors("owner", "address"))
- .andExpect(model().attributeHasFieldErrors("owner", "telephone"))
- .andExpect(view().name("owners/createOrUpdateOwnerForm"));
- }
-
- @Test
- public void testInitFindForm() throws Exception {
- mockMvc.perform(get("/owners/find"))
- .andExpect(status().isOk())
- .andExpect(model().attributeExists("owner"))
- .andExpect(view().name("owners/findOwners"));
- }
-
- @Test
- public void testProcessFindFormSuccess() throws Exception {
- given(this.owners.findByLastName("")).willReturn(Lists.newArrayList(george, new Owner()));
- mockMvc.perform(get("/owners"))
- .andExpect(status().isOk())
- .andExpect(view().name("owners/ownersList"));
- }
-
- @Test
- public void testProcessFindFormByLastName() throws Exception {
- given(this.owners.findByLastName(george.getLastName())).willReturn(Lists.newArrayList(george));
- mockMvc.perform(get("/owners")
- .param("lastName", "Franklin")
- )
- .andExpect(status().is3xxRedirection())
- .andExpect(view().name("redirect:/owners/" + TEST_OWNER_ID));
- }
-
- @Test
- public void testProcessFindFormNoOwnersFound() throws Exception {
- mockMvc.perform(get("/owners")
- .param("lastName", "Unknown Surname")
- )
- .andExpect(status().isOk())
- .andExpect(model().attributeHasFieldErrors("owner", "lastName"))
- .andExpect(model().attributeHasFieldErrorCode("owner", "lastName", "notFound"))
- .andExpect(view().name("owners/findOwners"));
- }
-
- @Test
- public void testInitUpdateOwnerForm() throws Exception {
- mockMvc.perform(get("/owners/{ownerId}/edit", TEST_OWNER_ID))
- .andExpect(status().isOk())
- .andExpect(model().attributeExists("owner"))
- .andExpect(model().attribute("owner", hasProperty("lastName", is("Franklin"))))
- .andExpect(model().attribute("owner", hasProperty("firstName", is("George"))))
- .andExpect(model().attribute("owner", hasProperty("address", is("110 W. Liberty St."))))
- .andExpect(model().attribute("owner", hasProperty("city", is("Madison"))))
- .andExpect(model().attribute("owner", hasProperty("telephone", is("6085551023"))))
- .andExpect(view().name("owners/createOrUpdateOwnerForm"));
- }
-
- @Test
- public void testProcessUpdateOwnerFormSuccess() throws Exception {
- mockMvc.perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID)
- .param("firstName", "Joe")
- .param("lastName", "Bloggs")
- .param("address", "123 Caramel Street")
- .param("city", "London")
- .param("telephone", "01616291589")
- )
- .andExpect(status().is3xxRedirection())
- .andExpect(view().name("redirect:/owners/{ownerId}"));
- }
-
- @Test
- public void testProcessUpdateOwnerFormHasErrors() throws Exception {
- mockMvc.perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID)
- .param("firstName", "Joe")
- .param("lastName", "Bloggs")
- .param("city", "London")
- )
- .andExpect(status().isOk())
- .andExpect(model().attributeHasErrors("owner"))
- .andExpect(model().attributeHasFieldErrors("owner", "address"))
- .andExpect(model().attributeHasFieldErrors("owner", "telephone"))
- .andExpect(view().name("owners/createOrUpdateOwnerForm"));
- }
-
- @Test
- public void testShowOwner() throws Exception {
- mockMvc.perform(get("/owners/{ownerId}", TEST_OWNER_ID))
- .andExpect(status().isOk())
- .andExpect(model().attribute("owner", hasProperty("lastName", is("Franklin"))))
- .andExpect(model().attribute("owner", hasProperty("firstName", is("George"))))
- .andExpect(model().attribute("owner", hasProperty("address", is("110 W. Liberty St."))))
- .andExpect(model().attribute("owner", hasProperty("city", is("Madison"))))
- .andExpect(model().attribute("owner", hasProperty("telephone", is("6085551023"))))
- .andExpect(model().attribute("owner", hasProperty("pets", not(empty()))))
- .andExpect(model().attribute("owner", hasProperty("pets", new BaseMatcher>() {
-
- @Override
- public boolean matches(Object item) {
- @SuppressWarnings("unchecked")
- List pets = (List) item;
- Pet pet = pets.get(0);
- if (pet.getVisits().isEmpty()) {
- return false;
- }
- return true;
- }
-
- @Override
- public void describeTo(Description description) {
- description.appendText("Max did not have any visits");
- }})))
- .andExpect(view().name("owners/ownerDetails"));
- }
+class OwnerControllerTests {
+
+ private static final int TEST_OWNER_ID = 1;
+
+ @Autowired
+ private MockMvc mockMvc;
+
+ @MockBean
+ private OwnerRepository owners;
+
+ @MockBean
+ private VisitRepository visits;
+
+ private Owner george;
+
+ @BeforeEach
+ void setup() {
+ george = new Owner();
+ george.setId(TEST_OWNER_ID);
+ george.setFirstName("George");
+ george.setLastName("Franklin");
+ george.setAddress("110 W. Liberty St.");
+ george.setCity("Madison");
+ george.setTelephone("6085551023");
+ Pet max = new Pet();
+ PetType dog = new PetType();
+ dog.setName("dog");
+ max.setId(1);
+ max.setType(dog);
+ max.setName("Max");
+ max.setBirthDate(LocalDate.now());
+ george.setPetsInternal(Collections.singleton(max));
+ given(this.owners.findById(TEST_OWNER_ID)).willReturn(george);
+ Visit visit = new Visit();
+ visit.setDate(LocalDate.now());
+ given(this.visits.findByPetId(max.getId())).willReturn(Collections.singletonList(visit));
+ }
+
+ @Test
+ void testInitCreationForm() throws Exception {
+ mockMvc.perform(get("/owners/new")).andExpect(status().isOk()).andExpect(model().attributeExists("owner"))
+ .andExpect(view().name("owners/createOrUpdateOwnerForm"));
+ }
+
+ @Test
+ void testProcessCreationFormSuccess() throws Exception {
+ mockMvc.perform(post("/owners/new").param("firstName", "Joe").param("lastName", "Bloggs")
+ .param("address", "123 Caramel Street").param("city", "London").param("telephone", "01316761638"))
+ .andExpect(status().is3xxRedirection());
+ }
+
+ @Test
+ void testProcessCreationFormHasErrors() throws Exception {
+ mockMvc.perform(
+ post("/owners/new").param("firstName", "Joe").param("lastName", "Bloggs").param("city", "London"))
+ .andExpect(status().isOk()).andExpect(model().attributeHasErrors("owner"))
+ .andExpect(model().attributeHasFieldErrors("owner", "address"))
+ .andExpect(model().attributeHasFieldErrors("owner", "telephone"))
+ .andExpect(view().name("owners/createOrUpdateOwnerForm"));
+ }
+
+ @Test
+ void testInitFindForm() throws Exception {
+ mockMvc.perform(get("/owners/find")).andExpect(status().isOk()).andExpect(model().attributeExists("owner"))
+ .andExpect(view().name("owners/findOwners"));
+ }
+
+ @Test
+ void testProcessFindFormSuccess() throws Exception {
+ given(this.owners.findByLastName("")).willReturn(Lists.newArrayList(george, new Owner()));
+ mockMvc.perform(get("/owners")).andExpect(status().isOk()).andExpect(view().name("owners/ownersList"));
+ }
+
+ @Test
+ void testProcessFindFormByLastName() throws Exception {
+ given(this.owners.findByLastName(george.getLastName())).willReturn(Lists.newArrayList(george));
+ mockMvc.perform(get("/owners").param("lastName", "Franklin")).andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/" + TEST_OWNER_ID));
+ }
+
+ @Test
+ void testProcessFindFormNoOwnersFound() throws Exception {
+ mockMvc.perform(get("/owners").param("lastName", "Unknown Surname")).andExpect(status().isOk())
+ .andExpect(model().attributeHasFieldErrors("owner", "lastName"))
+ .andExpect(model().attributeHasFieldErrorCode("owner", "lastName", "notFound"))
+ .andExpect(view().name("owners/findOwners"));
+ }
+
+ @Test
+ void testInitUpdateOwnerForm() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}/edit", TEST_OWNER_ID)).andExpect(status().isOk())
+ .andExpect(model().attributeExists("owner"))
+ .andExpect(model().attribute("owner", hasProperty("lastName", is("Franklin"))))
+ .andExpect(model().attribute("owner", hasProperty("firstName", is("George"))))
+ .andExpect(model().attribute("owner", hasProperty("address", is("110 W. Liberty St."))))
+ .andExpect(model().attribute("owner", hasProperty("city", is("Madison"))))
+ .andExpect(model().attribute("owner", hasProperty("telephone", is("6085551023"))))
+ .andExpect(view().name("owners/createOrUpdateOwnerForm"));
+ }
+
+ @Test
+ void testProcessUpdateOwnerFormSuccess() throws Exception {
+ mockMvc.perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID).param("firstName", "Joe")
+ .param("lastName", "Bloggs").param("address", "123 Caramel Street").param("city", "London")
+ .param("telephone", "01616291589")).andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
+
+ @Test
+ void testProcessUpdateOwnerFormHasErrors() throws Exception {
+ mockMvc.perform(post("/owners/{ownerId}/edit", TEST_OWNER_ID).param("firstName", "Joe")
+ .param("lastName", "Bloggs").param("city", "London")).andExpect(status().isOk())
+ .andExpect(model().attributeHasErrors("owner"))
+ .andExpect(model().attributeHasFieldErrors("owner", "address"))
+ .andExpect(model().attributeHasFieldErrors("owner", "telephone"))
+ .andExpect(view().name("owners/createOrUpdateOwnerForm"));
+ }
+
+ @Test
+ void testShowOwner() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}", TEST_OWNER_ID)).andExpect(status().isOk())
+ .andExpect(model().attribute("owner", hasProperty("lastName", is("Franklin"))))
+ .andExpect(model().attribute("owner", hasProperty("firstName", is("George"))))
+ .andExpect(model().attribute("owner", hasProperty("address", is("110 W. Liberty St."))))
+ .andExpect(model().attribute("owner", hasProperty("city", is("Madison"))))
+ .andExpect(model().attribute("owner", hasProperty("telephone", is("6085551023"))))
+ .andExpect(model().attribute("owner", hasProperty("pets", not(empty()))))
+ .andExpect(model().attribute("owner", hasProperty("pets", new BaseMatcher>() {
+
+ @Override
+ public boolean matches(Object item) {
+ @SuppressWarnings("unchecked")
+ List pets = (List) item;
+ Pet pet = pets.get(0);
+ if (pet.getVisits().isEmpty()) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("Max did not have any visits");
+ }
+ }))).andExpect(view().name("owners/ownerDetails"));
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
index 2ffae30255d..47c444a7858 100755
--- a/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/PetControllerTests.java
@@ -24,22 +24,13 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
import org.assertj.core.util.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.FilterType;
-import org.springframework.samples.petclinic.owner.Owner;
-import org.springframework.samples.petclinic.owner.OwnerRepository;
-import org.springframework.samples.petclinic.owner.Pet;
-import org.springframework.samples.petclinic.owner.PetController;
-import org.springframework.samples.petclinic.owner.PetRepository;
-import org.springframework.samples.petclinic.owner.PetType;
-import org.springframework.samples.petclinic.owner.PetTypeFormatter;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
/**
@@ -47,99 +38,76 @@
*
* @author Colin But
*/
-@RunWith(SpringRunner.class)
@WebMvcTest(value = PetController.class,
- includeFilters = @ComponentScan.Filter(
- value = PetTypeFormatter.class,
- type = FilterType.ASSIGNABLE_TYPE))
-public class PetControllerTests {
-
- private static final int TEST_OWNER_ID = 1;
- private static final int TEST_PET_ID = 1;
-
-
- @Autowired
- private MockMvc mockMvc;
-
- @MockBean
- private PetRepository pets;
-
- @MockBean
- private OwnerRepository owners;
-
- @Before
- public void setup() {
- PetType cat = new PetType();
- cat.setId(3);
- cat.setName("hamster");
- given(this.pets.findPetTypes()).willReturn(Lists.newArrayList(cat));
- given(this.owners.findById(TEST_OWNER_ID)).willReturn(new Owner());
- given(this.pets.findById(TEST_PET_ID)).willReturn(new Pet());
-
- }
-
- @Test
- public void testInitCreationForm() throws Exception {
- mockMvc.perform(get("/owners/{ownerId}/pets/new", TEST_OWNER_ID))
- .andExpect(status().isOk())
- .andExpect(view().name("pets/createOrUpdatePetForm"))
- .andExpect(model().attributeExists("pet"));
- }
-
- @Test
- public void testProcessCreationFormSuccess() throws Exception {
- mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID)
- .param("name", "Betty")
- .param("type", "hamster")
- .param("birthDate", "2015-02-12")
- )
- .andExpect(status().is3xxRedirection())
- .andExpect(view().name("redirect:/owners/{ownerId}"));
- }
-
- @Test
- public void testProcessCreationFormHasErrors() throws Exception {
- mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID)
- .param("name", "Betty")
- .param("birthDate", "2015-02-12")
- )
- .andExpect(model().attributeHasNoErrors("owner"))
- .andExpect(model().attributeHasErrors("pet"))
- .andExpect(model().attributeHasFieldErrors("pet", "type"))
- .andExpect(model().attributeHasFieldErrorCode("pet", "type", "required"))
- .andExpect(status().isOk())
- .andExpect(view().name("pets/createOrUpdatePetForm"));
- }
-
- @Test
- public void testInitUpdateForm() throws Exception {
- mockMvc.perform(get("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID))
- .andExpect(status().isOk())
- .andExpect(model().attributeExists("pet"))
- .andExpect(view().name("pets/createOrUpdatePetForm"));
- }
-
- @Test
- public void testProcessUpdateFormSuccess() throws Exception {
- mockMvc.perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID)
- .param("name", "Betty")
- .param("type", "hamster")
- .param("birthDate", "2015-02-12")
- )
- .andExpect(status().is3xxRedirection())
- .andExpect(view().name("redirect:/owners/{ownerId}"));
- }
-
- @Test
- public void testProcessUpdateFormHasErrors() throws Exception {
- mockMvc.perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID)
- .param("name", "Betty")
- .param("birthDate", "2015/02/12")
- )
- .andExpect(model().attributeHasNoErrors("owner"))
- .andExpect(model().attributeHasErrors("pet"))
- .andExpect(status().isOk())
- .andExpect(view().name("pets/createOrUpdatePetForm"));
- }
+ includeFilters = @ComponentScan.Filter(value = PetTypeFormatter.class, type = FilterType.ASSIGNABLE_TYPE))
+class PetControllerTests {
+
+ private static final int TEST_OWNER_ID = 1;
+
+ private static final int TEST_PET_ID = 1;
+
+ @Autowired
+ private MockMvc mockMvc;
+
+ @MockBean
+ private PetRepository pets;
+
+ @MockBean
+ private OwnerRepository owners;
+
+ @BeforeEach
+ void setup() {
+ PetType cat = new PetType();
+ cat.setId(3);
+ cat.setName("hamster");
+ given(this.pets.findPetTypes()).willReturn(Lists.newArrayList(cat));
+ given(this.owners.findById(TEST_OWNER_ID)).willReturn(new Owner());
+ given(this.pets.findById(TEST_PET_ID)).willReturn(new Pet());
+
+ }
+
+ @Test
+ void testInitCreationForm() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}/pets/new", TEST_OWNER_ID)).andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdatePetForm")).andExpect(model().attributeExists("pet"));
+ }
+
+ @Test
+ void testProcessCreationFormSuccess() throws Exception {
+ mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID).param("name", "Betty")
+ .param("type", "hamster").param("birthDate", "2015-02-12")).andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
+
+ @Test
+ void testProcessCreationFormHasErrors() throws Exception {
+ mockMvc.perform(post("/owners/{ownerId}/pets/new", TEST_OWNER_ID).param("name", "Betty").param("birthDate",
+ "2015-02-12")).andExpect(model().attributeHasNoErrors("owner"))
+ .andExpect(model().attributeHasErrors("pet")).andExpect(model().attributeHasFieldErrors("pet", "type"))
+ .andExpect(model().attributeHasFieldErrorCode("pet", "type", "required")).andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdatePetForm"));
+ }
+
+ @Test
+ void testInitUpdateForm() throws Exception {
+ mockMvc.perform(get("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID))
+ .andExpect(status().isOk()).andExpect(model().attributeExists("pet"))
+ .andExpect(view().name("pets/createOrUpdatePetForm"));
+ }
+
+ @Test
+ void testProcessUpdateFormSuccess() throws Exception {
+ mockMvc.perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID).param("name", "Betty")
+ .param("type", "hamster").param("birthDate", "2015-02-12")).andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
+
+ @Test
+ void testProcessUpdateFormHasErrors() throws Exception {
+ mockMvc.perform(post("/owners/{ownerId}/pets/{petId}/edit", TEST_OWNER_ID, TEST_PET_ID).param("name", "Betty")
+ .param("birthDate", "2015/02/12")).andExpect(model().attributeHasNoErrors("owner"))
+ .andExpect(model().attributeHasErrors("pet")).andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdatePetForm"));
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
index 9ba43148019..adb96b69dbd 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/PetTypeFormatterTests.java
@@ -22,11 +22,12 @@
import java.util.List;
import java.util.Locale;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.BDDMockito.given;
@@ -36,58 +37,59 @@
*
* @author Colin But
*/
-@RunWith(MockitoJUnitRunner.class)
-public class PetTypeFormatterTests {
+@ExtendWith(MockitoExtension.class)
+class PetTypeFormatterTests {
- @Mock
- private PetRepository pets;
+ @Mock
+ private PetRepository pets;
- private PetTypeFormatter petTypeFormatter;
+ private PetTypeFormatter petTypeFormatter;
- @Before
- public void setup() {
- this.petTypeFormatter = new PetTypeFormatter(pets);
- }
+ @BeforeEach
+ void setup() {
+ this.petTypeFormatter = new PetTypeFormatter(pets);
+ }
- @Test
- public void testPrint() {
- PetType petType = new PetType();
- petType.setName("Hamster");
- String petTypeName = this.petTypeFormatter.print(petType, Locale.ENGLISH);
- assertThat(petTypeName).isEqualTo("Hamster");
- }
+ @Test
+ void testPrint() {
+ PetType petType = new PetType();
+ petType.setName("Hamster");
+ String petTypeName = this.petTypeFormatter.print(petType, Locale.ENGLISH);
+ assertThat(petTypeName).isEqualTo("Hamster");
+ }
- @Test
- public void shouldParse() throws ParseException {
- given(this.pets.findPetTypes()).willReturn(makePetTypes());
- PetType petType = petTypeFormatter.parse("Bird", Locale.ENGLISH);
- assertThat(petType.getName()).isEqualTo("Bird");
- }
+ @Test
+ void shouldParse() throws ParseException {
+ given(this.pets.findPetTypes()).willReturn(makePetTypes());
+ PetType petType = petTypeFormatter.parse("Bird", Locale.ENGLISH);
+ assertThat(petType.getName()).isEqualTo("Bird");
+ }
- @Test(expected = ParseException.class)
- public void shouldThrowParseException() throws ParseException {
- given(this.pets.findPetTypes()).willReturn(makePetTypes());
- petTypeFormatter.parse("Fish", Locale.ENGLISH);
- }
+ @Test
+ void shouldThrowParseException() throws ParseException {
+ given(this.pets.findPetTypes()).willReturn(makePetTypes());
+ Assertions.assertThrows(ParseException.class, () -> {
+ petTypeFormatter.parse("Fish", Locale.ENGLISH);
+ });
+ }
- /**
- * Helper method to produce some sample pet types just for test purpose
- *
- * @return {@link Collection} of {@link PetType}
- */
- private List makePetTypes() {
- List petTypes = new ArrayList<>();
- petTypes.add(new PetType() {
- {
- setName("Dog");
- }
- });
- petTypes.add(new PetType() {
- {
- setName("Bird");
- }
- });
- return petTypes;
- }
+ /**
+ * Helper method to produce some sample pet types just for test purpose
+ * @return {@link Collection} of {@link PetType}
+ */
+ private List makePetTypes() {
+ List petTypes = new ArrayList<>();
+ petTypes.add(new PetType() {
+ {
+ setName("Dog");
+ }
+ });
+ petTypes.add(new PetType() {
+ {
+ setName("Bird");
+ }
+ });
+ return petTypes;
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
index 3edd2095933..84bee72df18 100644
--- a/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/owner/VisitControllerTests.java
@@ -23,17 +23,12 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.samples.petclinic.owner.Pet;
-import org.springframework.samples.petclinic.owner.PetRepository;
-import org.springframework.samples.petclinic.owner.VisitController;
import org.springframework.samples.petclinic.visit.VisitRepository;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
/**
@@ -41,51 +36,43 @@
*
* @author Colin But
*/
-@RunWith(SpringRunner.class)
@WebMvcTest(VisitController.class)
-public class VisitControllerTests {
+class VisitControllerTests {
- private static final int TEST_PET_ID = 1;
+ private static final int TEST_PET_ID = 1;
- @Autowired
- private MockMvc mockMvc;
+ @Autowired
+ private MockMvc mockMvc;
- @MockBean
- private VisitRepository visits;
+ @MockBean
+ private VisitRepository visits;
- @MockBean
- private PetRepository pets;
+ @MockBean
+ private PetRepository pets;
- @Before
- public void init() {
- given(this.pets.findById(TEST_PET_ID)).willReturn(new Pet());
- }
+ @BeforeEach
+ void init() {
+ given(this.pets.findById(TEST_PET_ID)).willReturn(new Pet());
+ }
- @Test
- public void testInitNewVisitForm() throws Exception {
- mockMvc.perform(get("/owners/*/pets/{petId}/visits/new", TEST_PET_ID))
- .andExpect(status().isOk())
- .andExpect(view().name("pets/createOrUpdateVisitForm"));
- }
+ @Test
+ void testInitNewVisitForm() throws Exception {
+ mockMvc.perform(get("/owners/*/pets/{petId}/visits/new", TEST_PET_ID)).andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdateVisitForm"));
+ }
- @Test
- public void testProcessNewVisitFormSuccess() throws Exception {
- mockMvc.perform(post("/owners/*/pets/{petId}/visits/new", TEST_PET_ID)
- .param("name", "George")
- .param("description", "Visit Description")
- )
- .andExpect(status().is3xxRedirection())
- .andExpect(view().name("redirect:/owners/{ownerId}"));
- }
+ @Test
+ void testProcessNewVisitFormSuccess() throws Exception {
+ mockMvc.perform(post("/owners/*/pets/{petId}/visits/new", TEST_PET_ID).param("name", "George")
+ .param("description", "Visit Description")).andExpect(status().is3xxRedirection())
+ .andExpect(view().name("redirect:/owners/{ownerId}"));
+ }
- @Test
- public void testProcessNewVisitFormHasErrors() throws Exception {
- mockMvc.perform(post("/owners/*/pets/{petId}/visits/new", TEST_PET_ID)
- .param("name", "George")
- )
- .andExpect(model().attributeHasErrors("visit"))
- .andExpect(status().isOk())
- .andExpect(view().name("pets/createOrUpdateVisitForm"));
- }
+ @Test
+ void testProcessNewVisitFormHasErrors() throws Exception {
+ mockMvc.perform(post("/owners/*/pets/{petId}/visits/new", TEST_PET_ID).param("name", "George"))
+ .andExpect(model().attributeHasErrors("visit")).andExpect(status().isOk())
+ .andExpect(view().name("pets/createOrUpdateVisitForm"));
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
index c103caac0c4..a7f3d9d24a4 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
@@ -21,8 +21,7 @@
import java.time.LocalDate;
import java.util.Collection;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
import org.springframework.context.annotation.ComponentScan;
@@ -36,21 +35,29 @@
import org.springframework.samples.petclinic.visit.Visit;
import org.springframework.samples.petclinic.visit.VisitRepository;
import org.springframework.stereotype.Service;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.transaction.annotation.Transactional;
/**
* Integration test of the Service and the Repository layer.
*
- * ClinicServiceSpringDataJpaTests subclasses benefit from the following services provided by the Spring
- * TestContext Framework:
- Spring IoC container caching which spares us unnecessary set up
- * time between test execution.
- Dependency Injection of test fixture instances, meaning that
- * we don't need to perform application context lookups. See the use of {@link Autowired @Autowired} on the
{@link
- * ClinicServiceTests#clinicService clinicService} instance variable, which uses autowiring by
- * type. - Transaction management, meaning each test method is executed in its own transaction,
- * which is automatically rolled back by default. Thus, even if tests insert or otherwise change database state, there
- * is no need for a teardown or cleanup script.
- An {@link org.springframework.context.ApplicationContext
- * ApplicationContext} is also inherited and can be used for explicit bean lookup if necessary.
+ * ClinicServiceSpringDataJpaTests subclasses benefit from the following services provided
+ * by the Spring TestContext Framework:
+ *
+ *
+ * - Spring IoC container caching which spares us unnecessary set up
+ * time between test execution.
+ * - Dependency Injection of test fixture instances, meaning that we
+ * don't need to perform application context lookups. See the use of
+ * {@link Autowired @Autowired} on the
{@link
+ * ClinicServiceTests#clinicService clinicService} instance variable, which uses
+ * autowiring by type.
+ * - Transaction management, meaning each test method is executed in
+ * its own transaction, which is automatically rolled back by default. Thus, even if tests
+ * insert or otherwise change database state, there is no need for a teardown or cleanup
+ * script.
+ *
- An {@link org.springframework.context.ApplicationContext ApplicationContext} is
+ * also inherited and can be used for explicit bean lookup if necessary.
+ *
*
* @author Ken Krebs
* @author Rod Johnson
@@ -59,164 +66,162 @@
* @author Michael Isvy
* @author Dave Syer
*/
-
-@RunWith(SpringRunner.class)
@DataJpaTest(includeFilters = @ComponentScan.Filter(Service.class))
-public class ClinicServiceTests {
-
- @Autowired
- protected OwnerRepository owners;
-
- @Autowired
- protected PetRepository pets;
-
- @Autowired
- protected VisitRepository visits;
-
- @Autowired
- protected VetRepository vets;
-
- @Test
- public void shouldFindOwnersByLastName() {
- Collection owners = this.owners.findByLastName("Davis");
- assertThat(owners).hasSize(2);
-
- owners = this.owners.findByLastName("Daviss");
- assertThat(owners).isEmpty();
- }
-
- @Test
- public void shouldFindSingleOwnerWithPet() {
- Owner owner = this.owners.findById(1);
- assertThat(owner.getLastName()).startsWith("Franklin");
- assertThat(owner.getPets()).hasSize(1);
- assertThat(owner.getPets().get(0).getType()).isNotNull();
- assertThat(owner.getPets().get(0).getType().getName()).isEqualTo("cat");
- }
-
- @Test
- @Transactional
- public void shouldInsertOwner() {
- Collection owners = this.owners.findByLastName("Schultz");
- int found = owners.size();
-
- Owner owner = new Owner();
- owner.setFirstName("Sam");
- owner.setLastName("Schultz");
- owner.setAddress("4, Evans Street");
- owner.setCity("Wollongong");
- owner.setTelephone("4444444444");
- this.owners.save(owner);
- assertThat(owner.getId().longValue()).isNotEqualTo(0);
-
- owners = this.owners.findByLastName("Schultz");
- assertThat(owners.size()).isEqualTo(found + 1);
- }
-
- @Test
- @Transactional
- public void shouldUpdateOwner() {
- Owner owner = this.owners.findById(1);
- String oldLastName = owner.getLastName();
- String newLastName = oldLastName + "X";
-
- owner.setLastName(newLastName);
- this.owners.save(owner);
-
- // retrieving new name from database
- owner = this.owners.findById(1);
- assertThat(owner.getLastName()).isEqualTo(newLastName);
- }
-
- @Test
- public void shouldFindPetWithCorrectId() {
- Pet pet7 = this.pets.findById(7);
- assertThat(pet7.getName()).startsWith("Samantha");
- assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean");
-
- }
-
- @Test
- public void shouldFindAllPetTypes() {
- Collection petTypes = this.pets.findPetTypes();
-
- PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1);
- assertThat(petType1.getName()).isEqualTo("cat");
- PetType petType4 = EntityUtils.getById(petTypes, PetType.class, 4);
- assertThat(petType4.getName()).isEqualTo("snake");
- }
-
- @Test
- @Transactional
- public void shouldInsertPetIntoDatabaseAndGenerateId() {
- Owner owner6 = this.owners.findById(6);
- int found = owner6.getPets().size();
-
- Pet pet = new Pet();
- pet.setName("bowser");
- Collection types = this.pets.findPetTypes();
- pet.setType(EntityUtils.getById(types, PetType.class, 2));
- pet.setBirthDate(LocalDate.now());
- owner6.addPet(pet);
- assertThat(owner6.getPets().size()).isEqualTo(found + 1);
-
- this.pets.save(pet);
- this.owners.save(owner6);
-
- owner6 = this.owners.findById(6);
- assertThat(owner6.getPets().size()).isEqualTo(found + 1);
- // checks that id has been generated
- assertThat(pet.getId()).isNotNull();
- }
-
- @Test
- @Transactional
- public void shouldUpdatePetName() throws Exception {
- Pet pet7 = this.pets.findById(7);
- String oldName = pet7.getName();
-
- String newName = oldName + "X";
- pet7.setName(newName);
- this.pets.save(pet7);
-
- pet7 = this.pets.findById(7);
- assertThat(pet7.getName()).isEqualTo(newName);
- }
-
- @Test
- public void shouldFindVets() {
- Collection vets = this.vets.findAll();
-
- Vet vet = EntityUtils.getById(vets, Vet.class, 3);
- assertThat(vet.getLastName()).isEqualTo("Douglas");
- assertThat(vet.getNrOfSpecialties()).isEqualTo(2);
- assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry");
- assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery");
- }
-
- @Test
- @Transactional
- public void shouldAddNewVisitForPet() {
- Pet pet7 = this.pets.findById(7);
- int found = pet7.getVisits().size();
- Visit visit = new Visit();
- pet7.addVisit(visit);
- visit.setDescription("test");
- this.visits.save(visit);
- this.pets.save(pet7);
-
- pet7 = this.pets.findById(7);
- assertThat(pet7.getVisits().size()).isEqualTo(found + 1);
- assertThat(visit.getId()).isNotNull();
- }
-
- @Test
- public void shouldFindVisitsByPetId() throws Exception {
- Collection visits = this.visits.findByPetId(7);
- assertThat(visits).hasSize(2);
- Visit[] visitArr = visits.toArray(new Visit[visits.size()]);
- assertThat(visitArr[0].getDate()).isNotNull();
- assertThat(visitArr[0].getPetId()).isEqualTo(7);
- }
+class ClinicServiceTests {
+
+ @Autowired
+ protected OwnerRepository owners;
+
+ @Autowired
+ protected PetRepository pets;
+
+ @Autowired
+ protected VisitRepository visits;
+
+ @Autowired
+ protected VetRepository vets;
+
+ @Test
+ void shouldFindOwnersByLastName() {
+ Collection owners = this.owners.findByLastName("Davis");
+ assertThat(owners).hasSize(2);
+
+ owners = this.owners.findByLastName("Daviss");
+ assertThat(owners).isEmpty();
+ }
+
+ @Test
+ void shouldFindSingleOwnerWithPet() {
+ Owner owner = this.owners.findById(1);
+ assertThat(owner.getLastName()).startsWith("Franklin");
+ assertThat(owner.getPets()).hasSize(1);
+ assertThat(owner.getPets().get(0).getType()).isNotNull();
+ assertThat(owner.getPets().get(0).getType().getName()).isEqualTo("cat");
+ }
+
+ @Test
+ @Transactional
+ void shouldInsertOwner() {
+ Collection owners = this.owners.findByLastName("Schultz");
+ int found = owners.size();
+
+ Owner owner = new Owner();
+ owner.setFirstName("Sam");
+ owner.setLastName("Schultz");
+ owner.setAddress("4, Evans Street");
+ owner.setCity("Wollongong");
+ owner.setTelephone("4444444444");
+ this.owners.save(owner);
+ assertThat(owner.getId().longValue()).isNotEqualTo(0);
+
+ owners = this.owners.findByLastName("Schultz");
+ assertThat(owners.size()).isEqualTo(found + 1);
+ }
+
+ @Test
+ @Transactional
+ void shouldUpdateOwner() {
+ Owner owner = this.owners.findById(1);
+ String oldLastName = owner.getLastName();
+ String newLastName = oldLastName + "X";
+
+ owner.setLastName(newLastName);
+ this.owners.save(owner);
+
+ // retrieving new name from database
+ owner = this.owners.findById(1);
+ assertThat(owner.getLastName()).isEqualTo(newLastName);
+ }
+
+ @Test
+ void shouldFindPetWithCorrectId() {
+ Pet pet7 = this.pets.findById(7);
+ assertThat(pet7.getName()).startsWith("Samantha");
+ assertThat(pet7.getOwner().getFirstName()).isEqualTo("Jean");
+
+ }
+
+ @Test
+ void shouldFindAllPetTypes() {
+ Collection petTypes = this.pets.findPetTypes();
+
+ PetType petType1 = EntityUtils.getById(petTypes, PetType.class, 1);
+ assertThat(petType1.getName()).isEqualTo("cat");
+ PetType petType4 = EntityUtils.getById(petTypes, PetType.class, 4);
+ assertThat(petType4.getName()).isEqualTo("snake");
+ }
+
+ @Test
+ @Transactional
+ void shouldInsertPetIntoDatabaseAndGenerateId() {
+ Owner owner6 = this.owners.findById(6);
+ int found = owner6.getPets().size();
+
+ Pet pet = new Pet();
+ pet.setName("bowser");
+ Collection types = this.pets.findPetTypes();
+ pet.setType(EntityUtils.getById(types, PetType.class, 2));
+ pet.setBirthDate(LocalDate.now());
+ owner6.addPet(pet);
+ assertThat(owner6.getPets().size()).isEqualTo(found + 1);
+
+ this.pets.save(pet);
+ this.owners.save(owner6);
+
+ owner6 = this.owners.findById(6);
+ assertThat(owner6.getPets().size()).isEqualTo(found + 1);
+ // checks that id has been generated
+ assertThat(pet.getId()).isNotNull();
+ }
+
+ @Test
+ @Transactional
+ void shouldUpdatePetName() throws Exception {
+ Pet pet7 = this.pets.findById(7);
+ String oldName = pet7.getName();
+
+ String newName = oldName + "X";
+ pet7.setName(newName);
+ this.pets.save(pet7);
+
+ pet7 = this.pets.findById(7);
+ assertThat(pet7.getName()).isEqualTo(newName);
+ }
+
+ @Test
+ void shouldFindVets() {
+ Collection vets = this.vets.findAll();
+
+ Vet vet = EntityUtils.getById(vets, Vet.class, 3);
+ assertThat(vet.getLastName()).isEqualTo("Douglas");
+ assertThat(vet.getNrOfSpecialties()).isEqualTo(2);
+ assertThat(vet.getSpecialties().get(0).getName()).isEqualTo("dentistry");
+ assertThat(vet.getSpecialties().get(1).getName()).isEqualTo("surgery");
+ }
+
+ @Test
+ @Transactional
+ void shouldAddNewVisitForPet() {
+ Pet pet7 = this.pets.findById(7);
+ int found = pet7.getVisits().size();
+ Visit visit = new Visit();
+ pet7.addVisit(visit);
+ visit.setDescription("test");
+ this.visits.save(visit);
+ this.pets.save(pet7);
+
+ pet7 = this.pets.findById(7);
+ assertThat(pet7.getVisits().size()).isEqualTo(found + 1);
+ assertThat(visit.getId()).isNotNull();
+ }
+
+ @Test
+ void shouldFindVisitsByPetId() throws Exception {
+ Collection visits = this.visits.findByPetId(7);
+ assertThat(visits).hasSize(2);
+ Visit[] visitArr = visits.toArray(new Visit[visits.size()]);
+ assertThat(visitArr[0].getDate()).isNotNull();
+ assertThat(visitArr[0].getPetId()).isEqualTo(7);
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
index 8890cc59ab1..ca8bc41fc6c 100644
--- a/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
+++ b/src/test/java/org/springframework/samples/petclinic/service/EntityUtils.java
@@ -22,8 +22,8 @@
import org.springframework.samples.petclinic.model.BaseEntity;
/**
- * Utility methods for handling entities. Separate from the BaseEntity class mainly because of dependency on the
- * ORM-associated ObjectRetrievalFailureException.
+ * Utility methods for handling entities. Separate from the BaseEntity class mainly
+ * because of dependency on the ORM-associated ObjectRetrievalFailureException.
*
* @author Juergen Hoeller
* @author Sam Brannen
@@ -32,23 +32,22 @@
*/
public abstract class EntityUtils {
- /**
- * Look up the entity of the given class with the given id in the given collection.
- *
- * @param entities the collection to search
- * @param entityClass the entity class to look up
- * @param entityId the entity id to look up
- * @return the found entity
- * @throws ObjectRetrievalFailureException if the entity was not found
- */
- public static T getById(Collection entities, Class entityClass, int entityId)
- throws ObjectRetrievalFailureException {
- for (T entity : entities) {
- if (entity.getId() == entityId && entityClass.isInstance(entity)) {
- return entity;
- }
- }
- throw new ObjectRetrievalFailureException(entityClass, entityId);
- }
+ /**
+ * Look up the entity of the given class with the given id in the given collection.
+ * @param entities the collection to search
+ * @param entityClass the entity class to look up
+ * @param entityId the entity id to look up
+ * @return the found entity
+ * @throws ObjectRetrievalFailureException if the entity was not found
+ */
+ public static T getById(Collection entities, Class entityClass, int entityId)
+ throws ObjectRetrievalFailureException {
+ for (T entity : entities) {
+ if (entity.getId() == entityId && entityClass.isInstance(entity)) {
+ return entity;
+ }
+ }
+ throw new ObjectRetrievalFailureException(entityClass, entityId);
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java b/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java
index cc1e235cb73..6bafc74990d 100644
--- a/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/system/CrashControllerTests.java
@@ -16,13 +16,10 @@
package org.springframework.samples.petclinic.system;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -36,19 +33,19 @@
*
* @author Colin But
*/
-@RunWith(SpringRunner.class)
// Waiting https://github.com/spring-projects/spring-boot/issues/5574
-@Ignore
+@Disabled
@WebMvcTest(controllers = CrashController.class)
-public class CrashControllerTests {
+class CrashControllerTests {
+
+ @Autowired
+ private MockMvc mockMvc;
- @Autowired
- private MockMvc mockMvc;
+ @Test
+ void testTriggerException() throws Exception {
+ mockMvc.perform(get("/oups")).andExpect(view().name("exception"))
+ .andExpect(model().attributeExists("exception")).andExpect(forwardedUrl("exception"))
+ .andExpect(status().isOk());
+ }
- @Test
- public void testTriggerException() throws Exception {
- mockMvc.perform(get("/oups")).andExpect(view().name("exception"))
- .andExpect(model().attributeExists("exception"))
- .andExpect(forwardedUrl("exception")).andExpect(status().isOk());
- }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
index 83ef501446d..fd537bee214 100644
--- a/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/vet/VetControllerTests.java
@@ -25,61 +25,56 @@
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
import org.assertj.core.util.Lists;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.http.MediaType;
-import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
/**
* Test class for the {@link VetController}
*/
-@RunWith(SpringRunner.class)
@WebMvcTest(VetController.class)
-public class VetControllerTests {
+class VetControllerTests {
- @Autowired
- private MockMvc mockMvc;
+ @Autowired
+ private MockMvc mockMvc;
- @MockBean
- private VetRepository vets;
+ @MockBean
+ private VetRepository vets;
- @Before
- public void setup() {
- Vet james = new Vet();
- james.setFirstName("James");
- james.setLastName("Carter");
- james.setId(1);
- Vet helen = new Vet();
- helen.setFirstName("Helen");
- helen.setLastName("Leary");
- helen.setId(2);
- Specialty radiology = new Specialty();
- radiology.setId(1);
- radiology.setName("radiology");
- helen.addSpecialty(radiology);
- given(this.vets.findAll()).willReturn(Lists.newArrayList(james, helen));
- }
+ @BeforeEach
+ void setup() {
+ Vet james = new Vet();
+ james.setFirstName("James");
+ james.setLastName("Carter");
+ james.setId(1);
+ Vet helen = new Vet();
+ helen.setFirstName("Helen");
+ helen.setLastName("Leary");
+ helen.setId(2);
+ Specialty radiology = new Specialty();
+ radiology.setId(1);
+ radiology.setName("radiology");
+ helen.addSpecialty(radiology);
+ given(this.vets.findAll()).willReturn(Lists.newArrayList(james, helen));
+ }
- @Test
- public void testShowVetListHtml() throws Exception {
- mockMvc.perform(get("/vets.html"))
- .andExpect(status().isOk())
- .andExpect(model().attributeExists("vets"))
- .andExpect(view().name("vets/vetList"));
- }
+ @Test
+ void testShowVetListHtml() throws Exception {
+ mockMvc.perform(get("/vets.html")).andExpect(status().isOk()).andExpect(model().attributeExists("vets"))
+ .andExpect(view().name("vets/vetList"));
+ }
- @Test
- public void testShowResourcesVetList() throws Exception {
- ResultActions actions = mockMvc.perform(get("/vets")
- .accept(MediaType.APPLICATION_JSON)).andExpect(status().isOk());
- actions.andExpect(content().contentType("application/json;charset=UTF-8"))
- .andExpect(jsonPath("$.vetList[0].id").value(1));
- }
+ @Test
+ void testShowResourcesVetList() throws Exception {
+ ResultActions actions = mockMvc.perform(get("/vets").accept(MediaType.APPLICATION_JSON))
+ .andExpect(status().isOk());
+ actions.andExpect(content().contentType(MediaType.APPLICATION_JSON))
+ .andExpect(jsonPath("$.vetList[0].id").value(1));
+ }
}
diff --git a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java b/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
index 54225075176..d8df78b85ee 100644
--- a/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
+++ b/src/test/java/org/springframework/samples/petclinic/vet/VetTests.java
@@ -15,29 +15,26 @@
*/
package org.springframework.samples.petclinic.vet;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
import org.springframework.util.SerializationUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Dave Syer
- *
*/
-public class VetTests {
+class VetTests {
- @Test
- public void testSerialization() {
- Vet vet = new Vet();
- vet.setFirstName("Zaphod");
- vet.setLastName("Beeblebrox");
- vet.setId(123);
- Vet other = (Vet) SerializationUtils
- .deserialize(SerializationUtils.serialize(vet));
- assertThat(other.getFirstName()).isEqualTo(vet.getFirstName());
- assertThat(other.getLastName()).isEqualTo(vet.getLastName());
- assertThat(other.getId()).isEqualTo(vet.getId());
- }
+ @Test
+ void testSerialization() {
+ Vet vet = new Vet();
+ vet.setFirstName("Zaphod");
+ vet.setLastName("Beeblebrox");
+ vet.setId(123);
+ Vet other = (Vet) SerializationUtils.deserialize(SerializationUtils.serialize(vet));
+ assertThat(other.getFirstName()).isEqualTo(vet.getFirstName());
+ assertThat(other.getLastName()).isEqualTo(vet.getLastName());
+ assertThat(other.getId()).isEqualTo(vet.getId());
+ }
}