Skip to content

Commit 02112cd

Browse files
andersonkmiandersonkmi
committed
scalatest updates
1 parent 11713fb commit 02112cd

31 files changed

+91
-63
lines changed

‎build.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ lazy val root = (project in file(".")).
44
settings(
55
inThisBuild(List(
66
organization := "org.codecraftlabs",
7-
scalaVersion := "2.13.1",
7+
scalaVersion := "2.13.8",
88
version := "1.0.26"
99
)),
1010
name := "leetcode-scala",

‎project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import sbt._
22

33
object Dependencies {
4-
lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.0.8"
5-
lazy val scalacticTest = "org.scalactic" %% "scalactic" % "3.0.8"
4+
lazy val scalaTest = "org.scalatest" %% "scalatest" % "3.2.12"
5+
lazy val scalacticTest = "org.scalactic" %% "scalactic" % "3.2.12"
66
}

‎project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.2
1+
sbt.version=1.6.2

‎src/test/scala/org/codecraftlabs/leetcode/AddBinarySpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

33
import org.codecraftlabs.leetcode.AddBinary.addBinary
4-
import org.scalatest.{FlatSpec, Matchers}
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class AddBinarySpec extends FlatSpec with Matchers {
7+
class AddBinarySpec extends AnyFlatSpec with Matchers {
78
"a = \"11\", b = \"1\"" should "return 100" in {
89
addBinary("11", "1") shouldEqual "100"
910
}

‎src/test/scala/org/codecraftlabs/leetcode/BeautifulDaysAtTheMoviesSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
43
import org.codecraftlabs.leetcode.BeautifulDaysAtTheMovies.beautifulDays
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class BeautifulDaysAtTheMoviesSpec extends FlatSpec with Matchers {
7+
class BeautifulDaysAtTheMoviesSpec extends AnyFlatSpec with Matchers {
78
"This" should "OK" in {
89
beautifulDays(1, 2000000, 23047885) shouldEqual 2998
910
}

‎src/test/scala/org/codecraftlabs/leetcode/ContainsDuplicateSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
43
import org.codecraftlabs.leetcode.ContainsDuplicate.containsDuplicate
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class ContainsDuplicateSpec extends FlatSpec with Matchers {
7+
class ContainsDuplicateSpec extends AnyFlatSpec with Matchers {
78
"Null array" should "return false" in {
89
containsDuplicate(null) shouldEqual false
910
}

‎src/test/scala/org/codecraftlabs/leetcode/CountAndSaySpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class CountAndSaySpec extends FlatSpec with Matchers {
6+
class CountAndSaySpec extends AnyFlatSpec with Matchers {
67
"The CountAndSay.countAndSay(1)" should "return 1" in {
78
CountAndSay.countAndSay(1) shouldEqual "1"
89
}

‎src/test/scala/org/codecraftlabs/leetcode/FlattenBinaryTreeSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class FlattenBinaryTreeSpec extends FlatSpec with Matchers {
6+
class FlattenBinaryTreeSpec extends AnyFlatSpec with Matchers {
67
"Binary tree" should "be flattened ok" in {
78
val root = new TreeNode(4)
89
val node1 = new TreeNode(3)

‎src/test/scala/org/codecraftlabs/leetcode/JewelsAndStonesSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

33
import org.codecraftlabs.leetcode.JewelsAndStones.numJewelsInStones
4-
import org.scalatest.{FlatSpec, Matchers}
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class JewelsAndStonesSpec extends FlatSpec with Matchers {
7+
class JewelsAndStonesSpec extends AnyFlatSpec with Matchers {
78
it should "return 3 with jewels = 'aA' and stones = 'aAAbbbb'" in {
89
val jewels = "aA"
910
val stones = "aAAbbbb"

‎src/test/scala/org/codecraftlabs/leetcode/LengthLastWordSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class LengthLastWordSpec extends FlatSpec with Matchers {
6+
class LengthLastWordSpec extends AnyFlatSpec with Matchers {
67
"The LengthLastWord" should "return 0" in {
78
LengthLastWord.lengthOfLastWord("") shouldEqual 0
89
}

‎src/test/scala/org/codecraftlabs/leetcode/LongestCommonPrefixSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class LongestCommonPrefixSpec extends FlatSpec with Matchers {
6+
class LongestCommonPrefixSpec extends AnyFlatSpec with Matchers {
67
"Given two strings" should "car" in {
78
val input = Array("cartoon", "carry")
89
LongestCommonPrefix.longestCommonPrefix(input) shouldEqual "car"

‎src/test/scala/org/codecraftlabs/leetcode/MaximumSubarraySpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
43
import MaximumSubarray.maxSubArray
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class MaximumSubarraySpec extends FlatSpec with Matchers {
7+
class MaximumSubarraySpec extends AnyFlatSpec with Matchers {
78
"Array(1)" should "return 1" in {
89
val numbers = Array(1)
910
maxSubArray(numbers) shouldEqual 1

‎src/test/scala/org/codecraftlabs/leetcode/MergeSortedArraySpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class MergeSortedArraySpec extends FlatSpec with Matchers {
6+
class MergeSortedArraySpec extends AnyFlatSpec with Matchers {
67
"The MergeSortedArray " should "return 1 - 2" in {
78
val nums1 = Array(1, 0)
89
MergeSortedArray.merge(nums1, 1, Array(2), 1)

‎src/test/scala/org/codecraftlabs/leetcode/MergeSortedLinkedListsSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class MergeSortedLinkedListsSpec extends FlatSpec with Matchers {
6+
class MergeSortedLinkedListsSpec extends AnyFlatSpec with Matchers {
67
"Given null lists to be merged" should "return null" in {
78
val result = MergeSortedLinkedLists.mergeTwoLists(null, null)
89
result should be (null)

‎src/test/scala/org/codecraftlabs/leetcode/MiddleLinkedListSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

33
import org.codecraftlabs.leetcode.MiddleLinkedList.middleNode
4-
import org.scalatest.{FlatSpec, Matchers}
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class MiddleLinkedListSpec extends FlatSpec with Matchers {
7+
class MiddleLinkedListSpec extends AnyFlatSpec with Matchers {
78
"Null list" should "return None" in {
89
middleNode(null) shouldBe None
910
}

‎src/test/scala/org/codecraftlabs/leetcode/MissingNumbersSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class MissingNumbersSpec extends FlatSpec with Matchers {
6+
class MissingNumbersSpec extends AnyFlatSpec with Matchers {
67
"[7, 2, 5, 3, 5, 3] and [7, 2, 5, 4, 6, 3, 5, 3]" should "be [4, 6]" in {
78
val array1 = Array(7, 2, 5, 3, 5, 3)
89
val array2 = Array(7, 2, 5, 4, 6, 3, 5, 3)

‎src/test/scala/org/codecraftlabs/leetcode/PartitionListSpec.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
4-
import PartitionList._
3+
import org.codecraftlabs.leetcode.PartitionList._
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class PartitionListSpec extends FlatSpec with Matchers {
7+
class PartitionListSpec extends AnyFlatSpec with Matchers {
78
"1->4->3->2->5->2 and x = 2" should "return 1-2-2-4-3-5" in {
89
val node1 = new ListNode(1)
910
val node2 = new ListNode(4)

‎src/test/scala/org/codecraftlabs/leetcode/PathSumIISpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class PathSumIISpec extends FlatSpec with Matchers {
6+
class PathSumIISpec extends AnyFlatSpec with Matchers {
67
"Test 001" should "be success" in {
78
val root = new TreeNode(4)
89
val node1 = new TreeNode(3)

‎src/test/scala/org/codecraftlabs/leetcode/PickingNumbersSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class PickingNumbersSpec extends FlatSpec with Matchers {
6+
class PickingNumbersSpec extends AnyFlatSpec with Matchers {
67
"[1, 1, 2, 2, 4, 4, 5, 5, 5]" should "return 5" in {
78
val numbers = Array(1, 1, 2, 2, 4, 4, 5, 5, 5)
89
PickingNumbers.pickingNumbers(numbers) shouldEqual 5

‎src/test/scala/org/codecraftlabs/leetcode/PlusOneSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class PlusOneSpec extends FlatSpec with Matchers {
6+
class PlusOneSpec extends AnyFlatSpec with Matchers {
67
//"Array [4, 3, 2, 1]" should "return [4, 3, 2, 1]"
78
}

‎src/test/scala/org/codecraftlabs/leetcode/RemoveDuplicatesSortedListIISpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class RemoveDuplicatesSortedListIISpec extends FlatSpec with Matchers {
6+
class RemoveDuplicatesSortedListIISpec extends AnyFlatSpec with Matchers {
67
"Empty list" should "return null" in {
78
RemoveDuplicatesSortedListII.deleteDuplicates(null) should be (null)
89
}

‎src/test/scala/org/codecraftlabs/leetcode/RemoveDuplicatesSortedListSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class RemoveDuplicatesSortedListSpec extends FlatSpec with Matchers {
6+
class RemoveDuplicatesSortedListSpec extends AnyFlatSpec with Matchers {
67
"The RemoveDuplicatesSortedList " should "return null" in {
78
RemoveDuplicatesSortedList.deleteDuplicates(null) shouldBe null
89
}

‎src/test/scala/org/codecraftlabs/leetcode/ReverseLinkedListSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ package org.codecraftlabs.leetcode
22

33
import org.codecraftlabs.leetcode.ListNodeUtils.mkString
44
import org.codecraftlabs.leetcode.ReverseLinkedList.reverseList
5-
import org.scalatest.{FlatSpec, Matchers}
5+
import org.scalatest.flatspec.AnyFlatSpec
6+
import org.scalatest.matchers.should.Matchers
67

7-
class ReverseLinkedListSpec extends FlatSpec with Matchers {
8+
class ReverseLinkedListSpec extends AnyFlatSpec with Matchers {
89
it should "return 3 -> 2 -> 1" in {
910
val node1 = new ListNode(1)
1011
val node2 = new ListNode(2)

‎src/test/scala/org/codecraftlabs/leetcode/RomanToIntSpec.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
4-
import RomanToInt.romanToInt
3+
import org.codecraftlabs.leetcode.RomanToInt.romanToInt
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class RomanToIntSpec extends FlatSpec with Matchers {
7+
class RomanToIntSpec extends AnyFlatSpec with Matchers {
78
"III" should "return 3" in {
89
romanToInt("III") shouldEqual 3
910
}

‎src/test/scala/org/codecraftlabs/leetcode/SingleNumberIIISpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class SingleNumberIIISpec extends FlatSpec with Matchers {
6+
class SingleNumberIIISpec extends AnyFlatSpec with Matchers {
67
"Given nums = [1, 2, 1, 3, 2, 5]" should "return [3, 5]" in {
78
val nums = Array[Int](1, 2, 1, 3, 2, 5)
89
val result = SingleNumberIII.singleNumber(nums).sorted

‎src/test/scala/org/codecraftlabs/leetcode/SingleNumberIISpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class SingleNumberIISpec extends FlatSpec with Matchers {
6+
class SingleNumberIISpec extends AnyFlatSpec with Matchers {
67
"Given nums = [1, 1, 1, 3]" should "return 3" in {
78
val nums = Array[Int](1, 1, 1, 3)
89
SingleNumberII.singleNumber(nums) shouldEqual 3

‎src/test/scala/org/codecraftlabs/leetcode/SubDomainVisitCountSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class SubDomainVisitCountSpec extends FlatSpec with Matchers {
6+
class SubDomainVisitCountSpec extends AnyFlatSpec with Matchers {
67
"Test case 001" should "return true" in {
78
val items = Array("500 test.com")
89
val result = SubDomainVisitCount.subDomainVisits(items)

‎src/test/scala/org/codecraftlabs/leetcode/TwoCharactersSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class TwoCharactersSpec extends FlatSpec with Matchers {
6+
class TwoCharactersSpec extends AnyFlatSpec with Matchers {
67

78
"beabeefeab" should "return 5" in {
89
TwoCharacters.alternate("beabeefeab") shouldEqual 5

‎src/test/scala/org/codecraftlabs/leetcode/ValidPalindromeSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
3+
import org.scalatest.flatspec.AnyFlatSpec
4+
import org.scalatest.matchers.should.Matchers
45

5-
class ValidPalindromeSpec extends FlatSpec with Matchers {
6+
class ValidPalindromeSpec extends AnyFlatSpec with Matchers {
67
"Empty string" should "return true" in {
78
ValidPalindrome.isPalindrome("") shouldEqual true
89
}

‎src/test/scala/org/codecraftlabs/leetcode/WordBreakSpec.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.leetcode
22

3-
import org.scalatest.{FlatSpec, Matchers}
4-
import WordBreak.wordBreak
3+
import org.codecraftlabs.leetcode.WordBreak.wordBreak
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class WordBreakSpec extends FlatSpec with Matchers {
7+
class WordBreakSpec extends AnyFlatSpec with Matchers {
78
"Test case 001" should "return true" in {
89
val wordDict = List("apple", "pen")
910
val word = "apple"

‎src/test/scala/org/codecraftlabs/utils/NumberConverterSpec.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package org.codecraftlabs.utils
22

33
import org.codecraftlabs.utils.NumberConverter.{binary2Decimal, decimal2Binary}
4-
import org.scalatest.{FlatSpec, Matchers}
4+
import org.scalatest.flatspec.AnyFlatSpec
5+
import org.scalatest.matchers.should.Matchers
56

6-
class NumberConverterSpec extends FlatSpec with Matchers {
7+
class NumberConverterSpec extends AnyFlatSpec with Matchers {
78
"0" should "return 0" in {
89
decimal2Binary(0) shouldEqual "0"
910
}

0 commit comments

Comments
 (0)