From 598bce548a3420f88ab89e1dc6bc4b2ca24a808c Mon Sep 17 00:00:00 2001
From: Teryk Bellahsene <teryk.bellahsene@sonarsource.com>
Date: Thu, 9 Apr 2015 11:55:55 +0200
Subject: Move tests persistence from batch to compute - SONAR-6255

- define index and check the 3 use cases
- define batch report format
- create file_sources.test_data
---
 .../file_sources_missing_src_hash.xml              | 15 +++++++-------
 .../batch/index/SourcePersisterTest/shared.xml     | 13 ++++++------
 .../testPersistDontTouchUnchanged-result.xml       |  9 ++++----
 .../testPersistEmptyFile-result.xml                | 24 ++++++++++++----------
 4 files changed, 33 insertions(+), 28 deletions(-)

(limited to 'sonar-batch')

diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/file_sources_missing_src_hash.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/file_sources_missing_src_hash.xml
index 2fc32f5845b..bcc10abe0b5 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/file_sources_missing_src_hash.xml
+++ b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/file_sources_missing_src_hash.xml
@@ -1,9 +1,10 @@
 <dataset>
-  <file_sources id="101" project_uuid="projectUuid" file_uuid="uuidsame" 
-      binary_data="[null]"
-      line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555" 
-      data_hash="0263047cd758c68c27683625f072f010" 
-      src_hash="[null]"
-      created_at="1412952242000" updated_at="1412952242000" />
-      
+  <file_sources id="101" project_uuid="projectUuid" file_uuid="uuidsame"
+                binary_data="[null]"
+                test_data="[null]"
+                line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
+                data_hash="0263047cd758c68c27683625f072f010"
+                src_hash="[null]"
+                created_at="1412952242000" updated_at="1412952242000"/>
+
 </dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/shared.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/shared.xml
index 14fded38340..bd23aa0d917 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/shared.xml
+++ b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/shared.xml
@@ -1,9 +1,10 @@
 <dataset>
   <file_sources id="1" project_uuid="PROJECT_UUID" file_uuid="FILE_UUID"
-      binary_data="[null]"
-      line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555" 
-      data_hash="0263047cd758c68c27683625f072f010" 
-      src_hash="123456"
-      created_at="1412952242000" updated_at="1412952242000" />
-      
+                binary_data="[null]"
+                test_data="[null]"
+                line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
+                data_hash="0263047cd758c68c27683625f072f010"
+                src_hash="123456"
+                created_at="1412952242000" updated_at="1412952242000"/>
+
 </dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistDontTouchUnchanged-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistDontTouchUnchanged-result.xml
index 0942d062ede..39774b75559 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistDontTouchUnchanged-result.xml
+++ b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistDontTouchUnchanged-result.xml
@@ -2,9 +2,10 @@
 
   <file_sources id="101" project_uuid="projectUuid" file_uuid="uuidsame"
                 binary_data="[null]"
-      line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555" 
-      data_hash="0263047cd758c68c27683625f072f010" 
-      src_hash="123456"
-      created_at="1412952242000" updated_at="1412952242000" />
+                test_data="[null]"
+                line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
+                data_hash="0263047cd758c68c27683625f072f010"
+                src_hash="123456"
+                created_at="1412952242000" updated_at="1412952242000"/>
 
 </dataset>
diff --git a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistEmptyFile-result.xml b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistEmptyFile-result.xml
index 0bdadc4bacc..430a70baac3 100644
--- a/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistEmptyFile-result.xml
+++ b/sonar-batch/src/test/resources/org/sonar/batch/index/SourcePersisterTest/testPersistEmptyFile-result.xml
@@ -1,15 +1,17 @@
 <dataset>
-    <file_sources id="101" project_uuid="projectUuid" file_uuid="uuidsame"
-                  binary_data="[null]"
-      line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555" 
-      data_hash="0263047cd758c68c27683625f072f010" 
-      src_hash="123456"
-      created_at="1412952242000" updated_at="1412952242000" />
-      
-    <file_sources id="102" project_uuid="projectUuid" file_uuid="uuidempty" binary_data="[null]"
-       line_hashes="[null]"
-       src_hash="abcd"
-       data_hash="0" created_at="1414597442000" updated_at="1414597442000" />
+  <file_sources id="101" project_uuid="projectUuid" file_uuid="uuidsame"
+                binary_data="[null]"
+                test_data="[null]"
+                line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
+                data_hash="0263047cd758c68c27683625f072f010"
+                src_hash="123456"
+                created_at="1412952242000" updated_at="1412952242000"/>
+
+  <file_sources id="102" project_uuid="projectUuid" file_uuid="uuidempty" binary_data="[null]"
+                test_data="[null]"
+                line_hashes="[null]"
+                src_hash="abcd"
+                data_hash="0" created_at="1414597442000" updated_at="1414597442000"/>
 </dataset>
 
 
-- 
cgit v1.2.3