Fix nullpointer in docs test setup (#90660) (#90711)

breskeby · web-flow · commit 7fb3390dfcd7 · 2022-10-06T15:03:51.000+02:00
diff --git a/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy b/build-tools-internal/src/main/groovy/org/elasticsearch/gradle/internal/doc/RestTestsFromSnippetsTask.groovy
@@ -384,7 +384,7 @@ class RestTestsFromSnippetsTask extends SnippetsTask {
         }
 
         private void testTearDown(Snippet snippet) {
-            if (previousTest.testSetup == false && lastDocsPath == snippet.path) {
+            if (previousTest != null && previousTest.testSetup == false && lastDocsPath == snippet.path) {
                 throw new InvalidUserDataException("$snippet must follow test setup or be first")
             }
             setupCurrent(snippet)

Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ class RestTestsFromSnippetsTask extends SnippetsTask {`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`private void testTearDown(Snippet snippet) {`
`387`		`- if (previousTest.testSetup == false && lastDocsPath == snippet.path) {`
	`387`	`+ if (previousTest != null && previousTest.testSetup == false && lastDocsPath == snippet.path) {`
`388`	`388`	`throw new InvalidUserDataException("$snippet must follow test setup or be first")`
`389`	`389`	`}`
`390`	`390`	`setupCurrent(snippet)`