Merge pull request #152 from AJHealey/master

Update Scala versions
This commit is contained in:
Emily Bache 2020-04-06 21:00:21 +02:00 committed by GitHub
commit 29be55f986
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions

View File

@ -2,6 +2,7 @@ name := "GildedRose"
version := "1.0" version := "1.0"
scalaVersion := "2.12.1" scalaVersion := "2.13.1"
libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" resolvers += DefaultMavenRepository
libraryDependencies += "org.scalatest" %% "scalatest" % "3.1.1" % "test"

View File

@ -1 +1 @@
sbt.version=1.1.6 sbt.version=1.3.9

View File

@ -1,12 +1,13 @@
package com.gildedrose package com.gildedrose
import org.scalatest._ import org.scalatest.flatspec.AnyFlatSpec
import org.scalatest.matchers.should.Matchers
class GildedRoseTest extends FlatSpec with Matchers { class GildedRoseTest extends AnyFlatSpec with Matchers {
it should "foo" in { it should "foo" in {
var items = Array[Item](new Item("foo", 0, 0)) val items = Array[Item](new Item("foo", 0, 0))
val app = new GildedRose(items) val app = new GildedRose(items)
app.updateQuality() app.updateQuality()
(app.items(0).name) should equal ("fixme") app.items(0).name should equal ("fixme")
} }
} }

View File

@ -2,7 +2,7 @@ package com.gildedrose
object TexttestFixture { object TexttestFixture {
def main(args: Array[String]): Unit = { def main(args: Array[String]): Unit = {
var items = Array[Item]( val items = Array[Item](
new Item("+5 Dexterity Vest", 10, 20), new Item("+5 Dexterity Vest", 10, 20),
new Item("Aged Brie", 2, 0), new Item("Aged Brie", 2, 0),
new Item("Elixir of the Mongoose", 5, 7), new Item("Elixir of the Mongoose", 5, 7),