From 2f4c3f6d2070a66d82ec3a304458a17dccd3a59c Mon Sep 17 00:00:00 2001 From: Marat Akhin Date: Fri, 19 Nov 2021 15:35:55 +0300 Subject: [PATCH] Rename tests in lesson 11/12 to avoid clashes in Kotoed grading --- test/lesson11/task1/ComplexTest.kt | 12 +++++----- test/lesson11/task1/DimensionalValueTest.kt | 16 +++++++------- test/lesson11/task1/FixedPointNumberTest.kt | 22 +++++++++---------- test/lesson11/task1/PolynomTest.kt | 20 ++++++++--------- test/lesson11/task1/RationalTest.kt | 20 ++++++++--------- test/lesson11/task1/UnsignedBigIntegerTest.kt | 16 +++++++------- test/lesson12/task1/OpenHashSetTest.kt | 12 +++++----- test/lesson12/task1/PhoneBookTest.kt | 4 ++-- test/lesson12/task1/SinglyLinkedListTest.kt | 16 +++++++------- test/lesson12/task1/TableFunctionTest.kt | 8 +++---- test/lesson12/task1/TrainTimeTableTest.kt | 2 +- 11 files changed, 74 insertions(+), 74 deletions(-) diff --git a/test/lesson11/task1/ComplexTest.kt b/test/lesson11/task1/ComplexTest.kt index 2db78a84..ee41bebb 100644 --- a/test/lesson11/task1/ComplexTest.kt +++ b/test/lesson11/task1/ComplexTest.kt @@ -14,37 +14,37 @@ internal class ComplexTest { @Test @Tag("2") - fun plus() { + fun complexPlus() { assertApproxEquals(Complex("4-2i"), Complex("1+2i") + Complex("3-4i"), 1e-10) } @Test @Tag("2") - operator fun unaryMinus() { + fun complexUnaryMinus() { assertApproxEquals(Complex(1.0, -2.0), -Complex(-1.0, 2.0), 1e-10) } @Test @Tag("2") - fun minus() { + fun complexMinus() { assertApproxEquals(Complex("2-6i"), Complex("3-4i") - Complex("1+2i"), 1e-10) } @Test @Tag("4") - fun times() { + fun complexTimes() { assertApproxEquals(Complex("11+2i"), Complex("1+2i") * Complex("3-4i"), 1e-10) } @Test @Tag("4") - fun div() { + fun complexDiv() { assertApproxEquals(Complex("1+2i"), Complex("11+2i") / Complex("3-4i"), 1e-10) } @Test @Tag("2") - fun equals() { + fun complexEquals() { assertApproxEquals(Complex(1.0, 2.0), Complex("1+2i"), 1e-12) assertApproxEquals(Complex(1.0, 0.0), Complex(1.0), 1e-12) } diff --git a/test/lesson11/task1/DimensionalValueTest.kt b/test/lesson11/task1/DimensionalValueTest.kt index 192e3016..242d0df3 100644 --- a/test/lesson11/task1/DimensionalValueTest.kt +++ b/test/lesson11/task1/DimensionalValueTest.kt @@ -14,7 +14,7 @@ internal class DimensionalValueTest { @Test @Tag("12") - fun base() { + fun dvBase() { val first = DimensionalValue(1.0, "Kg") assertEquals(1000.0, first.value) assertEquals(Dimension.GRAM, first.dimension) @@ -25,7 +25,7 @@ internal class DimensionalValueTest { @Test @Tag("6") - fun plus() { + fun dvPlus() { assertApproxEquals(DimensionalValue("2 Km"), DimensionalValue("1 Km") + DimensionalValue("1000 m"), 1e-8) assertThrows(IllegalArgumentException::class.java) { DimensionalValue("1 g") + DimensionalValue("1 m") @@ -34,13 +34,13 @@ internal class DimensionalValueTest { @Test @Tag("4") - operator fun unaryMinus() { + fun dvUnaryMinus() { assertApproxEquals(DimensionalValue("-2 g"), -DimensionalValue("2 g"), 1e-12) } @Test @Tag("6") - fun minus() { + fun dvMinus() { assertApproxEquals(DimensionalValue("0 m"), DimensionalValue("1 Km") - DimensionalValue("1000 m"), 1e-10) assertThrows(IllegalArgumentException::class.java) { DimensionalValue("1 g") - DimensionalValue("1 m") @@ -49,7 +49,7 @@ internal class DimensionalValueTest { @Test @Tag("4") - fun times() { + fun dvTimes() { assertApproxEquals(DimensionalValue("2 Kg"), DimensionalValue("2 g") * 1000.0, 1e-8) } @@ -70,20 +70,20 @@ internal class DimensionalValueTest { @Test @Tag("4") - fun equals() { + fun dvEquals() { assertEquals(DimensionalValue("1 Kg"), DimensionalValue("1 Kg")) assertEquals(DimensionalValue("3 mm"), DimensionalValue("3 mm")) } @Test @Tag("4") - fun hashCodeTest() { + fun dvHashCode() { assertEquals(DimensionalValue("1 Kg").hashCode(), DimensionalValue("1 Kg").hashCode()) } @Test @Tag("4") - fun compareTo() { + fun dvCompareTo() { assertTrue(DimensionalValue("1 Kg") < DimensionalValue("1500 g")) assertTrue(DimensionalValue("1 m") > DimensionalValue("900 mm")) } diff --git a/test/lesson11/task1/FixedPointNumberTest.kt b/test/lesson11/task1/FixedPointNumberTest.kt index 04f120bd..8a017c6a 100644 --- a/test/lesson11/task1/FixedPointNumberTest.kt +++ b/test/lesson11/task1/FixedPointNumberTest.kt @@ -9,7 +9,7 @@ class FixedPointNumberTest { @Test @Tag("6") - fun getPrecision() { + fun fpnGetPrecision() { val n = FixedPointNumber("1.2345") assertEquals(4, n.precision) val m = FixedPointNumber(42) @@ -18,7 +18,7 @@ class FixedPointNumberTest { @Test @Tag("6") - fun plus() { + fun fpnPlus() { val x = FixedPointNumber("2.345") val y = FixedPointNumber("19.7532") assertEquals(FixedPointNumber("22.0982"), x + y) @@ -26,14 +26,14 @@ class FixedPointNumberTest { @Test @Tag("4") - operator fun unaryMinus() { + fun fpnUnaryMinus() { val x = FixedPointNumber("2.345") assertEquals(FixedPointNumber("-2.345"), -x) } @Test @Tag("6") - fun minus() { + fun fpnMinus() { val x = FixedPointNumber("2.345") val y = FixedPointNumber("19.7532") assertEquals(FixedPointNumber("17.4082"), y - x) @@ -41,7 +41,7 @@ class FixedPointNumberTest { @Test @Tag("10") - fun times() { + fun fpnTimes() { val x = FixedPointNumber("2.345") val y = FixedPointNumber("19.7532") assertEquals(FixedPointNumber("46.3213"), x * y) @@ -49,7 +49,7 @@ class FixedPointNumberTest { @Test @Tag("10") - fun div() { + fun fpnDiv() { val x = FixedPointNumber("2.345") val y = FixedPointNumber("19.7532") assertEquals(FixedPointNumber("8.424"), y / x) @@ -57,7 +57,7 @@ class FixedPointNumberTest { @Test @Tag("6") - fun testEquals() { + fun fpnEquals() { val x = FixedPointNumber(19.7532, 4) val y = FixedPointNumber("19.7532") assertTrue(x == y) @@ -65,7 +65,7 @@ class FixedPointNumberTest { @Test @Tag("6") - fun testHashCode() { + fun fpnHashCode() { val x = FixedPointNumber(19.7532, 4) val y = FixedPointNumber("19.7532") assertTrue(x.hashCode() == y.hashCode()) @@ -73,7 +73,7 @@ class FixedPointNumberTest { @Test @Tag("6") - fun compareTo() { + fun fpnCompareTo() { val x = FixedPointNumber("2.345") val y = FixedPointNumber("19.7532") assertTrue(y > x) @@ -82,14 +82,14 @@ class FixedPointNumberTest { @Test @Tag("4") - fun testToString() { + fun fpnToString() { val x = FixedPointNumber(19.7532, 4) assertEquals("19.7532", x.toString()) } @Test @Tag("6") - fun toDouble() { + fun fpnToDouble() { val x = FixedPointNumber("19.7532") assertEquals(19.7532, x.toDouble(), 1e-5) } diff --git a/test/lesson11/task1/PolynomTest.kt b/test/lesson11/task1/PolynomTest.kt index d8d957a7..b3d08a0c 100644 --- a/test/lesson11/task1/PolynomTest.kt +++ b/test/lesson11/task1/PolynomTest.kt @@ -16,14 +16,14 @@ class PolynomTest { @Test @Tag("4") - fun getValue() { + fun polynomGetValue() { val p = Polynom(1.0, 3.0, 2.0) assertEquals(42.0, p.getValue(5.0), 1e-10) } @Test @Tag("4") - fun degree() { + fun polynomDegree() { val p = Polynom(1.0, 1.0, 1.0) assertEquals(2, p.degree()) val q = Polynom(0.0) @@ -34,7 +34,7 @@ class PolynomTest { @Test @Tag("4") - fun plus() { + fun polynomPlus() { val p1 = Polynom(1.0, -2.0, -1.0, 4.0) val p2 = Polynom(1.0, 3.0, 2.0) val r = Polynom(1.0, -1.0, 2.0, 6.0) @@ -44,7 +44,7 @@ class PolynomTest { @Test @Tag("4") - operator fun unaryMinus() { + fun polynomUnaryMinus() { val p = Polynom(1.0, -1.0, 2.0) val r = Polynom(-1.0, 1.0, -2.0) assertApproxEquals(r, -p, 1e-11) @@ -52,7 +52,7 @@ class PolynomTest { @Test @Tag("4") - fun minus() { + fun polynomMinus() { val p1 = Polynom(1.0, -2.0, -1.0, 4.0) val p2 = Polynom(1.0, 3.0, 2.0) val r = Polynom(1.0, -3.0, -4.0, 2.0) @@ -62,7 +62,7 @@ class PolynomTest { @Test @Tag("6") - fun times() { + fun polynomTimes() { val p1 = Polynom(1.0, -2.0, -1.0, 4.0) val p2 = Polynom(1.0, 3.0, 2.0) val r = Polynom(1.0, 1.0, -5.0, -3.0, 10.0, 8.0) @@ -72,7 +72,7 @@ class PolynomTest { @Test @Tag("8") - fun div() { + fun polynomDiv() { val p1 = Polynom(1.0, -2.0, -1.0, 4.0) val p2 = Polynom(1.0, 3.0, 2.0) val r = Polynom(1.0, -5.0) @@ -82,7 +82,7 @@ class PolynomTest { @Test @Tag("8") - fun rem() { + fun polynomRem() { val p1 = Polynom(1.0, -2.0, -1.0, 4.0) val p2 = Polynom(1.0, 3.0, 2.0) val r = Polynom(1.0, -5.0) @@ -93,14 +93,14 @@ class PolynomTest { @Test @Tag("4") - fun equals() { + fun polynomEquals() { assertEquals(Polynom(1.0, 2.0, 3.0), Polynom(1.0, 2.0, 3.0)) assertEquals(Polynom(0.0, 2.0, 3.0), Polynom(2.0, 3.0)) } @Test @Tag("6") - fun hashCodeTest() { + fun polynomHashCode() { assertEquals(Polynom(1.0, 2.0, 3.0).hashCode(), Polynom(1.0, 2.0, 3.0).hashCode()) } } \ No newline at end of file diff --git a/test/lesson11/task1/RationalTest.kt b/test/lesson11/task1/RationalTest.kt index d39894be..0b98f5ef 100644 --- a/test/lesson11/task1/RationalTest.kt +++ b/test/lesson11/task1/RationalTest.kt @@ -8,7 +8,7 @@ import org.junit.jupiter.api.Test class RationalTest { @Test @Tag("Example") - fun plus() { + fun rationalPlus() { assertEquals( Rational(1, 2), Rational(1, 6) + Rational(1, 3) @@ -17,7 +17,7 @@ class RationalTest { @Test @Tag("Example") - operator fun unaryMinus() { + fun rationalUnaryMinus() { assertEquals( Rational(1, 2), -Rational(3, -6) @@ -26,7 +26,7 @@ class RationalTest { @Test @Tag("Example") - fun minus() { + fun rationalMinus() { assertEquals( Rational(1, 3), Rational(1, 2) - Rational(1, 6) @@ -35,7 +35,7 @@ class RationalTest { @Test @Tag("Example") - fun times() { + fun rationalTimes() { assertEquals( Rational(3, 10), Rational(3, 4) * Rational(2, 5) @@ -44,7 +44,7 @@ class RationalTest { @Test @Tag("Example") - fun div() { + fun rationalDiv() { assertEquals( Rational(2, 5), Rational(3, 10) / Rational(3, 4) @@ -53,7 +53,7 @@ class RationalTest { @Test @Tag("Example") - fun toInt() { + fun rationalToInt() { assertEquals( 1, Rational(3, 2).toInt().toLong() @@ -62,7 +62,7 @@ class RationalTest { @Test @Tag("Example") - fun toDouble() { + fun rationalToDouble() { assertEquals( 0.5, Rational(3, 6).toDouble(), @@ -72,7 +72,7 @@ class RationalTest { @Test @Tag("Example") - fun equals() { + fun rationalEquals() { assertEquals( Rational(1, 2), Rational(2, 4) @@ -89,7 +89,7 @@ class RationalTest { @Test @Tag("Example") - fun divZero() { + fun rationalDivZero() { assertThrows(ArithmeticException::class.java) { Rational(1, 0) } @@ -106,7 +106,7 @@ class RationalTest { @Test @Tag("Example") - fun compare() { + fun rationalCompareTo() { val a = Rational(1, 2) val b = Rational(4, 7) assertTrue(a.compareTo(a) == 0) diff --git a/test/lesson11/task1/UnsignedBigIntegerTest.kt b/test/lesson11/task1/UnsignedBigIntegerTest.kt index fd3914bd..2884d4f5 100644 --- a/test/lesson11/task1/UnsignedBigIntegerTest.kt +++ b/test/lesson11/task1/UnsignedBigIntegerTest.kt @@ -10,14 +10,14 @@ internal class UnsignedBigIntegerTest { @Test @Tag("8") - fun plus() { + fun ubiPlus() { assertEquals(UnsignedBigInteger(4), UnsignedBigInteger(2) + UnsignedBigInteger(2)) assertEquals(UnsignedBigInteger("9087654330"), UnsignedBigInteger("9087654329") + UnsignedBigInteger(1)) } @Test @Tag("8") - fun minus() { + fun ubiMinus() { assertEquals(UnsignedBigInteger(2), UnsignedBigInteger(4) - UnsignedBigInteger(2)) assertEquals(UnsignedBigInteger("9087654329"), UnsignedBigInteger("9087654330") - UnsignedBigInteger(1)) assertThrows(ArithmeticException::class.java) { @@ -27,7 +27,7 @@ internal class UnsignedBigIntegerTest { @Test @Tag("12") - fun times() { + fun ubiTimes() { assertEquals( UnsignedBigInteger("18446744073709551616"), UnsignedBigInteger("4294967296‬") * UnsignedBigInteger("4294967296‬") @@ -36,7 +36,7 @@ internal class UnsignedBigIntegerTest { @Test @Tag("16") - fun div() { + fun ubiDiv() { assertEquals( UnsignedBigInteger("4294967296‬"), UnsignedBigInteger("18446744073709551616") / UnsignedBigInteger("4294967296‬") @@ -45,7 +45,7 @@ internal class UnsignedBigIntegerTest { @Test @Tag("16") - fun rem() { + fun ubiRem() { assertEquals(UnsignedBigInteger(5), UnsignedBigInteger(19) % UnsignedBigInteger(7)) assertEquals( UnsignedBigInteger(0), @@ -55,20 +55,20 @@ internal class UnsignedBigIntegerTest { @Test @Tag("8") - fun equals() { + fun ubiEquals() { assertEquals(UnsignedBigInteger(123456789), UnsignedBigInteger("123456789")) } @Test @Tag("8") - fun compareTo() { + fun ubiCompareTo() { assertTrue(UnsignedBigInteger(123456789) < UnsignedBigInteger("9876543210")) assertTrue(UnsignedBigInteger("9876543210") > UnsignedBigInteger(123456789)) } @Test @Tag("8") - fun toInt() { + fun ubiToInt() { assertEquals(123456789, UnsignedBigInteger("123456789").toInt()) } } \ No newline at end of file diff --git a/test/lesson12/task1/OpenHashSetTest.kt b/test/lesson12/task1/OpenHashSetTest.kt index 73468881..c8991823 100644 --- a/test/lesson12/task1/OpenHashSetTest.kt +++ b/test/lesson12/task1/OpenHashSetTest.kt @@ -9,7 +9,7 @@ class OpenHashSetTest { @Test @Tag("6") - fun size() { + fun ohsSize() { val set = OpenHashSet(32) assertEquals(32, set.capacity) assertEquals(0, set.size) @@ -22,7 +22,7 @@ class OpenHashSetTest { @Test @Tag("4") - fun isEmpty() { + fun ohsIsEmpty() { val set = OpenHashSet(16) assertTrue(set.isEmpty()) set.add(0) @@ -31,7 +31,7 @@ class OpenHashSetTest { @Test @Tag("10") - fun add() { + fun ohsAdd() { val set = OpenHashSet(4) assertTrue(set.add("alpha")) assertTrue(set.add("beta")) @@ -46,7 +46,7 @@ class OpenHashSetTest { @Test @Tag("10") - fun contains() { + fun ohsContains() { val set = OpenHashSet(8) set.add(1) set.add(3) @@ -57,7 +57,7 @@ class OpenHashSetTest { @Test @Tag("8") - fun testEquals() { + fun ohsEquals() { val set1 = OpenHashSet(8) set1.add(1) set1.add(3) @@ -73,7 +73,7 @@ class OpenHashSetTest { @Test @Tag("6") - fun testHashCode() { + fun ohsHashCode() { val set1 = OpenHashSet(8) set1.add(1) set1.add(3) diff --git a/test/lesson12/task1/PhoneBookTest.kt b/test/lesson12/task1/PhoneBookTest.kt index 1068f71f..888a0b6e 100644 --- a/test/lesson12/task1/PhoneBookTest.kt +++ b/test/lesson12/task1/PhoneBookTest.kt @@ -80,7 +80,7 @@ internal class PhoneBookTest { @Test @Tag("6") - fun testEquals() { + fun pbEquals() { val book = PhoneBook() assertTrue(book.addHuman("Иванов Петр")) assertTrue(book.addHuman("Васильев Дмитрий")) @@ -98,7 +98,7 @@ internal class PhoneBookTest { @Test @Tag("6") - fun testHashCode() { + fun pbHashCode() { val book = PhoneBook() assertTrue(book.addHuman("Иванов Петр")) assertTrue(book.addHuman("Васильев Дмитрий")) diff --git a/test/lesson12/task1/SinglyLinkedListTest.kt b/test/lesson12/task1/SinglyLinkedListTest.kt index 75bb0f90..b37ae3b0 100644 --- a/test/lesson12/task1/SinglyLinkedListTest.kt +++ b/test/lesson12/task1/SinglyLinkedListTest.kt @@ -8,7 +8,7 @@ class SinglyLinkedListTest { @Test @Tag("Example") - fun add() { + fun sllAdd() { val list = SinglyLinkedList() list.add(0) assertSame(1, list.size) @@ -16,7 +16,7 @@ class SinglyLinkedListTest { @Test @Tag("Example") - fun removeFirst() { + fun sllRemoveFirst() { val list = SinglyLinkedList() list.add(0) assertTrue(list.removeFirst()) @@ -26,7 +26,7 @@ class SinglyLinkedListTest { @Test @Tag("Example") - fun removeLast() { + fun sllRemoveLast() { val list = SinglyLinkedList() list.add(4) list.add(3) @@ -47,7 +47,7 @@ class SinglyLinkedListTest { @Test @Tag("Example") - fun remove() { + fun sllRemove() { val list = SinglyLinkedList() for (i in 0..19) { list.add(i) @@ -72,7 +72,7 @@ class SinglyLinkedListTest { @Test @Tag("Example") - fun size() { + fun sllSize() { val list = SinglyLinkedList() list.add(5) list.add(7) @@ -84,7 +84,7 @@ class SinglyLinkedListTest { @Test @Tag("Example") - fun isEmpty() { + fun sllIsEmpty() { val list = SinglyLinkedList() assertTrue(list.isEmpty()) list.add(42) @@ -93,7 +93,7 @@ class SinglyLinkedListTest { @Test @Tag("Example") - fun equals() { + fun sllEquals() { val first = SinglyLinkedList() val second = SinglyLinkedList() assertTrue(first == second) @@ -109,7 +109,7 @@ class SinglyLinkedListTest { @Test @Tag("Example") - fun hashCodeTest() { + fun sllHashCode() { val first = SinglyLinkedList() val second = SinglyLinkedList() assertTrue(first.hashCode() == second.hashCode()) diff --git a/test/lesson12/task1/TableFunctionTest.kt b/test/lesson12/task1/TableFunctionTest.kt index e59055aa..5aefd06c 100644 --- a/test/lesson12/task1/TableFunctionTest.kt +++ b/test/lesson12/task1/TableFunctionTest.kt @@ -9,7 +9,7 @@ internal class TableFunctionTest { @Test @Tag("6") - fun add() { + fun tfAdd() { val function = TableFunction() function.add(1.0, 2.0) function.add(3.0, 4.0) @@ -20,7 +20,7 @@ internal class TableFunctionTest { @Test @Tag("6") - fun remove() { + fun tfRemove() { val function = TableFunction() function.add(1.0, 2.0) function.add(3.0, 4.0) @@ -52,7 +52,7 @@ internal class TableFunctionTest { @Test @Tag("10") - fun getValue() { + fun tfGetValue() { val function = TableFunction() try { function.getValue(0.0) @@ -71,7 +71,7 @@ internal class TableFunctionTest { @Test @Tag("6") - fun equals() { + fun tfEquals() { val f1 = TableFunction() f1.add(1.0, 2.0) f1.add(3.0, 4.0) diff --git a/test/lesson12/task1/TrainTimeTableTest.kt b/test/lesson12/task1/TrainTimeTableTest.kt index 21bc0360..f25ef01e 100644 --- a/test/lesson12/task1/TrainTimeTableTest.kt +++ b/test/lesson12/task1/TrainTimeTableTest.kt @@ -87,7 +87,7 @@ class TrainTimeTableTest { @Test @Tag("8") - fun testEquals() { + fun tttEquals() { val ttt1 = TrainTimeTable("СПб") assertTrue(ttt1.addTrain("N1", Time(6, 35), Stop("Пушкин", Time(7, 4)))) assertTrue(ttt1.addTrain("N2", Time(6, 18), Stop("Пушкин", Time(6, 45))))