From e19fc13714ac0d1bad80439141b100738e9c18dd Mon Sep 17 00:00:00 2001
From: Rhys Evans <EvansRM17@cardiff.ac.uk>
Date: Tue, 12 Dec 2023 11:06:07 +0000
Subject: [PATCH] Attempting to fix module conflicts, commiting to allow a
 re-laod

---
 .../java/Team5/SmartTowns/CalculatorTest.java |  2 +-
 .../java/Team5/SmartTowns/DBUnitTestCase.java |  5 +-
 src/test/java/Team5/SmartTowns/Test5.java     | 78 +++++++++----------
 3 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/src/test/java/Team5/SmartTowns/CalculatorTest.java b/src/test/java/Team5/SmartTowns/CalculatorTest.java
index 1aea1c6a..33b9fdac 100644
--- a/src/test/java/Team5/SmartTowns/CalculatorTest.java
+++ b/src/test/java/Team5/SmartTowns/CalculatorTest.java
@@ -9,7 +9,7 @@ import org.springframework.core.NestedRuntimeException;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import org.junit.platform.engine.TestDescriptor;
+//import org.junit.platform.engine.TestDescriptor;
 //import org.junit.platform.commons.util.Preconditions;
 import org.apache.commons.logging.LogFactory;
 @SpringBootTest
diff --git a/src/test/java/Team5/SmartTowns/DBUnitTestCase.java b/src/test/java/Team5/SmartTowns/DBUnitTestCase.java
index 7d64da18..646b90a8 100644
--- a/src/test/java/Team5/SmartTowns/DBUnitTestCase.java
+++ b/src/test/java/Team5/SmartTowns/DBUnitTestCase.java
@@ -1,6 +1,9 @@
 package Team5.SmartTowns;
 
 import org.junit.jupiter.api.Test;
+
+//import static org.testing.AssertJUnit.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 //import org.springframework.boot.test.context.SpringBootTest;
 //import org.testng.annotations.Test;
 //import org.testng.annotations.Test;
@@ -8,7 +11,7 @@ import org.junit.jupiter.api.Test;
 //import org.junit.platform.engine.TestDescriptor;
 
 //import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.testng.AssertJUnit.assertEquals;
+
 
 public class DBUnitTestCase {
     int bb=4;
diff --git a/src/test/java/Team5/SmartTowns/Test5.java b/src/test/java/Team5/SmartTowns/Test5.java
index 4ea4af12..75877470 100644
--- a/src/test/java/Team5/SmartTowns/Test5.java
+++ b/src/test/java/Team5/SmartTowns/Test5.java
@@ -1,39 +1,39 @@
-//package Team5.SmartTowns;
-//
-//import Team5.SmartTowns.Data.locationRepository;
-//import Team5.SmartTowns.Data.locationRepositoryJDBC;
-////import org.junit.jupiter.api.Test;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
-//import org.springframework.boot.test.context.SpringBootTest;
-//import org.springframework.jdbc.core.JdbcTemplate;
-//import org.springframework.test.context.jdbc.Sql;
-//import org.testng.annotations.Test;
-//
-////import static org.junit.jupiter.api.Assertions.assertEquals;
-//import static org.testng.Assert.assertEquals;
-//
-//@SpringBootTest
-////@JdbcTest
-////
-//@Sql({"schema.sql", "test-data.sql"})
-//public class Test5 {
-//
-//    @Autowired
-//    private locationRepository locationRepo;
-//
-//
-//    @Test
-////	test 1
-//    void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount() {
-////        locationRepositoryJDBC employeeDAO = new locationRepositoryJDBC(ajdbc);
-//        int aa=2;
-//        int bb=2;
-////        employeeDAO.setJdbc(ajdbc);
-//        assertEquals(4, (aa+bb));
-//
-//    }
-//
-//
-//
-//}
+package Team5.SmartTowns;
+
+import Team5.SmartTowns.Data.locationRepository;
+import Team5.SmartTowns.Data.locationRepositoryJDBC;
+//import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.jdbc.JdbcTest;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.jdbc.Sql;
+import org.testng.annotations.Test;
+
+//import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.testng.Assert.assertEquals;
+
+@SpringBootTest
+//@JdbcTest
+//
+@Sql({"schema.sql", "test-data.sql"})
+public class Test5 {
+
+    @Autowired
+    private locationRepository locationRepo;
+
+
+    @Test
+//	test 1
+    void whenInjectInMemoryDataSource_thenReturnCorrectEmployeeCount() {
+//        locationRepositoryJDBC employeeDAO = new locationRepositoryJDBC(ajdbc);
+        int aa=2;
+        int bb=2;
+//        employeeDAO.setJdbc(ajdbc);
+        assertEquals(4, (aa+bb));
+
+    }
+
+
+
+}
-- 
GitLab