Added image domain tests (6)

src/main/java/scot/carricksoftware/grantswriter/domains/census/Census.java

@@ -1,169 +1,13 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 01:34. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
 package scot.carricksoftware.grantswriter.domains.census;
 
-
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
-import jakarta.persistence.EnumType;
-import jakarta.persistence.Enumerated;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import jakarta.persistence.OneToMany;
 import scot.carricksoftware.grantswriter.BaseEntity;
-import scot.carricksoftware.grantswriter.domains.places.Place;
-import scot.carricksoftware.grantswriter.enums.census.CensusBoundaryType;
-import scot.carricksoftware.grantswriter.enums.census.CensusDate;
-
-
-import java.util.ArrayList;
-import java.util.List;
 
 @Entity
 public class Census extends BaseEntity {
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "`census_date`")
-    private CensusDate censusDate;
-
-    @OneToMany(mappedBy = "census", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<CensusEntry> censusEntries = new ArrayList<>();
-
-    @ManyToOne
-    @JoinColumn(name = "`place_id`")
-    private Place place;
-
-    @Enumerated(EnumType.STRING)
-    @Column(name = "`boundary_type`")
-    private CensusBoundaryType boundaryType;
-
-    @Column(name = "`inhabited_rooms`")
-    private String inhabitedRooms;
-
-    @Column(name = "`rooms_with_windows`")
-    private String roomsWithWindows;
-
-    @Column(name = "`filled_in_by`")
-    private String filledInBy;
-
-    @Column(name = "`total_rooms`")
-    private String totalRooms;
-
-    @Column(name= "`rooms_occupied`")
-    private String roomsOccupied;
-
-    @Column(name = "`inhabited_houses`")
-    private String inhabitedHouses;
-
-    @Column(name = "`uninhabited_houses`")
-    private String uninhabitedHouses;
-
-    @Column(name = "`people_in_houses`")
-    private String peopleInHouses;
-
-    public CensusDate getCensusDate() {
-        return censusDate;
-    }
-
-    public void setCensusDate(CensusDate date) {
-        this.censusDate = date;
-    }
-
-    public List<CensusEntry> getCensusEntries() {
-        return censusEntries;
-    }
-
-    public void setCensusEntries(List<CensusEntry> censusEntries) {
-        this.censusEntries = censusEntries;
-    }
-
-    @Override
-    public String toString() {
-        return place.toString() + ", " + censusDate.label;
-    }
-
-    public Place getPlace() {
-        return place;
-    }
-
-    public void setPlace(Place place) {
-        this.place = place;
-    }
-
-    public CensusBoundaryType getBoundaryType() {
-        return boundaryType;
-    }
-
-    public void setBoundaryType(CensusBoundaryType boundaryType) {
-        this.boundaryType = boundaryType;
-    }
-
-    public String getInhabitedRooms() {
-        return inhabitedRooms;
-    }
-
-    public void setInhabitedRooms(String inhabitedRooms) {
-        this.inhabitedRooms = inhabitedRooms;
-    }
-
-    public String getRoomsWithWindows() {
-        return roomsWithWindows;
-    }
-
-    public void setRoomsWithWindows(String roomsWithWindows) {
-        this.roomsWithWindows = roomsWithWindows;
-    }
-
-    public String getFilledInBy() {
-        return filledInBy;
-    }
-
-    public void setFilledInBy(String filledInBy) {
-        this.filledInBy = filledInBy;
-    }
-
-    public String getTotalRooms() {
-        return totalRooms;
-    }
-
-    @SuppressWarnings("unused")
-    public void setTotalRooms(String totalRooms) {
-        this.totalRooms = totalRooms;
-    }
-
-    public String getRoomsOccupied() {
-        return roomsOccupied;
-    }
-
-    public void setRoomsOccupied(String roomsOccupied) {
-        this.roomsOccupied = roomsOccupied;
-    }
-
-    public String getInhabitedHouses() {
-        return inhabitedHouses;
-    }
-
-    public void setInhabitedHouses(String inhabitedHouses) {
-        this.inhabitedHouses = inhabitedHouses;
-    }
-
-    public String getUninhabitedHouses() {
-        return uninhabitedHouses;
-    }
-
-    public void setUninhabitedHouses(String uninhabitedHouses) {
-        this.uninhabitedHouses = uninhabitedHouses;
-    }
-
-    public String getPeopleInHouses() {
-        return peopleInHouses;
-    }
-
-    public void setPeopleInHouses(String peopleInHouses) {
-        this.peopleInHouses = peopleInHouses;
-    }
 }

src/main/java/scot/carricksoftware/grantswriter/domains/census/CensusEntry.java

@@ -1,20 +1,15 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 01:34. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
 package scot.carricksoftware.grantswriter.domains.census;
 
-import jakarta.persistence.*;
+import jakarta.persistence.Entity;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import scot.carricksoftware.grantswriter.BaseEntity;
 import scot.carricksoftware.grantswriter.domains.people.Person;
