From f2b55e17a6a65f32b9889f8ac1221a5ba1ebc1ba Mon Sep 17 00:00:00 2001
From: Rhys Evans <EvansRM17@cardiff.ac.uk>
Date: Tue, 5 Dec 2023 18:36:56 +0000
Subject: [PATCH] further testing
---
.../SmartTowns/Data/DatabaseController.java | 22 ++++----
.../java/Team5/SmartTowns/Data/Location.java | 4 ++
src/main/java/Team5/SmartTowns/Data/Main.java | 10 ++++
.../SmartTowns/Data/locationRepository.java | 2 +-
.../Data/locationRepositoryJDBC.java | 2 -
src/main/resources/data.sql | 2 +-
.../SmartTownsApplicationTests.java | 52 ++++++-------------
7 files changed, 44 insertions(+), 50 deletions(-)
create mode 100644 src/main/java/Team5/SmartTowns/Data/Main.java
diff --git a/src/main/java/Team5/SmartTowns/Data/DatabaseController.java b/src/main/java/Team5/SmartTowns/Data/DatabaseController.java
index c7f3b261..4c8cb9c2 100644
--- a/src/main/java/Team5/SmartTowns/Data/DatabaseController.java
+++ b/src/main/java/Team5/SmartTowns/Data/DatabaseController.java
@@ -34,15 +34,15 @@ public class DatabaseController {
}
//
- public List<Location> approvedLocations(){
- List<Location> locations = locationRepository.getAllLocation();
- List<Location> locationApprovalList;
-// for (int i=0;i<locations.size();i++){
-// location
- for (Location loc :locations){
- if (loc.isLocationApproved()) {
- locationApprovalList.add(loc);
- }
- } return locationApprovalList;
- }
+// public List<Location> approvedLocations(){
+// List<Location> locations = locationRepository.getAllLocation();
+// List<Location> locationApprovalList;
+//// for (int i=0;i<locations.size();i++){
+//// location
+// for (Location loc :locations){
+// if (loc.isLocationApproved()) {
+// locationApprovalList.add(loc);
+// }
+// } return locationApprovalList;
+// }
}
diff --git a/src/main/java/Team5/SmartTowns/Data/Location.java b/src/main/java/Team5/SmartTowns/Data/Location.java
index 8d4a18e2..8f9e5298 100644
--- a/src/main/java/Team5/SmartTowns/Data/Location.java
+++ b/src/main/java/Team5/SmartTowns/Data/Location.java
@@ -15,6 +15,10 @@ public class Location {
private boolean locationApproved;
+ public Location() {
+
+ }
+
@Override
public String toString() {
return "Location{" +
diff --git a/src/main/java/Team5/SmartTowns/Data/Main.java b/src/main/java/Team5/SmartTowns/Data/Main.java
new file mode 100644
index 00000000..7271a232
--- /dev/null
+++ b/src/main/java/Team5/SmartTowns/Data/Main.java
@@ -0,0 +1,10 @@
+package Team5.SmartTowns.Data;
+
+import java.util.List;
+
+public class Main {
+ public static void main(String[] args) {
+ List<Location> approvedNumber= locationRepository.approvedLocations();
+
+ }
+}
diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepository.java b/src/main/java/Team5/SmartTowns/Data/locationRepository.java
index 35e0ddbd..bbd227d2 100644
--- a/src/main/java/Team5/SmartTowns/Data/locationRepository.java
+++ b/src/main/java/Team5/SmartTowns/Data/locationRepository.java
@@ -7,6 +7,6 @@ import java.util.List;
public interface locationRepository {
List<Location> getAllLocation();
void addLocation(Location loc);
- List<Location> approvedLocations();
+ List<Location> approvedLocations();
}
diff --git a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java
index 6baeca34..91729658 100644
--- a/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/Data/locationRepositoryJDBC.java
@@ -44,8 +44,6 @@ public class locationRepositoryJDBC implements locationRepository {
public List<Location> approvedLocations(){
List<Location> locations = getAllLocation();
List<Location> locationApprovalList= new ArrayList<>();
-// for (int i=0;i<locations.size();i++){
-// location
for (Location loc :locations){
if (loc.isLocationApproved()) {
locationApprovalList.add(loc);
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 838a859b..3ee0f305 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -7,7 +7,7 @@ insert into trails ( Name) value ( 'Caerphilly Coffee Trail');
insert into trails ( Name) value ( 'Penarth Dragon Trail');
delete from locations;
-insert into locations ( locationName , locationEmail,locationDescription,locationPlace, locationTrailID, locationApproved) value ( 'St Cenydd','','Location description here','Caerphilly',0101, true);
+insert into locations ( locationName , locationEmail,locationDescription,locationPlace, locationTrailID, locationApproved)value ( 'St Cenydd','','Location description here','Caerphilly',0101, true);
insert into locations ( locationName , locationEmail,locationDescription,locationPlace, locationTrailID, locationApproved) value ( 'The Castle','','Location description here','Caerphilly',0101, true);
insert into locations ( locationName , locationEmail,locationDescription,locationPlace, locationTrailID, locationApproved) value ( 'Medieval Trades','','Location description here','Caerphilly',0101, true);
insert into locations ( locationName , locationEmail,locationDescription,locationPlace, locationTrailID, locationApproved) value ( 'The Queen''s War','','Location description here','Caerphilly',0101, true);
diff --git a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
index cafd1c86..93eb2bfd 100644
--- a/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
+++ b/src/test/java/Team5/SmartTowns/SmartTownsApplicationTests.java
@@ -14,7 +14,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import java.lang.annotation.Inherited;
import java.util.List;
-import static sun.java2d.pipe.PixelToParallelogramConverter.len;
+
@SpringBootTest
@@ -24,48 +24,30 @@ class SmartTownsApplicationTests {
void contextLoads() {
}
- private static Landmarks landamrk;
private static Location location;
+ @BeforeAll
+ public static void before() {
+ location = new Location(); }
@Autowired
private locationRepository locationRepository;
@Test
public void whenAddingLocationsNonApprovedLocationsDontShowInTrails(){
/// Discover number of approved/unapproved locations before adding tests
-// DatabaseController.approvedLocations();
-
- int locationFailureNumber= locations.size()-locationApprovalList.size(); // ensure number always positive
-
- Location loc1= new Location("TestFail", "Test@PleaseFail.test", "Fail Description here",
- "Caerphilly", 103, false);
- Location loc2= new Location("TestFail", "Test@PleaseFail.test", "Fail Description here",
- "Caerphilly", 103, false);
- Location loc3= new Location("TestPass", "Test@PleasePass.test", "Pass Description here",
- "Caerphilly", 103, true);
- locationRepository.addLocation(loc1);
- locationRepository.addLocation(loc2);
- locationRepository.addLocation(loc3);
- List<Location> locationsAfter = locationRepository.getAllLocation();
- List<String> locationApprovalListAfter = null;
- List<String> locationFailureListAfter = null;
-// for (int i=0;i<locations.size();i++){
-// location
- for (Location loc :locationsAfter){
- if (loc.isLocationApproved()) {
- locationApprovalListAfter.add(loc.getLocationName());
- } else{
- locationFailureListAfter.add(loc.getLocationName());}
- }
- int locationFailureNumberAfter= locations.size()-locationApprovalListAfter.size(); // ensure number always positive
- assertEquals(2,locationFailureNumber-locationFailureNumberAfter);
+ List<Location> approvedNumber= locationRepository.approvedLocations();
+// Location loc1= new Location("TestFail", "Test@PleaseFail.test", "Fail Description here",
+// "Caerphilly", 103, false);
+// Location loc2= new Location("TestFail", "Test@PleaseFail2.test", "Fail Description here",
+// "Caerphilly", 103, false);
+// Location loc3= new Location("TestPass", "Test@PleasePass.test", "Pass Description here",
+// "Caerphilly", 103, true);
+// locationRepository.addLocation(loc1);
+// locationRepository.addLocation(loc2);
+// locationRepository.addLocation(loc3);
+// List<Location> ApprovedNumberAfter=locationRepository.approvedLocations();
+//
+// assertEquals(1,( ApprovedNumber.size()-ApprovedNumberAfter.size()));
}
-
-
-
-
-
-// locationRepository.addLocation(loc); // adds valid landmark to locations table
-// ModelAndView modelAndView = new ModelAndView("redirect:/home");
}
--
GitLab