From 7587d180441ba19083f2f5d0421c69e0431a0ff9 Mon Sep 17 00:00:00 2001
From: Rhys Evans <EvansRM17@cardiff.ac.uk>
Date: Fri, 8 Dec 2023 11:56:13 +0000
Subject: [PATCH] commiting before cahngin compiler
---
build.gradle | 5 +-
.../java/Team5/SmartTowns/CalculatorTest.java | 106 +++++++++---------
.../java/Team5/SmartTowns/DBUnitTestCase.java | 7 +-
src/test/java/Team5/SmartTowns/Test5.java | 6 +-
4 files changed, 65 insertions(+), 59 deletions(-)
diff --git a/build.gradle b/build.gradle
index f660e68a..bc24a66e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -43,8 +43,9 @@ dependencies {
// implementation 'org.springframework.dao.DataAccessException'
// https://mvnrepository.com/artifact/org.springframework/spring-core
implementation 'org.springframework:spring-core:6.0.6'
- implementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.8.1'
- implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.8.1'
+ implementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.0.1'
+ implementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.0.1'
+
//Thanks for using https://jar-download.com
diff --git a/src/test/java/Team5/SmartTowns/CalculatorTest.java b/src/test/java/Team5/SmartTowns/CalculatorTest.java
index 80f25e63..49fc027f 100644
--- a/src/test/java/Team5/SmartTowns/CalculatorTest.java
+++ b/src/test/java/Team5/SmartTowns/CalculatorTest.java
@@ -1,53 +1,53 @@
-package Team5.SmartTowns;
-
-import Team5.SmartTowns.Data.Calculator;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.core.NestedRuntimeException;
-//import org.springframework.dao.DataAccessException;
-
-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.commons.util.Preconditions;
-import org.apache.commons.logging.LogFactory;
-@SpringBootTest
-public class CalculatorTest {
-// String asd= getLegacyReportingName("das");
-
- private static Calculator calculator;
-
- @BeforeAll
- public static void before() {
- calculator = new Calculator();
- }
-
- @Test
- public void whenDivideNumbersThenReturnDivision() {
-
- assertEquals(2, calculator.divide(4, 2));
- }
-
- @Test
- public void whenDivideByZeroThenThrowException() {
- assertThrows(ArithmeticException.class, () -> calculator.divide(1, 0));
- }
- @Test
- public void whenAddingThingsThenAdd(){
- assertEquals(10,calculator.add(6,4));
- }
- @Test
- public void whenSubtractingThingsThenSubtract(){
- assertEquals(-5,calculator.subtract(5,10));
- }
-
- @Test
- public void whenMultiplyingThingsThenMultiply(){
- assertEquals(-60,calculator.multiply(-3,20));
- }
-
-
-
-
-}
+//package Team5.SmartTowns;
+//
+//import Team5.SmartTowns.Data.Calculator;
+//import org.junit.jupiter.api.BeforeAll;
+//import org.junit.jupiter.api.Test;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.core.NestedRuntimeException;
+////import org.springframework.dao.DataAccessException;
+//
+//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.commons.util.Preconditions;
+//import org.apache.commons.logging.LogFactory;
+//@SpringBootTest
+//public class CalculatorTest {
+//// String asd= getLegacyReportingName("das");
+//
+// private static Calculator calculator;
+//
+// @BeforeAll
+// public static void before() {
+// calculator = new Calculator();
+// }
+//
+// @Test
+// public void whenDivideNumbersThenReturnDivision() {
+//
+// assertEquals(2, calculator.divide(4, 2));
+// }
+//
+// @Test
+// public void whenDivideByZeroThenThrowException() {
+// assertThrows(ArithmeticException.class, () -> calculator.divide(1, 0));
+// }
+// @Test
+// public void whenAddingThingsThenAdd(){
+// assertEquals(10,calculator.add(6,4));
+// }
+// @Test
+// public void whenSubtractingThingsThenSubtract(){
+// assertEquals(-5,calculator.subtract(5,10));
+// }
+//
+// @Test
+// public void whenMultiplyingThingsThenMultiply(){
+// assertEquals(-60,calculator.multiply(-3,20));
+// }
+//
+//
+//
+//
+//}
diff --git a/src/test/java/Team5/SmartTowns/DBUnitTestCase.java b/src/test/java/Team5/SmartTowns/DBUnitTestCase.java
index 86b6c697..bb2352e2 100644
--- a/src/test/java/Team5/SmartTowns/DBUnitTestCase.java
+++ b/src/test/java/Team5/SmartTowns/DBUnitTestCase.java
@@ -1,9 +1,12 @@
package Team5.SmartTowns;
-import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
+import org.testng.annotations.Test;
+//import org.apiguardian.api;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+//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 65ef6fdb..c4275074 100644
--- a/src/test/java/Team5/SmartTowns/Test5.java
+++ b/src/test/java/Team5/SmartTowns/Test5.java
@@ -1,14 +1,16 @@
package Team5.SmartTowns;
import Team5.SmartTowns.Data.locationRepositoryJDBC;
-import org.junit.jupiter.api.Test;
+//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.junit.jupiter.api.Assertions.assertEquals;
+import static org.testng.Assert.assertEquals;
@SpringBootTest
@JdbcTest
--
GitLab