diff --git a/build.gradle b/build.gradle index f660e68abe55397d1c2a3f4d7d8859b198c4f790..bc24a66eabe1a9fd5d5025b6ee7f3089c3848615 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 80f25e63e6e252c76107ba2a9a31269e474b2b76..49fc027fbba95aa0a072759a0ad86995dc79e824 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 86b6c697e9678a81135514dfd7c092dfde582b70..bb2352e260a494d45a74d67ef69e4207a46dd011 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 65ef6fdb043bde7385d4d4caf081c58796139241..c42750744f98d2674efddf494f76d611549ffac7 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