Merge pull request #215 from ptidejteam/fix/codebase_refactoring

Refactor Test Suite Structure, Naming, and Resource Handling in CITYdata

Author: SikandarEjaz

Middleware/src/main/java/ca/concordia/encs/citydata/producers/BuildingProducer.java

@@ -27,7 +27,7 @@ public class BuildingProducer extends AbstractProducer<JsonObject> implements IP
 
 	public void setBuildingName(String buildingName) {
 		if (buildingName != null) {
-			this.filePath = "docs/examples/data/" + buildingName + "_building.json";
+			this.filePath = "./src/test/resources/" + buildingName + "_building.json";
 		} else {
 			throw new InvalidParameterException("Please provide a building name to the producer.");
 		}

Middleware/src/main/java/ca/concordia/encs/citydata/producers/EnergyConsumptionProducer.java

@@ -40,7 +40,7 @@ public class EnergyConsumptionProducer extends AbstractProducer<JsonArray> imple
 	public void setCity(String city) {
 		this.city = city;
 		if (this.city != null) {
-			this.cityConsumptionDataset = "docs/examples/data/" + this.city + "_energy_consumption.parquet";
+			this.cityConsumptionDataset = "./src/test/resources/" + this.city + "_energy_consumption.parquet";
 		} else {
 			throw new InvalidParameterException("Please provide a city name to the producer.");
 		}
@@ -58,7 +58,7 @@ public void setClientId(Integer clientId) {
 		this.clientId = clientId;
 	}
 
-	private String buildQuery() {
+	public String buildQuery() {
 		final Object[] arr = new Object[4];
 		final String baseQuery = "SELECT Identifiant as clientId, dateinterval as timestamp, energieactivelivree_kwh as consumptionKwh FROM '%s'";
 		String preparedStmt = baseQuery + " WHERE Identifiant is not null";
@@ -82,7 +82,7 @@ private String buildQuery() {
 		return String.format(preparedStmt, arr);
 	}
 
-	private void validateParams() {
+	public void validateParams() {
 		final int MAX_QUERY_DAYS = 30;
 		final LocalDateTime localStartDate = StringUtils.parseDate(this.startDatetime);
 		final LocalDateTime localEndDate = StringUtils.parseDate(this.endDatetime);

Middleware/src/main/java/ca/concordia/encs/citydata/producers/GeometryProducer.java

@@ -20,7 +20,7 @@ public class GeometryProducer extends AbstractProducer<String> implements IProdu
 
 	public void setCity(String city) {
 		if (city != null) {
-			jsonProducer = new JSONProducer("docs/examples/data/" + city + "_geometries.json", null);
+			jsonProducer = new JSONProducer("./src/test/resources/" + city + "_geometries.json", null);
 		} else {
 			throw new InvalidParameterException("Please provide a city name to the producer.");
 		}