|
@@ -114,23 +114,38 @@ public class SnippetsTask extends DefaultTask {
|
|
|
return
|
|
|
}
|
|
|
if (line ==~ /\/\/\s*AUTOSENSE\s*/) {
|
|
|
- throw new InvalidUserDataException("AUTOSENSE has been " +
|
|
|
- "replaced by CONSOLE. Use that instead at " +
|
|
|
- "$file:$lineNumber")
|
|
|
+ throw new InvalidUserDataException("$file:$lineNumber: "
|
|
|
+ + "AUTOSENSE has been replaced by CONSOLE.")
|
|
|
}
|
|
|
if (line ==~ /\/\/\s*CONSOLE\s*/) {
|
|
|
if (snippet == null) {
|
|
|
- throw new InvalidUserDataException("CONSOLE not " +
|
|
|
- "paired with a snippet at $file:$lineNumber")
|
|
|
+ throw new InvalidUserDataException("$file:$lineNumber: "
|
|
|
+ + "CONSOLE not paired with a snippet")
|
|
|
+ }
|
|
|
+ if (snippet.console != null) {
|
|
|
+ throw new InvalidUserDataException("$file:$lineNumber: "
|
|
|
+ + "Can't be both CONSOLE and NOTCONSOLE")
|
|
|
}
|
|
|
snippet.console = true
|
|
|
return
|
|
|
}
|
|
|
+ if (line ==~ /\/\/\s*NOTCONSOLE\s*/) {
|
|
|
+ if (snippet == null) {
|
|
|
+ throw new InvalidUserDataException("$file:$lineNumber: "
|
|
|
+ + "NOTCONSOLE not paired with a snippet")
|
|
|
+ }
|
|
|
+ if (snippet.console != null) {
|
|
|
+ throw new InvalidUserDataException("$file:$lineNumber: "
|
|
|
+ + "Can't be both CONSOLE and NOTCONSOLE")
|
|
|
+ }
|
|
|
+ snippet.console = false
|
|
|
+ return
|
|
|
+ }
|
|
|
matcher = line =~ /\/\/\s*TEST(\[(.+)\])?\s*/
|
|
|
if (matcher.matches()) {
|
|
|
if (snippet == null) {
|
|
|
- throw new InvalidUserDataException("TEST not " +
|
|
|
- "paired with a snippet at $file:$lineNumber")
|
|
|
+ throw new InvalidUserDataException("$file:$lineNumber: "
|
|
|
+ + "TEST not paired with a snippet at ")
|
|
|
}
|
|
|
snippet.test = true
|
|
|
if (matcher.group(2) != null) {
|
|
@@ -172,8 +187,8 @@ public class SnippetsTask extends DefaultTask {
|
|
|
matcher = line =~ /\/\/\s*TESTRESPONSE(\[(.+)\])?\s*/
|
|
|
if (matcher.matches()) {
|
|
|
if (snippet == null) {
|
|
|
- throw new InvalidUserDataException("TESTRESPONSE not " +
|
|
|
- "paired with a snippet at $file:$lineNumber")
|
|
|
+ throw new InvalidUserDataException("$file:$lineNumber: "
|
|
|
+ + "TESTRESPONSE not paired with a snippet")
|
|
|
}
|
|
|
snippet.testResponse = true
|
|
|
if (matcher.group(2) != null) {
|
|
@@ -226,7 +241,7 @@ public class SnippetsTask extends DefaultTask {
|
|
|
int end = NOT_FINISHED
|
|
|
String contents
|
|
|
|
|
|
- boolean console = false
|
|
|
+ Boolean console = null
|
|
|
boolean test = false
|
|
|
boolean testResponse = false
|
|
|
boolean testSetup = false
|
|
@@ -243,8 +258,8 @@ public class SnippetsTask extends DefaultTask {
|
|
|
if (language != null) {
|
|
|
result += "($language)"
|
|
|
}
|
|
|
- if (console) {
|
|
|
- result += '// CONSOLE'
|
|
|
+ if (console != null) {
|
|
|
+ result += console ? '// CONSOLE' : '// NOTCONSOLE'
|
|
|
}
|
|
|
if (test) {
|
|
|
result += '// TEST'
|