Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix expecty macro #307

Merged
merged 3 commits into from
Sep 19, 2024
Merged

Fix expecty macro #307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b7a5e2
fixing expecty macros
pawelsadlo Sep 13, 2024
2691894
adding quick expecty integration tests
pawelsadlo Sep 13, 2024
ee5e159
removing expecty dependency from native,
pawelsadlo Sep 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adding quick expecty integration tests
  • Loading branch information
@pawelsadlo
pawelsadlo committed Sep 13, 2024
commit 2691894e92508a229d540c90025e273fb9d694d3
3 changes: 2 additions & 1 deletion build.sc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ object Deps {
val geny = ivy"com.lihaoyi::geny::1.1.1"
val sourcecode = ivy"com.lihaoyi::sourcecode::0.4.2"
val utest = ivy"com.lihaoyi::utest::0.8.4"
val expecty = ivy"com.eed3si9n.expecty::expecty:0.16.0"
def scalaReflect(scalaVersion: String) = ivy"org.scala-lang:scala-reflect:$scalaVersion"
def scalaLibrary(version: String) = ivy"org.scala-lang:scala-library:${version}"
}
Expand Down Expand Up @@ -96,7 +97,7 @@ trait OsLibModule
)

trait OsLibTestModule extends ScalaModule with TestModule.Utest with SafeDeps {
def ivyDeps = Agg(Deps.utest, Deps.sourcecode)
def ivyDeps = Agg(Deps.utest, Deps.sourcecode,Deps.expecty)
// we check the textual output of system commands and expect it in english
def forkEnv = super.forkEnv() ++ Map(
"LC_ALL" -> "C",
Expand Down
12 changes: 12 additions & 0 deletions os/test/src/PathTests.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import java.io.File
import os._
import os.Path.driveRoot
import utest.{assert => _, _}
import com.eed3si9n.expecty.Expecty.expect

import java.net.URI
object PathTests extends TestSuite {
Expand All @@ -16,11 +17,22 @@ object PathTests extends TestSuite {
val tests = Tests {
test("Literals") {
test("Basic") {
expect(rel / "src" / "Main/.scala" == rel / "src" / "Main" / ".scala")
expect(root / "core/src/test" == root / "core" / "src" / "test")
expect(root / "core/src/test" == root / "core" / "src/test")

assert(rel / "src" / "Main/.scala" == rel / "src" / "Main" / ".scala")
assert(root / "core/src/test" == root / "core" / "src" / "test")
assert(root / "core/src/test" == root / "core" / "src/test")
}
test("literals with [..]") {
expect(rel / "src" / ".." == rel / "src" / os.up)
expect(root / "src/.." == root / "src" / os.up)
expect(root / "src" / ".." == root / "src" / os.up)
expect(root / "hello" / ".." / "world" == root / "hello" / os.up / "world")
expect(root / "hello" / "../world" == root / "hello" / os.up / "world")
expect(root / "hello/../world" == root / "hello" / os.up / "world")

assert(rel / "src" / ".." == rel / "src" / os.up)
assert(root / "src/.." == root / "src" / os.up)
assert(root / "src" / ".." == root / "src" / os.up)
Expand Down
Loading