Skip to content
This repository has been archived by the owner on Feb 8, 2019. It is now read-only.
/ dirsuite Public archive

Commit

Permalink
Merge pull request #10 from jaa127/master
Browse files Browse the repository at this point in the history 
testing: better API-doc and rename test functions
  • Loading branch information
@jaa127
jaa127 committed Jan 19, 2017
2 parents 61eaf97 + 36fd9a0 commit e12818b
Show file tree
Hide file tree
Showing 7 changed files with 395 additions and 128 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
[![Build Status](https://travis-ci.org/sn127/utils.svg?branch=master)](https://travis-ci.org/sn127/utils)
[![Coverage Status](https://coveralls.io/repos/github/sn127/utils/badge.svg?branch=master)](https://coveralls.io/github/sn127/utils?branch=master)

* utils-fs: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/fi.sn127/utils-fs_2.12/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/fi.sn127/utils-fs_2.12)
* utils-testing: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/fi.sn127/utils-testing_2.12/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/fi.sn127/utils-testing_2.12)
* utils-fs: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/fi.sn127/utils-fs_2.12/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/fi.sn127/utils-fs_2.12)[![Javadocs](http://javadoc.io/badge/fi.sn127/utils-fs_2.12.svg?color=blue)](http://javadoc.io/doc/fi.sn127/utils-fs_2.12)
* utils-testing: [![Maven Central](https://maven-badges.herokuapp.com/maven-central/fi.sn127/utils-testing_2.12/badge.svg?style=plastic)](https://maven-badges.herokuapp.com/maven-central/fi.sn127/utils-testing_2.12)[![Javadocs](http://javadoc.io/badge/fi.sn127/utils-testing_2.12.svg?color=blue)](http://javadoc.io/doc/fi.sn127/utils-testing_2.12)

# Utils (DirSuite add-on to ScalaTest)

Expand Down
67 changes: 27 additions & 40 deletions examples/src/test/scala/DirSuiteDemo.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class DirSuiteDemo extends DirSuite {
* Search method: Glob
* https://docs.oracle.com/javase/tutorial/essential/io/fileOps.html#glob
*/
runDirSuite(testdir, Glob("success/noargs[0-9]*.exec")) { args: Array[String] =>
runDirSuiteTestCases(testdir, Glob("success/noargs[0-9]*.exec")) { args: Array[String] =>
assertResult(0) {
app.doArgsCount(args)
}
Expand All @@ -31,7 +31,7 @@ class DirSuiteDemo extends DirSuite {
* Search method: Glob
* https://docs.oracle.com/javase/tutorial/essential/io/fileOps.html#glob
*/
runDirSuite(testdir, Glob("success/args3-[0-9]*.exec")) { args: Array[String] =>
runDirSuiteTestCases(testdir, Glob("success/args3-[0-9]*.exec")) { args: Array[String] =>
assertResult(3) {
app.doArgsCount(args)
}
Expand All @@ -46,7 +46,7 @@ class DirSuiteDemo extends DirSuite {
* Search method: Regex
* https://docs.oracle.com/javase/tutorial/essential/regex/index.html
*/
runDirSuite(testdir, Regex("success/txt[0-9]+\\.exec")) { args: Array[String] =>
runDirSuiteTestCases(testdir, Regex("success/txt[0-9]+\\.exec")) { args: Array[String] =>
assertResult(DemoApp.SUCCESS) {
app.doTxt(args)
}
Expand All @@ -61,7 +61,7 @@ class DirSuiteDemo extends DirSuite {
* Search method: Regex
* https://docs.oracle.com/javase/tutorial/essential/regex/index.html
*/
runDirSuite(testdir, Regex("success/xml[0-9]+\\.exec")) { args: Array[String] =>
runDirSuiteTestCases(testdir, Regex("success/xml[0-9]+\\.exec")) { args: Array[String] =>
assertResult(DemoApp.SUCCESS) {
app.doXml(args)
}
Expand All @@ -80,7 +80,7 @@ class DirSuiteDemo extends DirSuite {
* Search method: Glob
* https://docs.oracle.com/javase/tutorial/essential/io/fileOps.html#glob
*/
runDirSuite(testdir, Glob("success/mixed[0-9]*.exec")) { args: Array[String] =>
runDirSuiteTestCases(testdir, Glob("success/mixed[0-9]*.exec")) { args: Array[String] =>
assertResult(DemoApp.SUCCESS) {
app.doTxtXml(args)
}
Expand All @@ -92,7 +92,7 @@ class DirSuiteDemo extends DirSuite {
* This is internal assertThrows/intercept, so every execution step
* must throw an exception if multiple steps are run.
*/
runDirSuite(testdir, Glob("success/singleStepEx[0-9]*.exec")) { args: Array[String] =>
runDirSuiteTestCases(testdir, Glob("success/singleStepEx[0-9]*.exec")) { args: Array[String] =>
assertThrows[RuntimeException]{
app.doFlaky(args)
}
Expand All @@ -108,24 +108,18 @@ class DirSuiteDemo extends DirSuite {
* exec 1 => assertResult(SUCCESS)
* exec 2 => assertThrows[RuntimeException]
*/
runMultiTestDirSuite(testdir, Glob("success/multiStepEx[0-9]*.exec"))(
{ args: Array[String] =>
/*
* All steps at the begin must succeed
*/
assertResult(DemoApp.SUCCESS) {
app.doFlaky(args)
}
},
{ args: Array[String] =>
/*
* Last step must fail with exception
*/
assertThrows[RuntimeException] {
app.doFlaky(args)
}
runDualAssertionDirSuiteTestCases(testdir, Glob("success/multiStepEx[0-9]*.exec")) { args: Array[String] =>
// All steps at the begin must succeed
assertResult(DemoApp.SUCCESS) {
app.doFlaky(args)
}
} { args: Array[String] =>
// Last step must fail with exception
assertThrows[RuntimeException] {
app.doFlaky(args)
}
)
}

/**
* First execution steps must succeed, and then
* Last execution step must fail
Expand All @@ -135,22 +129,15 @@ class DirSuiteDemo extends DirSuite {
* exec 1 => assertResult(SUCCESS)
* exec 2 => assertResult(FAILURE)
*/
runMultiTestDirSuite(testdir, Glob("success/multiStepFail[0-9]*.exec"))(
{ args: Array[String] =>
/*
* All steps at the begin must succeed
*/
assertResult(DemoApp.SUCCESS) {
app.doFlaky(args)
}
},
{ args: Array[String] =>
/*
* Last step must fail
*/
assertResult(DemoApp.FAILURE) {
app.doFlaky(args)
}
runDualAssertionDirSuiteTestCases(testdir, Glob("success/multiStepFail[0-9]*.exec")) { args: Array[String] =>
// Fist steps must succeed
assertResult(DemoApp.SUCCESS) {
app.doFlaky(args)
}
)
} { args: Array[String] =>
// last step must fail
assertResult(DemoApp.FAILURE) {
app.doFlaky(args)
}
}
}
10 changes: 5 additions & 5 deletions examples/src/test/scala/FailureDemo.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class FailureDemo extends DirSuite {
/**
* Exec failure: Normal assertion error
*/
ignoreDirSuite(testdir, Glob("success/args3-[0-9]*.exec")) { args: Array[String] =>
ignoreDirSuiteTestCases(testdir, Glob("success/args3-[0-9]*.exec")) { args: Array[String] =>
assertResult(2) {
app.doArgsCount(args)
}
Expand All @@ -29,7 +29,7 @@ class FailureDemo extends DirSuite {
* Exec failure: Exception
* TODO: testing, this needs better error message
*/
ignoreDirSuite(testdir, Glob("success/singleStepEx[0-9]*.exec")) { args: Array[String] =>
ignoreDirSuiteTestCases(testdir, Glob("success/singleStepEx[0-9]*.exec")) { args: Array[String] =>
assertResult(DemoApp.SUCCESS) {
app.doFlaky(args)
}
Expand All @@ -38,7 +38,7 @@ class FailureDemo extends DirSuite {
/**
* Test Vector failure: missing output
*/
ignoreDirSuite(testdir, Glob("failure/fileNotFound[0-9]*.exec")) { args: Array[String] =>
ignoreDirSuiteTestCases(testdir, Glob("failure/fileNotFound[0-9]*.exec")) { args: Array[String] =>
assertResult(DemoApp.SUCCESS) {
app.doTxt(args)
}
Expand All @@ -47,7 +47,7 @@ class FailureDemo extends DirSuite {
/**
* Test Vector failure: Data differs (reference != output)
*/
ignoreDirSuite(testdir, Glob("failure/content[0-9]*.exec")) { args: Array[String] =>
ignoreDirSuiteTestCases(testdir, Glob("failure/content[0-9]*.exec")) { args: Array[String] =>
assertResult(DemoApp.SUCCESS) {
app.doTxt(args)
}
Expand All @@ -56,7 +56,7 @@ class FailureDemo extends DirSuite {
/**
* Test Vector failure: Exception while validating vector
*/
ignoreDirSuite(testdir, Glob("failure/xmlEx[0-9]*.exec")) { args: Array[String] =>
ignoreDirSuiteTestCases(testdir, Glob("failure/xmlEx[0-9]*.exec")) { args: Array[String] =>
assertResult(DemoApp.SUCCESS) {
app.doTxt(args)
}
Expand Down
2 changes: 1 addition & 1 deletion examples/src/test/scala/MapArgsDemo.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class MapArgsDemo extends DirSuite {
/**
* Run all tests with our own version of args
*/
runDirSuite(testdir, Glob("args/txt[0-9]*.exec")) { args: Array[String] =>
runDirSuiteTestCases(testdir, Glob("args/txt[0-9]*.exec")) { args: Array[String] =>
assertResult(DemoApp.SUCCESS) {
app.doTxt(args)
}
Expand Down

0 comments on commit e12818b

Please sign in to comment.