-import scot.carricksoftware.grantswriter.enums.censusentry.CensusEntryCondition;
-import scot.carricksoftware.grantswriter.enums.censusentry.CensusEntryGaelic;
-import scot.carricksoftware.grantswriter.enums.censusentry.CensusEntryRelationship;
-import scot.carricksoftware.grantswriter.enums.censusentry.CensusEntryWorker;
-import scot.carricksoftware.grantswriter.enums.general.Sex;
-import scot.carricksoftware.grantswriter.enums.general.YesNo;
-
 
 @Entity
 public class CensusEntry extends BaseEntity {
@@ -26,247 +21,17 @@ public class CensusEntry extends BaseEntity {
     @JoinColumn(name = "`census_id`")
     private Census census;
 
+
     @SuppressWarnings("JpaDataSourceORMInspection")
     @ManyToOne
     @JoinColumn(name = "`person_id`")
     private Person person;
 
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Enumerated(EnumType.STRING)
-    @Column(name = "`relationship`")
-    private CensusEntryRelationship relationship;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Enumerated(EnumType.STRING)
-    @Column(name = "`gaelic`")
-    private CensusEntryGaelic gaelic;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Enumerated(EnumType.STRING)
-    @Column(name = "`condition`")
-    private CensusEntryCondition condition;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Enumerated(EnumType.STRING)
-    @Column(name = "`worker`")
-    private CensusEntryWorker worker;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Enumerated(EnumType.STRING)
-    @Column(name = "`sex`")
-    private Sex sex;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`age`")
-    private String age;
-
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`where_born`")
-    private String whereBorn;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`birth_day`")
-    private String birthDay;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`birth_year`")
-    private String birthYear;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`personal_occupation`")
-    private String personalOccupation;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`notes`")
-    private String notes;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`children_who_have_died`")
-    private String childrenWhoHaveDied;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`children_still_alive`")
-    private String childrenStillAlive;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`children_born_alive`")
-    private String childrenBornAlive;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`years_Completed_Marriage`")
-    private String yearsCompletedMarriage;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Enumerated(EnumType.STRING)
-    @Column(name = "`working_at_home`")
-    private YesNo workingAtHome;
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`industry_or_service`")
-    private String industryOrService;
-
-    public Person getPerson() {
-        return person;
-    }
-
-    public void setPerson(Person person) {
-        this.person = person;
-    }
-
-    public String getName() {
-        return name;
-    }
-
     public void setName(String name) {
         this.name = name;
     }
 
-    public Census getCensus() {
-        return census;
-    }
-
-    public void setCensus(Census census) {
-        this.census = census;
-    }
-
-    public String toString() {
-        return census.toString();
-    }
-
-    public CensusEntryRelationship getRelationship() {
-        return relationship;
-    }
-
-    public void setRelationship(CensusEntryRelationship relationship) {
-        this.relationship = relationship;
-    }
-
-    public CensusEntryCondition getCondition() {
-        return this.condition;
-    }
-
-    public void setCondition(CensusEntryCondition condition) {
-        this.condition = condition;
-    }
-
-    public CensusEntryGaelic getGaelic() {
-        return this.gaelic;
-    }
-
-    public void setGaelic(CensusEntryGaelic gaelic) {
-        this.gaelic = gaelic;
-    }
-
-    public CensusEntryWorker getWorker() {
-        return this.worker;
-    }
-
-    public void setWorker(CensusEntryWorker worker) {
-        this.worker = worker;
-    }
-
-    public String getAge() {
-        return this.age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-
-    public String getWhereBorn() {
-        return this.whereBorn;
-    }
-
-    public void setWhereBorn(String whereBorn) {
-        this.whereBorn = whereBorn;
-    }
-
-    public Sex getSex() {
-        return this.sex;
-    }
-
-    public void setSex(Sex sex) {
-        this.sex = sex;
-    }
-
-    public String getBirthDay() {
-        return this.birthDay;
-    }
-
-    public void setBirthDay(String birthDay) {
-        this.birthDay = birthDay;
-    }
-
-    public String getBirthYear() {
-        return this.birthYear;
-    }
-
-    public void setBirthYear(String birthYear) {
-        this.birthYear = birthYear;
-    }
-
-    public String getPersonalOccupation() {
-        return this.personalOccupation;
-    }
-
-    public void setPersonalOccupation(String occupation) {
-        this.personalOccupation = occupation;
-    }
-
-    public String getNotes() {
-        return notes;
-    }
-
-    public void setNotes(String notes) {
-        this.notes = notes;
-    }
-
-    public String getChildrenWhoHaveDied() {
-        return childrenWhoHaveDied;
-    }
-
-    public void setChildrenWhoHaveDied(String childrenWhoHaveDied) {
-        this.childrenWhoHaveDied = childrenWhoHaveDied;
-    }
-
-    public String getChildrenStillAlive() {
-        return childrenStillAlive;
-    }
-
-    public void setChildrenStillAlive(String childrenStillAlive) {
-        this.childrenStillAlive = childrenStillAlive;
-    }
-
-    public String getChildrenBornAlive() {
-        return childrenBornAlive;
-    }
-
-    public void setChildrenBornAlive(String childrenBornAlive) {
-        this.childrenBornAlive = childrenBornAlive;
-    }
-
-    public String getYearsCompletedMarriage() {
-        return yearsCompletedMarriage;
-    }
-
-    public void setYearsCompletedMarriage(String yearsCompletedMarriage) {
-        this.yearsCompletedMarriage = yearsCompletedMarriage;
-    }
-
-    public YesNo getWorkingAtHome() {
-        return workingAtHome;
-    }
-
-    public void setWorkingAtHome(YesNo yesNo) {
-        this.workingAtHome = yesNo;
-    }
-
-    public String getIndustryOrService() {
-        return industryOrService;
-    }
-
-    public void setIndustryOrService(String industryOrService) {
-        this.industryOrService = industryOrService;
+    public void setPerson(Person person) {
+        this.person = person;
     }
 }

src/main/java/scot/carricksoftware/grantswriter/domains/images/Image.java

@@ -1,14 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:50. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.images;
-
-import jakarta.persistence.Entity;
-import scot.carricksoftware.grantswriter.BaseEntity;
-
-@Entity
-public class Image extends BaseEntity {
-
-}

src/main/java/scot/carricksoftware/grantswriter/domains/images/PersonImage.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:50. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.images;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import scot.carricksoftware.grantswriter.BaseEntity;
-import scot.carricksoftware.grantswriter.domains.people.Person;
-
-
-@Entity
-public class PersonImage extends BaseEntity {
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @ManyToOne
-    @JoinColumn(name = "person_id")
-    private Person person;
-
-    public Person getPerson() {
-        return person;
-    }
-
-    public void setPerson(Person person) {
-        this.person = person;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/domains/images/PlaceImage.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:50. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.images;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import scot.carricksoftware.grantswriter.BaseEntity;
-import scot.carricksoftware.grantswriter.domains.places.Place;
-
-@Entity
-public class PlaceImage extends BaseEntity {
-
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @ManyToOne
-    @JoinColumn(name = "place_id")
-    private Place place;
-
-    public Place getPlace() {
-        return place;
-    }
-
-    public void setPlace(Place place) {
-        this.place = place;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/domains/people/Person.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:50. All rights reserved.
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
  *
  */
 
@@ -12,54 +12,50 @@ import scot.carricksoftware.grantswriter.BaseEntity;
 @Entity
 public class Person extends BaseEntity {
 
+    @Column(name = "`last_name`")
+    private String lastName;
+
     @Column(name = "`first_name`")
     private String firstName;
 
-    @Column(name = "`last_name`")
-    String lastName;
+    @Column(name = "`certified_year_of_birth`")
+    private String certifiedYearOfBirth;
 
     @Column(name = "`recorded_year_of_birth`")
-    String recordedYearOfBirth;
+    private String recordedYearOfBirth;
 
-    @Column(name = "`certified_year_of_birth`")
-    String certifiedYearOfBirth;
+    public String getLastName() {
+        return lastName;
+    }
 
     public String getFirstName() {
         return firstName;
     }
 
+    public void setLastName(String lastName) {
+        this.lastName = lastName;
+    }
+
     public void setFirstName(String firstName) {
         this.firstName = firstName;
     }
 
-    public String getLastName() {
-        return lastName;
+    public String getCertifiedYearOfBirth() {
+        return certifiedYearOfBirth;
     }
 
-    public void setLastName(String lastName) {
-        this.lastName = lastName;
+    public void setCertifiedYearOfBirth(String certifiedYearOfBirth) {
+        this.certifiedYearOfBirth = certifiedYearOfBirth;
     }
 
-    @SuppressWarnings("unused")
     public String getRecordedYearOfBirth() {
         return recordedYearOfBirth;
     }
 
-    @SuppressWarnings("unused")
     public void setRecordedYearOfBirth(String recordedYearOfBirth) {
         this.recordedYearOfBirth = recordedYearOfBirth;
     }
 
-    @SuppressWarnings("unused")
-    public String getCertifiedYearOfBirth() {
-        return certifiedYearOfBirth;
-    }
-
-    @SuppressWarnings("unused")
-    public void setCertifiedYearOfBirth(String certifiedYearOfBirth) {
-        this.certifiedYearOfBirth = certifiedYearOfBirth;
-    }
-
     @Override
     public String toString() {
         StringBuilder builder = new StringBuilder();
@@ -80,5 +76,5 @@ public class Person extends BaseEntity {
 
         return builder.toString();
     }
-
 }
+

src/main/java/scot/carricksoftware/grantswriter/domains/places/Country.java

@@ -1,42 +0,0 @@
-/*
- * Copyright (c)  02 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grantswriter.domains.places;
-
-import jakarta.persistence.CascadeType;
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.OneToMany;
-import scot.carricksoftware.grantswriter.BaseEntity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity
-public class Country extends BaseEntity {
-
-    @Column(name = "`name`")
-    private String name;
-
-    @OneToMany(mappedBy = "country", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Region> regions = new ArrayList<>();
-
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public List<Region> getRegions() {
-        return this.regions;
-    }
-
-    public void setRegions(List<Region> regions) {
-        this.regions = regions;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/domains/places/Organisation.java

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.places;
-
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import scot.carricksoftware.grantswriter.BaseEntity;
-
-@Entity
-public class Organisation extends BaseEntity {
-
-    @Column(name = "`name`")
-    private String name;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public String toString() {
-        return name;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/domains/places/Place.java

@@ -1,88 +0,0 @@
-/*
- * Copyright (c)  02 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grantswriter.domains.places;
-
-
-import jakarta.persistence.*;
-import scot.carricksoftware.grantswriter.BaseEntity;
-import scot.carricksoftware.grantswriter.domains.census.Census;
-import scot.carricksoftware.grantswriter.domains.images.PlaceImage;
-import scot.carricksoftware.grantswriter.domains.text.PlaceText;
-
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity
-public class Place extends BaseEntity {
-
-    @Column(name = "`name`")
-    private String name;
-
-    @ManyToOne
-    @JoinColumn(name = "`region_id`")
-    private Region region;
-
-    @SuppressWarnings("unused")
-    @OneToMany(mappedBy = "place", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Census> censuses = new ArrayList<>();
-
-    @SuppressWarnings("unused")
-    @OneToMany(mappedBy = "place", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<PlaceImage> placeImages = new ArrayList<>();
-
-    @SuppressWarnings("unused")
-    @OneToMany(mappedBy = "place", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<PlaceText> placeTexts = new ArrayList<>();
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Region getRegion() {
-        return region;
-    }
-
-    public void setRegion(Region region) {
-        this.region = region;
-    }
-
-    public List<Census> getCensuses() {
-        return censuses;
-    }
-
-    public void setCensuses(List<Census> censuses) {
-        this.censuses = censuses;
-    }
-
-    public List<PlaceImage> getPlaceImages() {
-        return placeImages;
-    }
-
-    public void setPlaceImages(List<PlaceImage> placeImages) {
-        this.placeImages = placeImages;
-    }
-
-    public List<PlaceText> getPlaceTexts() {
-        return placeTexts;
-    }
-
-    public void setPlaceTexts(List<PlaceText> placeTexts) {
-        this.placeTexts = placeTexts;
-    }
-
-    @Override
-    public String toString() {
-        return name +
-                ", " + region.getName() +
-                ", " + region.getCountry().getName();
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/domains/places/Region.java

@@ -1,55 +0,0 @@
-/*
- * Copyright (c)  02 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grantswriter.domains.places;
-
-
-import jakarta.persistence.*;
-import scot.carricksoftware.grantswriter.BaseEntity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Entity
-public class Region extends BaseEntity {
-
-    @Column(name = "`name`")
-    private String name;
-
-    @ManyToOne
-    @JoinColumn(name = "`country_id`")
-    private Country country;
-
-    @OneToMany(mappedBy = "region", cascade = CascadeType.ALL, orphanRemoval = true)
-    private List<Place> places = new ArrayList<>();
-
-    @SuppressWarnings("unused")
-    public String getName() {
-        return name;
-    }
-
-    @SuppressWarnings("unused")
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Country getCountry() {
-        return country;
-    }
-
-    public void setCountry(Country country) {
-        this.country = country;
-    }
-
-    @SuppressWarnings("unused")
-    public List<Place> getPlaces() {
-        return places;
-    }
-
-    @SuppressWarnings("unused")
-    public void setPlaces(List<Place> places) {
-        this.places = places;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/domains/text/DocumentText.java

@@ -1,17 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 30/03/2025, 10:24. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.text;
-
-import jakarta.persistence.Entity;
-import scot.carricksoftware.grantswriter.BaseEntity;
-
-
-@Entity
-public class DocumentText extends BaseEntity {
-
-
-
-}

src/main/java/scot/carricksoftware/grantswriter/domains/text/PersonText.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 30/03/2025, 10:20. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.text;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import scot.carricksoftware.grantswriter.BaseEntity;
-import scot.carricksoftware.grantswriter.domains.people.Person;
-
-
-@Entity
-public class PersonText extends BaseEntity {
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @ManyToOne
-    @JoinColumn(name = "`person_id`")
-    private Person person;
-
-    public Person getPerson() {
-        return person;
-    }
-
-    public void setPerson(Person person) {
-        this.person = person;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/domains/text/PlaceText.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 30/03/2025, 10:22. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.text;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import scot.carricksoftware.grantswriter.BaseEntity;
-import scot.carricksoftware.grantswriter.domains.places.Place;
-
-
-@Entity
-public class PlaceText extends BaseEntity {
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @ManyToOne
-    @JoinColumn(name = "`place_id`")
-    private Place place;
-
-    public Place getPlace() {
-        return place;
-    }
-
-    public void setPlace(Place place) {
-        this.place = place;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/images/Image.java

@@ -1,14 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:50. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.images;
-
-import jakarta.persistence.Entity;
-import scot.carricksoftware.grantswriter.BaseEntity;
-
-@Entity
-public class Image extends BaseEntity {
-
-}

src/main/java/scot/carricksoftware/grantswriter/images/PersonImage.java

@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:50. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.images;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import scot.carricksoftware.grantswriter.BaseEntity;
-import scot.carricksoftware.grantswriter.domains.people.Person;
-
-
-@Entity
-public class PersonImage extends BaseEntity {
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @ManyToOne
-    @JoinColumn(name = "person_id")
-    private Person person;
-
-    public Person getPerson() {
-        return person;
-    }
-
-    public void setPerson(Person person) {
-        this.person = person;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/images/PlaceImage.java

@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:50. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.images;
-
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import scot.carricksoftware.grantswriter.BaseEntity;
-import scot.carricksoftware.grantswriter.domains.places.Place;
-
-
-@Entity
-public class PlaceImage extends BaseEntity {
-
-
-    @SuppressWarnings("JpaDataSourceORMInspection")
-    @ManyToOne
-    @JoinColumn(name = "place_id")
-    private Place place;
-
-    public Place getPlace() {
-        return place;
-    }
-
-    public void setPlace(Place place) {
-        this.place = place;
-    }
-}

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PersonSectionHeader.java

@@ -5,6 +5,7 @@
 
 package scot.carricksoftware.grantswriter.writer.latex.parts.people;
 
+
 import scot.carricksoftware.grantswriter.domains.people.Person;
 
 public interface PersonSectionHeader {

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/PersonSectionHeaderImpl.java

@@ -6,8 +6,8 @@
 package scot.carricksoftware.grantswriter.writer.latex.parts.people;
 
 import org.springframework.stereotype.Component;
-import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.writer.latex.LatexSectionHeader;
+import scot.carricksoftware.grantswriter.domains.people.Person;
 
 @Component
 public class PersonSectionHeaderImpl implements PersonSectionHeader {

src/main/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSection.java

@@ -8,6 +8,6 @@ package scot.carricksoftware.grantswriter.writer.latex.sections;
 import scot.carricksoftware.grantswriter.domains.people.Person;
 
 public interface PersonSection {
-    @SuppressWarnings({"unused", "EmptyMethod"})
+
     void write(Person person);
 }

src/main/java/scot/carricksoftware/grantswriter/writer/latex/sections/PersonSectionImpl.java

@@ -6,8 +6,8 @@
 package scot.carricksoftware.grantswriter.writer.latex.sections;
 
 import org.springframework.stereotype.Component;
-import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.writer.latex.parts.people.PersonSectionHeader;
+import scot.carricksoftware.grantswriter.domains.people.Person;
 
 @Component
 public class PersonSectionImpl implements PersonSection {

src/test/java/scot/carricksoftware/grantswriter/GenerateRandomImageValues.java

@@ -1,45 +0,0 @@
-/*
- * Copyright (c)  04 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grantswriter;
-
-import org.springframework.stereotype.Component;
-import scot.carricksoftware.grantswriter.domains.images.Image;
-import scot.carricksoftware.grantswriter.domains.images.PersonImage;
-import scot.carricksoftware.grantswriter.domains.images.PlaceImage;
-
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-
-
-@SuppressWarnings("unused")
-@Component
-public class GenerateRandomImageValues {
-
-    @SuppressWarnings("unused")
-    public static Image GetRandomImage() {
-        Image image = new Image();
-        image.setId(GetRandomLong());
-        return image;
-    }
-
-
-    @SuppressWarnings("unused")
-    public static PersonImage GetRandomPersonImage() {
-        PersonImage image = new PersonImage();
-        image.setId(GetRandomLong());
-        return image;
-    }
-
-
-    @SuppressWarnings("unused")
-    public static PlaceImage GetRandomPlaceImage() {
-        PlaceImage image = new PlaceImage();
-        image.setId(GetRandomLong());
-        return image;
-    }
-
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/GenerateRandomPlaceValues.java

@@ -1,40 +0,0 @@
-/*
- * Copyright (c)  04 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grantswriter;
-
-
-import scot.carricksoftware.grantswriter.domains.places.Country;
-import scot.carricksoftware.grantswriter.domains.places.Place;
-import scot.carricksoftware.grantswriter.domains.places.Region;
-
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-
-@SuppressWarnings("unused")
-
-public class GenerateRandomPlaceValues {
-
-    @SuppressWarnings("unused")
-    public static Place GetRandomPlace() {
-        Place place = new Place();
-        place.setName(GetRandomString());
-        return place;
-    }
-
-    public static Country GetRandomCountry() {
-        Country country = new Country();
-        country.setName(GetRandomString());
-        return country;
-    }
-
-    public static Region GetRandomRegion() {
-        Region region = new Region();
-        region.setName(GetRandomString());
-        return region;
-    }
-
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/GenerateRandomTextValues.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c)  04 Feb 2025, Andrew Grant of Carrick Software .
- * All rights reserved.
- */
-
-package scot.carricksoftware.grantswriter;
-
-
-import scot.carricksoftware.grantswriter.domains.text.DocumentText;
-import scot.carricksoftware.grantswriter.domains.text.PersonText;
-import scot.carricksoftware.grantswriter.domains.text.PlaceText;
-
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grantswriter.GenerateRandomPeopleValues.GetRandomPerson;
-import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomPlace;
-
-@SuppressWarnings("unused")
-
-public class GenerateRandomTextValues {
-
-    public static DocumentText GetRandomDocumentText() {
-        DocumentText documentText = new DocumentText();
-        documentText.setId(GetRandomLong());
-        return documentText;
-    }
-
-    public static PersonText GetRandomPersonText() {
-        PersonText personText = new PersonText();
-        personText.setId(GetRandomLong());
-        personText.setPerson(GetRandomPerson());
-        return personText;
-    }
-
-    public static PlaceText GetRandomPlaceText() {
-        PlaceText placeText = new PlaceText();
-        placeText.setId(GetRandomLong());
-        placeText.setPlace(GetRandomPlace());
-        return placeText;
-    }
-
-}

src/test/java/scot/carricksoftware/grantswriter/data/TimelineDataAddTest.java

@@ -7,13 +7,13 @@ package scot.carricksoftware.grantswriter.data;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import scot.carricksoftware.grantswriter.domains.census.Census;
 import scot.carricksoftware.grantswriter.domains.census.CensusEntry;
 
-
 class TimelineDataAddTest {
 
-    @SuppressWarnings("FieldCanBeLocal")
+    @SuppressWarnings({"FieldCanBeLocal", "unused"})
     private TimelineData timelineData;
 
     @BeforeEach
@@ -21,6 +21,7 @@ class TimelineDataAddTest {
         timelineData = new TimelineDataImpl();
     }
 
+   @SuppressWarnings("unused")
    @Test
     void addTest() {
        CensusEntry censusEntry = new CensusEntry();

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusEntryEnumTest.java

@@ -1,111 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 20/03/2025, 11:01. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.census;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import scot.carricksoftware.grantswriter.enums.censusentry.CensusEntryCondition;
-import scot.carricksoftware.grantswriter.enums.censusentry.CensusEntryGaelic;
-import scot.carricksoftware.grantswriter.enums.censusentry.CensusEntryRelationship;
-import scot.carricksoftware.grantswriter.enums.censusentry.CensusEntryWorker;
-import scot.carricksoftware.grantswriter.enums.general.Sex;
-import scot.carricksoftware.grantswriter.enums.general.YesNo;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateCensusEntryRandomEnums.GetRandomCensusEntryCondition;
-import static scot.carricksoftware.grantswriter.GenerateCensusEntryRandomEnums.GetRandomCensusEntryGaelic;
-import static scot.carricksoftware.grantswriter.GenerateCensusEntryRandomEnums.GetRandomCensusEntryRelationship;
-import static scot.carricksoftware.grantswriter.GenerateCensusEntryRandomEnums.GetRandomCensusEntrySex;
-import static scot.carricksoftware.grantswriter.GenerateCensusEntryRandomEnums.GetRandomCensusEntryWorker;
-import static scot.carricksoftware.grantswriter.GenerateGeneralRandomEnums.GetRandomGeneralYesNo;
-
-@ExtendWith(MockitoExtension.class)
-class CensusEntryEnumTest {
-
-    private CensusEntry entry;
-
-    @BeforeEach
-    void setUp() {
-        entry = new CensusEntry();
-    }
-
-    @Test
-    void getRelationShipTest() {
-        assertNull(entry.getRelationship());
-    }
-
-    @Test
-    void setRelationshipTest() {
-        CensusEntryRelationship relationship = GetRandomCensusEntryRelationship();
-        entry.setRelationship(relationship);
-        assertEquals(relationship, entry.getRelationship());
-    }
-
-    @Test
-    void getConditionTest() {
-        assertNull(entry.getCondition());
-    }
-
-    @Test
-    void setConditionTest() {
-        CensusEntryCondition condition = GetRandomCensusEntryCondition();
-        entry.setCondition(condition);
-        assertEquals(condition, entry.getCondition());
-    }
-
-    @Test
-    void getGaelicTest() {
-        assertNull(entry.getCondition());
-    }
-
-    @Test
-    void setGaelicTest() {
-        CensusEntryGaelic gaelic = GetRandomCensusEntryGaelic();
-        entry.setGaelic(gaelic);
-        assertEquals(gaelic, entry.getGaelic());
-    }
-
-    @Test
-    void getWorkerTest() {
-        assertNull(entry.getCondition());
-    }
-
-    @Test
-    void setWorkerTest() {
-        CensusEntryWorker worker = GetRandomCensusEntryWorker();
-        entry.setWorker(worker);
-        assertEquals(worker, entry.getWorker());
-    }
-
-    @Test
-    void getSexTest() {
-        assertNull(entry.getSex());
-    }
-
-    @Test
-    void setSexTest() {
-        Sex sex = GetRandomCensusEntrySex();
-        entry.setSex(sex);
-        assertEquals(sex, entry.getSex());
-    }
-
-    @Test
-    void getWorkingAtHomeTest() {
-        assertNull(entry.getWorkingAtHome());
-    }
-
-    @Test
-    void setWorkingAtHomeTest() {
-        YesNo workingAtHome = GetRandomGeneralYesNo();
-        entry.setWorkingAtHome(workingAtHome);
-        assertEquals(workingAtHome, entry.getWorkingAtHome());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusEntryPartOneTest.java

@@ -1,105 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 20/03/2025, 11:01. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.census;
-
-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.jupiter.MockitoExtension;
-import scot.carricksoftware.grantswriter.domains.people.Person;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grantswriter.GenerateRandomCensusValues.GetRandomCensus;
-
-@ExtendWith(MockitoExtension.class)
-class CensusEntryPartOneTest {
-
-    private CensusEntry entry;
-
-    @Mock
-    private Census censusMock;
-
-    @BeforeEach
-    void setUp() {
-        entry = new CensusEntry();
-    }
-
-    @Test
-    void getNameTest() {
-        assertNull(entry.getName());
-    }
-
-    @Test
-    void setNameTest() {
-        String name = GetRandomString();
-        entry.setName(name);
-        assertEquals(name, entry.getName());
-    }
-
-    @Test
-    void getCensusTest() {
-        assertNull(entry.getCensus());
-    }
-
-    @Test
-    void setCensusTest() {
-        Census census = GetRandomCensus();
-        entry.setCensus(census);
-        assertEquals(census, entry.getCensus());
-    }
-
-    @Test
-    void toStringTest() {
-        String string = GetRandomString();
-        entry.setCensus(censusMock);
-        when(censusMock.toString()).thenReturn(string);
-
-        entry.setName(GetRandomString());
-        assertEquals(string, entry.toString());
-    }
-
-    @Test
-    void getPersonTest() {
-        assertNull(entry.getPerson());
-    }
-
-    @Test
-    void setPersonTest() {
-        Person person = new Person();
-        entry.setPerson(person);
-        assertEquals(person, entry.getPerson());
-    }
-
-    @Test
-    void getAgeTest() {
-        assertNull(entry.getAge());
-    }
-
-    @Test
-    void setAgeTest() {
-        String age = GetRandomString();
-        entry.setAge(age);
-        assertEquals(age, entry.getAge());
-    }
-
-    @Test
-    void getWhereBornTest() {
-        assertNull(entry.getWhereBorn());
-    }
-
-    @Test
-    void setWhereBornTest() {
-        String whereBorn = GetRandomString();
-        entry.setWhereBorn(whereBorn);
-        assertEquals(whereBorn, entry.getWhereBorn());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusEntryPartThreeTest.java

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 20/03/2025, 11:01. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.census;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-
-
-@ExtendWith(MockitoExtension.class)
-class CensusEntryPartThreeTest {
-
-    private CensusEntry entry;
-
-
-    @BeforeEach
-    void setUp() {
-        entry = new CensusEntry();
-    }
-
-    @Test
-    public void getChildrenWhoHaveDiedTest() {
-        assertNull(entry.getChildrenWhoHaveDied());
-    }
-
-    @Test
-    public void setChildrenWhoHaveDiedTest() {
-        String string = GetRandomString();
-        entry.setChildrenWhoHaveDied(string);
-        assertEquals(string, entry.getChildrenWhoHaveDied());
-    }
-
-    @Test
-    public void getChildrenStillAliveTest() {
-        assertNull(entry.getChildrenStillAlive());
-    }
-
-    @Test
-    public void setChildrenStillAliveTest() {
-        String string = GetRandomString();
-        entry.setChildrenStillAlive(string);
-        assertEquals(string, entry.getChildrenStillAlive());
-    }
-
-    @Test
-    public void getChildrenBornAliveTest() {
-        assertNull(entry.getChildrenBornAlive());
-    }
-
-    @Test
-    public void setChildrenBornAliveTest() {
-        String string = GetRandomString();
-        entry.setChildrenBornAlive(string);
-        assertEquals(string, entry.getChildrenBornAlive());
-    }
-
-    @Test
-    public void getYearsCompletedMarriageTest() {
-        assertNull(entry.getYearsCompletedMarriage());
-    }
-
-    @Test
-    public void setYearsCompletedMarriageTest() {
-        String string = GetRandomString();
-        entry.setYearsCompletedMarriage(string);
-        assertEquals(string, entry.getYearsCompletedMarriage());
-    }
-
-    @Test
-    public void getIndustryOrServiceTest() {
-        assertNull(entry.getIndustryOrService());
-    }
-
-    @Test
-    public void setIndustryOrServiceTest() {
-        String string = GetRandomString();
-        entry.setIndustryOrService(string);
-        assertEquals(string, entry.getIndustryOrService());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusEntryPartTwoTest.java

@@ -1,78 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 20/03/2025, 11:01. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.census;
-
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-
-@ExtendWith(MockitoExtension.class)
-class CensusEntryPartTwoTest {
-
-    private CensusEntry entry;
-
-
-    @BeforeEach
-    void setUp() {
-        entry = new CensusEntry();
-    }
-
-    @Test
-    void getBirthDayTest() {
-        assertNull(entry.getBirthDay());
-    }
-
-    @Test
-    void setBirthDayTest() {
-        String birthDay = GetRandomString();
-        entry.setBirthDay(birthDay);
-        assertEquals(birthDay, entry.getBirthDay());
-    }
-
-    @Test
-    void getBirthYearTest() {
-        assertNull(entry.getBirthYear());
-    }
-
-    @Test
-    void setBirthYearTest() {
-        String birthYear = GetRandomString();
-        entry.setBirthYear(birthYear);
-        assertEquals(birthYear, entry.getBirthYear());
-    }
-
-    @Test
-    void getPersonalOccupationTest() {
-        assertNull(entry.getPersonalOccupation());
-    }
-
-    @Test
-    void setPersonalOccupationTest() {
-        String occupation = GetRandomString();
-        entry.setPersonalOccupation(occupation);
-        assertEquals(occupation, entry.getPersonalOccupation());
-    }
-
-    @Test
-    void getNotesTest() {
-        assertNull(entry.getNotes());
-    }
-
-    @Test
-    void setNotesTest() {
-        String notes = GetRandomString();
-        entry.setNotes(notes);
-        assertEquals(notes, entry.getNotes());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusEnumTest.java

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 20/03/2025, 11:01. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.census;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-import scot.carricksoftware.grantswriter.enums.census.CensusBoundaryType;
-import scot.carricksoftware.grantswriter.enums.census.CensusDate;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateCensusRandomEnums.GetRandomCensusBoundaryType;
-import static scot.carricksoftware.grantswriter.GenerateCensusRandomEnums.GetRandomCensusDate;
-
-@ExtendWith(MockitoExtension.class)
-class CensusEnumTest {
-
-    private Census census;
-
-    @BeforeEach
-    void setUp() {
-        census = new Census();
-    }
-
-    @Test
-    void getBoundaryType() {
-        assertNull(census.getBoundaryType());
-    }
-
-    @Test
-    void setBoundaryTypeTest() {
-        CensusBoundaryType boundaryType = GetRandomCensusBoundaryType();
-        census.setBoundaryType(boundaryType);
-        assertEquals(boundaryType, census.getBoundaryType());
-    }
-
-    @Test
-    public void getCensusDateTest() {
-        assertNull(census.getCensusDate());
-    }
-
-    @Test
-    public void setCensusDateTest() {
-        CensusDate date = GetRandomCensusDate();
-        census.setCensusDate(date);
-        assertEquals(date, census.getCensusDate());
-    }
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusPartOneTest.java

@@ -1,92 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 01:42. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.census;
-
-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.jupiter.MockitoExtension;
-import scot.carricksoftware.grantswriter.domains.places.Place;
-import scot.carricksoftware.grantswriter.enums.census.CensusDate;
-
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grantswriter.GenerateCensusRandomEnums.GetRandomCensusDate;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grantswriter.GenerateRandomCensusValues.GetRandomCensusEntry;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomPlace;
-
-
-@ExtendWith(MockitoExtension.class)
-public class CensusPartOneTest {
-
-    private Census census;
-
-    @BeforeEach
-    public void setUp() {
-        census = new Census();
-    }
-
-    @Mock
-    private Place placeMock;
-
-    @Test
-    public void getIdTest() {
-        assertNull(census.getId());
-    }
-
-    @Test
-    public void setIdTest() {
-        Long id = GetRandomLong();
-        census.setId(id);
-        assertEquals(id, census.getId());
-    }
-
-    @Test
-    public void getCensusEntriesTest() {
-        assertTrue(census.getCensusEntries().isEmpty());
-    }
-
-    @Test
-    public void setCensusEntriesTest() {
-        List<CensusEntry> censusEntries = new ArrayList<>();
-        censusEntries.add(GetRandomCensusEntry());
-        census.setCensusEntries(censusEntries);
-        assertEquals(censusEntries, census.getCensusEntries());
-    }
-
-    @Test
-    public void getPlaceTest() {
-        assertNull(census.getPlace());
-    }
-
-    @Test
-    public void setPlaceTest() {
-        Place place = GetRandomPlace();
-        census.setPlace(place);
-        assertEquals(place, census.getPlace());
-    }
-
-    @Test
-    public void toStringTest() {
-        CensusDate censusDate = GetRandomCensusDate();
-        String placeString = GetRandomString();
-        when(placeMock.toString()).thenReturn(placeString);
-        census.setCensusDate(censusDate);
-        census.setPlace(placeMock);
-        assertEquals(placeString + ", " + censusDate.label, census.toString());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusPartTwoTest.java

@@ -1,102 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 01:42. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.census;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-
-
-@ExtendWith(MockitoExtension.class)
-public class CensusPartTwoTest {
-
-    private Census census;
-
-    @BeforeEach
-    public void setUp() {
-        census = new Census();
-    }
-
-    @Test
-    public void getFilledInByTest() {
-        assertNull(census.getFilledInBy());
-    }
-
-    @Test
-    public void setFilledInByTest() {
-        String filledInBy = GetRandomString();
-        census.setFilledInBy(filledInBy);
-        assertEquals(filledInBy, census.getFilledInBy());
-    }
-
-    @Test
-    public void getTotalRoomsTest() {
-        assertNull(census.getTotalRooms());
-    }
-
-    @Test
-    public void setTotalRoomsTest() {
-        String totalRooms = GetRandomString();
-        census.setTotalRooms(totalRooms);
-        assertEquals(totalRooms, census.getTotalRooms());
-    }
-
-    @Test
-    public void getRoomsOccupiedTest() {
-        assertNull(census.getRoomsOccupied());
-    }
-
-    @Test
-    public void setRoomOccupiedTest() {
-        String roomsOccupied = GetRandomString();
-        census.setRoomsOccupied(roomsOccupied);
-        assertEquals(roomsOccupied, census.getRoomsOccupied());
-    }
-
-    @Test
-    public void getInhabitedHousesTest() {
-        assertNull(census.getInhabitedRooms());
-    }
-
-    @Test
-    public void setInhabitedHousesTest() {
-        String inhabitedHouses = GetRandomString();
-        census.setInhabitedHouses(inhabitedHouses);
-        assertEquals(inhabitedHouses, census.getInhabitedHouses());
-    }
-
-
-    @Test
-    public void getUninhabitedHousesTest() {
-        assertNull(census.getUninhabitedHouses());
-    }
-
-    @Test
-    public void setUninhabitedHousesTest() {
-        String uninhabitedHouses = GetRandomString();
-        census.setUninhabitedHouses(uninhabitedHouses);
-        assertEquals(uninhabitedHouses, census.getUninhabitedHouses());
-    }
-
-    @Test
-    public void getPeopleInHousesTest() {
-        assertNull(census.getUninhabitedHouses());
-    }
-
-    @Test
-    public void setPeopleInHousesTest() {
-        String string = GetRandomString();
-        census.setPeopleInHouses(string);
-        assertEquals(string, census.getPeopleInHouses());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/census/CensusRoomsTest.java

@@ -1,53 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 01:42. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.census;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-
-import static org.junit.jupiter.api.Assertions.*;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-
-
-@ExtendWith(MockitoExtension.class)
-public class CensusRoomsTest {
-
-    private Census census;
-
-    @BeforeEach
-    public void setUp() {
-        census = new Census();
-    }
-
-    @Test
-    public void getInhabitedRoomsTest() {
-        assertNull(census.getInhabitedRooms());
-    }
-
-    @Test
-    public void setInhabitedRoomsTest() {
-        String string = GetRandomString();
-        census.setInhabitedRooms(string);
-        assertEquals(string, census.getInhabitedRooms());
-    }
-
-    @Test
-    public void getRoomsWithWidowsTest() {
-        assertNull(census.getRoomsWithWindows());
-    }
-
-    @Test
-    public void setRoomsWithWidowsTest() {
-        String string = GetRandomString();
-        census.setRoomsWithWindows(string);
-        assertEquals(string, census.getRoomsWithWindows());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/images/ImageTest.java

@@ -1,36 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 28/03/2025, 09:54. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.images;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-
-
-class ImageTest {
-    private Image image;
-
-    @BeforeEach
-    void setUp() {
-        image = new Image();
-    }
-
-    @Test
-    public void getIdTest() {
-        assertNull(image.getId());
-    }
-
-    @Test
-    public void setIdTest() {
-        Long id = GetRandomLong();
-        image.setId(id);
-        assertEquals(id, image.getId());
-    }
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/images/PersonImageTest.java

@@ -1,50 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 28/03/2025, 09:54. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.images;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import scot.carricksoftware.grantswriter.domains.people.Person;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grantswriter.GenerateRandomPeopleValues.GetRandomPerson;
-
-class PersonImageTest {
-
-    private PersonImage image;
-
-    @BeforeEach
-    void setUp() {
-        image = new PersonImage();
-    }
-
-    @Test
-    public void getIdTest() {
-        assertNull(image.getId());
-    }
-
-    @Test
-    public void setIdTest() {
-        Long id = GetRandomLong();
-        image.setId(id);
-        assertEquals(id, image.getId());
-    }
-
-    @Test
-    public void getPersonTest() {
-        assertNull(image.getPerson());
-    }
-
-    @Test
-    public void setPersonTest() {
-        Person person = GetRandomPerson();
-        image.setPerson(person);
-        assertEquals(person, image.getPerson());
-    }
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/images/PlaceImageTest.java

@@ -1,51 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 28/03/2025, 09:54. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.images;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import scot.carricksoftware.grantswriter.domains.places.Place;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomPlace;
-
-
-class PlaceImageTest {
-
-    private PlaceImage placeImage;
-
-    @BeforeEach
-    void setUp() {
-        placeImage = new PlaceImage();
-    }
-
-    @Test
-    public void getIdTest() {
-        assertNull(placeImage.getId());
-    }
-
-    @Test
-    public void setIdTest() {
-        Long id = GetRandomLong();
-        placeImage.setId(id);
-        assertEquals(id, placeImage.getId());
-    }
-
-    @Test
-    public void getPlaceTest() {
-        assertNull(placeImage.getPlace());
-    }
-
-    @Test
-    public void setPlaceTest() {
-        Place place = GetRandomPlace();
-        placeImage.setPlace(place);
-        assertEquals(place, placeImage.getPlace());
-    }
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/people/PersonTest.java

@@ -8,13 +8,11 @@ package scot.carricksoftware.grantswriter.domains.people;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
 
-
-class PersonTest {
-
+public class PersonTest {
     Person person;
 
     @BeforeEach
@@ -69,6 +67,4 @@ class PersonTest {
         person.setCertifiedYearOfBirth(certifiedYearOfBirth);
         assertEquals(certifiedYearOfBirth, person.getCertifiedYearOfBirth());
     }
-
-
-}
+}

src/test/java/scot/carricksoftware/grantswriter/domains/people/PersonToStringTest.java

@@ -10,8 +10,7 @@ import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-
-class PersonToStringTest {
+public class PersonToStringTest {
 
     private Person person;
 
@@ -36,5 +35,4 @@ class PersonToStringTest {
         person.setCertifiedYearOfBirth("1955");
         assertEquals("last, first, 1955 -", person.toString());
     }
-
-}
+}

src/test/java/scot/carricksoftware/grantswriter/domains/places/CountryTest.java

@@ -1,64 +0,0 @@
-package scot.carricksoftware.grantswriter.domains.places;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomRegion;
-
-
-class CountryTest {
-    private Country country;
-
-
-    @BeforeEach
-    public void setUp() {
-        country = new Country();
-    }
-
-    @Test
-    public void getIdTest() {
-        assertNull(country.getId());
-    }
-
-    @Test
-    public void setIdTest() {
-        Long id = GetRandomLong();
-        country.setId(id);
-        assertEquals(id, country.getId());
-    }
-
-    @Test
-    public void getNameTest() {
-        assertNull(country.getName());
-    }
-
-    @Test
-    public void setLastNameTest() {
-        String name = GetRandomString();
-        country.setName(name);
-        assertEquals(name, country.getName());
-    }
-
-    @Test
-    public void getRegionsTest() {
-        assertTrue(country.getRegions().isEmpty());
-    }
-
-    @Test
-    public void setRegionsTest() {
-        List<Region> regions = new ArrayList<>();
-        regions.add(GetRandomRegion());
-        country.setRegions(regions);
-        assertEquals(regions, country.getRegions());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/places/OrganisationTest.java

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.places;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-
-class OrganisationTest {
-
-    private Organisation organisation;
-
-    @BeforeEach
-    void setUp() {
-        organisation = new Organisation();
-    }
-
-    @Test
-    void getIdTest() {
-        assertNull(organisation.getId());
-    }
-
-    @Test
-    void setIdTest() {
-        String id = GetRandomString();
-        organisation.setName(id);
-        assertEquals(id, organisation.getName());
-    }
-
-    @Test
-    void getNameTest() {
-        assertNull(organisation.getName());
-    }
-
-    @Test
-    void setNameTest() {
-        String name = GetRandomString();
-        organisation.setName(name);
-        assertEquals(name, organisation.getName());
-    }
-
-    @Test
-    void toStringTest() {
-        String name = GetRandomString();
-        organisation.setName(name);
-        assertEquals(name, organisation.toString());
-    }
-}

src/test/java/scot/carricksoftware/grantswriter/domains/places/PlaceTest.java

@@ -1,145 +0,0 @@
-
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 14:33.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.places;
-
-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.jupiter.MockitoExtension;
-import scot.carricksoftware.grantswriter.domains.census.Census;
-import scot.carricksoftware.grantswriter.domains.images.PlaceImage;
-import scot.carricksoftware.grantswriter.domains.text.PlaceText;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.when;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grantswriter.GenerateRandomCensusValues.GetRandomCensus;
-import static scot.carricksoftware.grantswriter.GenerateRandomImageValues.GetRandomPlaceImage;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomRegion;
-import static scot.carricksoftware.grantswriter.GenerateRandomTextValues.GetRandomPlaceText;
-
-
-@ExtendWith(MockitoExtension.class)
-public class PlaceTest {
-
-    private Place place;
-
-    @Mock
-    private Country countryMock;
-
-    @Mock
-    private Region regionMock;
-
-
-    @BeforeEach
-    public void setUp() {
-        place = new Place();
-    }
-
-    @Test
-    public void getIdTest() {
-        assertNull(place.getId());
-    }
-
-    @Test
-    public void setIdTest() {
-        Long id = GetRandomLong();
-        place.setId(id);
-        assertEquals(id, place.getId());
-    }
-
-    @Test
-    public void getNameTest() {
-        assertNull(place.getName());
-    }
-
-    @Test
-    public void setLastNameTest() {
-        String name = GetRandomString();
-        place.setName(name);
-        assertEquals(name, place.getName());
-    }
-
-    @Test
-    public void getRegionTest() {
-        assertNull(place.getRegion());
-    }
-
-    @Test
-    public void setRegionTest() {
-        Region region = GetRandomRegion();
-        place.setRegion(region);
-        assertEquals(region, place.getRegion());
-    }
-
-    @Test
-    public void getCensusesTest() {
-        assertTrue(place.getCensuses().isEmpty());
-    }
-
-    @Test
-    public void setCensusesTest() {
-        List<Census> censuses = new ArrayList<>();
-        censuses.add(GetRandomCensus());
-        place.setCensuses(censuses);
-        assertEquals(censuses, place.getCensuses());
-    }
-
-    @Test
-    public void getPLaceImagesTest() {
-        assertTrue(place.getPlaceImages().isEmpty());
-    }
-
-    @Test
-    public void setPlaceImagesTest() {
-        List<PlaceImage> placeImages = new ArrayList<>();
-        placeImages.add(GetRandomPlaceImage());
-        place.setPlaceImages(placeImages);
-        assertEquals(placeImages, place.getPlaceImages());
-    }
-
-    @Test
-    public void getPLaceTextsTest() {
-        assertTrue(place.getPlaceTexts().isEmpty());
-    }
-
-    @Test
-    public void setPlaceTextsTest() {
-        List<PlaceText> placeTexts = new ArrayList<>();
-        placeTexts.add(GetRandomPlaceText());
-        place.setPlaceTexts(placeTexts);
-        assertEquals(placeTexts, place.getPlaceTexts());
-    }
-
-    @Test
-    public void toStringTest() {
-        String string = GetRandomString();
-        String string2 = GetRandomString();
-        String string3 = GetRandomString();
-
-        place.setName(string3);
-        when(regionMock.getName()).thenReturn(string);
-        when(regionMock.getCountry()).thenReturn(countryMock);
-        when(countryMock.getName()).thenReturn(string2);
-
-        place.setRegion(regionMock);
-
-        assertEquals(string3 + ", "
-                + string + ", "
-                + string2, place.toString());
-    }
-
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/places/RegionTest.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 14:34.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.places;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static scot.carricksoftware.grantswriter.GenerateCertificateRandomValues.GetRandomString;
-import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomCountry;
-import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomPlace;
-
-
-public class RegionTest {
-
-    Region region;
-
-    @BeforeEach
-    public void setUp() {
-        region = new Region();
-    }
-
-    @Test
-    public void getNameTest() {
-        assertNull(region.getName());
-    }
-
-    @Test
-    public void setNameTest() {
-        String name = GetRandomString();
-        region.setName(name);
-        assertEquals(name, region.getName());
-    }
-
-    @Test
-    public void getCountryTest() {
-        assertNull(region.getCountry());
-    }
-
-    @Test
-    public void setCountryTest() {
-        Country country = GetRandomCountry();
-        region.setCountry(country);
-        assertEquals(country, region.getCountry());
-    }
-
-    @Test
-    public void getPlacesTest() {
-        assertTrue(region.getPlaces().isEmpty());
-    }
-
-    @Test
-    public void setRegionsTest() {
-        List<Place> places = new ArrayList<>();
-        places.add(GetRandomPlace());
-        region.setPlaces(places);
-        assertEquals(places, region.getPlaces());
-    }
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/text/DocumentTextTest.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 30/03/2025, 10:28. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.text;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.hibernate.validator.internal.util.Contracts.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-
-
-class DocumentTextTest {
-
-    private DocumentText documentText;
-
-    @BeforeEach
-    void setUp() {
-        documentText = new DocumentText();
-    }
-
-    @Test
-    void getIdTest() {
-        Long id = GetRandomLong();
-        documentText.setId(id);
-        assertNotNull(documentText.getId());
-    }
-
-    @Test
-    void setIdTest() {
-        Long id = GetRandomLong();
-        documentText.setId(id);
-        assertEquals(id, documentText.getId());
-    }
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/text/PersonTextTest.java

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 30/03/2025, 10:25. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.text;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import scot.carricksoftware.grantswriter.domains.people.Person;
-
-import static org.hibernate.validator.internal.util.Contracts.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grantswriter.GenerateRandomPeopleValues.GetRandomPerson;
-
-
-class PersonTextTest {
-
-    private PersonText personText;
-
-    @BeforeEach
-    void setUp() {
-        personText = new PersonText();
-    }
-
-    @Test
-    void getIdTest() {
-        Long id = GetRandomLong();
-        personText.setId(id);
-        assertNotNull(personText.getId());
-    }
-
-    @Test
-    void setIdTest() {
-        Long id = GetRandomLong();
-        personText.setId(id);
-        assertEquals(id, personText.getId());
-    }
-
-    @Test
-    void getPersonTest() {
-        assertNull(personText.getPerson());
-    }
-
-    @Test
-    void setPersonTest() {
-        Person person = GetRandomPerson();
-        personText.setPerson(person);
-        assertEquals(person, personText.getPerson());
-    }
-
-}

src/test/java/scot/carricksoftware/grantswriter/domains/text/PlaceTextTest.java

@@ -1,54 +0,0 @@
-/*
- * Copyright (c) Andrew Grant of Carrick Software 30/03/2025, 10:28. All rights reserved.
- *
- */
-
-package scot.carricksoftware.grantswriter.domains.text;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import scot.carricksoftware.grantswriter.domains.places.Place;
-
-import static org.hibernate.validator.internal.util.Contracts.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static scot.carricksoftware.grantswriter.GenerateRandomNumberValues.GetRandomLong;
-import static scot.carricksoftware.grantswriter.GenerateRandomPlaceValues.GetRandomPlace;
-
-
-class PlaceTextTest {
-
-    private PlaceText placeText;
-
-    @BeforeEach
-    void setUp() {
-        placeText = new PlaceText();
-    }
-
-    @Test
-    void getIdTest() {
-        Long id = GetRandomLong();
-        placeText.setId(id);
-        assertNotNull(placeText.getId());
-    }
-
-    @Test
-    void setIdTest() {
-        Long id = GetRandomLong();
-        placeText.setId(id);
-        assertEquals(id, placeText.getId());
-    }
-
-    @Test
-    void getPlaceTest() {
-        assertNull(placeText.getPlace());
-    }
-
-    @Test
-    void setPlaceTest() {
-        Place place = GetRandomPlace();
-        placeText.setPlace(place);
-        assertEquals(place, placeText.getPlace());
-    }
-
-}