From a508f53f9da33e080204180f1e7faaca7e3a7072 Mon Sep 17 00:00:00 2001
From: Sergey Rostov <Sergey.Rostov@jetbrains.com>
Date: Wed, 21 Nov 2018 11:16:38 +0300
Subject: [PATCH] JPS, tests, minor: reformat test data for
 cacheVersionChanged/withError

---
 .../cacheVersionChanged/withError/_dependencies.txt       | 8 ++++++++
 .../incremental/cacheVersionChanged/withError/_steps.txt  | 2 ++
 .../incremental/cacheVersionChanged/withError/build.log   | 4 ++--
 .../withError/data-container-version-build.log            | 4 ++--
 .../cacheVersionChanged/withError/dependencies.txt        | 5 -----
 5 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 jps-plugin/testData/incremental/cacheVersionChanged/withError/_dependencies.txt
 create mode 100644 jps-plugin/testData/incremental/cacheVersionChanged/withError/_steps.txt
 delete mode 100644 jps-plugin/testData/incremental/cacheVersionChanged/withError/dependencies.txt

diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/_dependencies.txt b/jps-plugin/testData/incremental/cacheVersionChanged/withError/_dependencies.txt
new file mode 100644
index 00000000000..bfbf2fe4550
--- /dev/null
+++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/_dependencies.txt
@@ -0,0 +1,8 @@
+module1
+module2
+module3
+module4
+module5
+
+module2 -> module1
+module3 -> module2
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/_steps.txt b/jps-plugin/testData/incremental/cacheVersionChanged/withError/_steps.txt
new file mode 100644
index 00000000000..fa06290ed38
--- /dev/null
+++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/_steps.txt
@@ -0,0 +1,2 @@
+add file with compilation error to module1
+fix compilation error in module1
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log b/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
index be801fbab11..6f77fe1beaa 100644
--- a/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
+++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/build.log
@@ -1,4 +1,4 @@
-================ Step #1 =================
+================ Step #1 add file with compilation error to module1 =================
 
 Building module5
 Exit code: NOTHING_DONE
@@ -36,7 +36,7 @@ Exit code: ABORT
 COMPILATION FAILED
 Name expected
 
-================ Step #2 =================
+================ Step #2 fix compilation error in module1 =================
 
 Building module5
 Exit code: NOTHING_DONE
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log b/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
index c862f83b5cd..e9b1283b9d6 100644
--- a/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
+++ b/jps-plugin/testData/incremental/cacheVersionChanged/withError/data-container-version-build.log
@@ -1,4 +1,4 @@
-================ Step #1 =================
+================ Step #1 add file with compilation error to module1 =================
 
 Lookups cache are INVALID: actual=(777, [jvm]) -> expected=(3011001, [jvm])
 Marked as dirty by Kotlin:
@@ -36,7 +36,7 @@ Exit code: ABORT
 COMPILATION FAILED
 Name expected
 
-================ Step #2 =================
+================ Step #2 fix compilation error in module1 =================
 
 Building module5
 Exit code: NOTHING_DONE
diff --git a/jps-plugin/testData/incremental/cacheVersionChanged/withError/dependencies.txt b/jps-plugin/testData/incremental/cacheVersionChanged/withError/dependencies.txt
deleted file mode 100644
index b7b899af80f..00000000000
--- a/jps-plugin/testData/incremental/cacheVersionChanged/withError/dependencies.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-module1->
-module2->module1
-module3->module2
-module4->
-module5->
\ No newline at end of file