cancel test_data migration in file_sources

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/select_module_files_tree.xml b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/select_module_files_tree.xml
index 0bfa9cfb70cdb20add79158b12362d0cba5d487d..20e8797e9d443f171217bba0946f2acf1876d6eb 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/select_module_files_tree.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/component/db/ComponentDaoTest/select_module_files_tree.xml
@@ -21,7 +21,6 @@
 
   <file_sources id="101" project_uuid="ABCD" file_uuid="EFGHI"
                 binary_data=",,,,,,,,,,,,,,,unchanged&#13;&#10;,,,,,,,,,,,,,,,content&#13;&#10;"
-                test_data="[null]"
                 line_hashes="lineEFGHI"
                 data_hash="dataEFGHI"
                 src_hash="srcEFGHI"
@@ -49,7 +48,6 @@
 
   <file_sources id="102" project_uuid="ABCD" file_uuid="HIJK"
                 binary_data=",,,,,,,,,,,,,,,unchanged&#13;&#10;,,,,,,,,,,,,,,,content&#13;&#10;"
-                test_data="[null]"
                 line_hashes="lineHIJK"
                 data_hash="dataHIJK"
                 src_hash="srcHIJK"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml
index e8f6721099ff8ba16f02b59a5819e2edef9442fa..24e4d0c14d030fc488692315554e9952aa860128 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/issue/SourceLinesCacheTest/load_data.xml
@@ -6,7 +6,6 @@
   -->
   <file_sources id="1" file_uuid="FILE_A" project_uuid="PROJECT_A"
                 binary_data=""
-                test_data="[null]"
                 line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
                 data_hash="0263047cd758c68c27683625f072f010"
                 src_hash="123456"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml
index bfa7d6513867052e55bc5b32f7de65d93fd2eb89..62401136eb3ec2e8ed557900a00718be6c3207d1 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/computation/step/IndexSourceLinesStepTest/index_source.xml
@@ -2,7 +2,6 @@
 
   <file_sources id="101" project_uuid="ABCD" file_uuid="FILE1_UUID"
                 binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH"
-                test_data="[null]"
                 created_at="1500000000000" updated_at="0"/>
 
   <file_sources id="102" project_uuid="DCBA" file_uuid="FILE2_UUID"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/insert-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/insert-result.xml
index 67fb0ae86e70a157f4154809e5339775cad8468a..74bca5ec788c7024e24fefbb0636bb1039243c78 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/insert-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/insert-result.xml
@@ -2,7 +2,6 @@
 
   <file_sources id="101" project_uuid="PRJ_UUID" file_uuid="FILE1_UUID"
                 binary_data="abcde" data_hash="hash"
-                test_data="[null]"
                 line_hashes="ABC\nDEF\nGHI"
                 src_hash="FILE_HASH"
                 created_at="1500000000000" updated_at="1500000000000" />
@@ -10,7 +9,6 @@
 
   <file_sources id="102" project_uuid="PRJ_UUID" file_uuid="FILE2_UUID"
                 binary_data="[ignore]"
-                test_data="[null]"
                 data_hash="FILE2_DATA_HASH"
                 line_hashes="LINE1_HASH\nLINE2_HASH"
                 src_hash="FILE2_HASH"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/shared.xml
index c04c92d5c9b46754f6621ecc12fa58b37cda3f6c..79a340f841d4f0034a8fdceb1a3834c925930cf8 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/shared.xml
@@ -2,7 +2,6 @@
 
     <file_sources id="101" project_uuid="PRJ_UUID" file_uuid="FILE1_UUID"
                   binary_data="abcde" data_hash="hash"
-                  test_data="[null]"
                   line_hashes="ABC\nDEF\nGHI"
                   src_hash="FILE_HASH"
                   created_at="1500000000000" updated_at="1500000000000" />

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update-result.xml
index 2d71f379cf2c57e194dda828b112f5ac9a8d56b9..40cbfa91a43b6f6db4fd62e1932f6e7360af152d 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update-result.xml
@@ -2,7 +2,6 @@
 
   <file_sources id="101" project_uuid="PRJ_UUID" file_uuid="FILE1_UUID"
                 binary_data="[ignore]"
-                test_data="[null]"
                 data_hash="NEW_DATA_HASH"
                 line_hashes="NEW_LINE_HASHES"
                 src_hash="NEW_FILE_HASH"

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml
index 0450883e306aef9c778f2321f96a17909c17b8b7..931bab04e180f9d1700afb59739448577402aca5 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero-result.xml
@@ -3,19 +3,16 @@
   <!-- Updated -->
   <file_sources id="101" project_uuid="ABCD" file_uuid="FILE1_UUID"
                 binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH"
-                test_data="[null]"
                 created_at="1500000000000" updated_at="1500000000002"/>
 
   <!-- Not updated because updated_at is not null -->
   <file_sources id="102" project_uuid="ABCD" file_uuid="FILE2_UUID"
                 binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH"
-                test_data="[null]"
                 created_at="1500000000000" updated_at="1500000000000"/>
 
   <!-- Not updated because on another project -->
   <file_sources id="103" project_uuid="BCDE" file_uuid="FILE3_UUID"
                 binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH"
-                test_data="[null]"
                 created_at="1500000000000" updated_at="0"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml
index 5444e33435f9d3dee14592dd18fe1bf8e7826602..9782d5c383783b89233da53b9fcacddced28aebe 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/db/FileSourceDaoTest/update_date_when_updated_date_is_zero.xml
@@ -3,17 +3,14 @@
   <!-- Only this source should be updated -->
   <file_sources id="101" project_uuid="ABCD" file_uuid="FILE1_UUID"
                 binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH"
-                test_data="[null]"
                 created_at="1500000000000" updated_at="0"/>
 
   <file_sources id="102" project_uuid="ABCD" file_uuid="FILE2_UUID"
                 binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH"
-                test_data="[null]"
                 created_at="1500000000000" updated_at="1500000000000"/>
 
   <file_sources id="103" project_uuid="BCDE" file_uuid="FILE3_UUID"
                 binary_data="abcde" data_hash="hash" line_hashes="ABC\nDEF\nGHI" src_hash="FILE_HASH"
-                test_data="[null]"
                 created_at="1500000000000" updated_at="0"/>
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/schema.sql b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/schema.sql
index abfc5bbcd87bb57afe0d6964d2c8fa554a7f3fa7..859eefe362544adce633ef7e82cd207a7863944c 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/schema.sql
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/schema.sql
@@ -4,7 +4,6 @@ CREATE TABLE "FILE_SOURCES" (
   "PROJECT_UUID" VARCHAR(50) NOT NULL,
   "FILE_UUID" VARCHAR(50) NOT NULL,
   "BINARY_DATA" BINARY(167772150),
-  "TEST_DATA" BINARY(167772150),
   "DATA_HASH" VARCHAR(50) NOT NULL,
   "CREATED_AT" BIGINT NOT NULL,
   "UPDATED_AT" BIGINT NOT NULL

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/shared.xml
index caba05c55b6634f38a6084740c7a871151b1f96a..f56c7f5a796068ba550b3a1892a3b5bab6f01a84 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceFileResultSetIteratorTest/shared.xml
@@ -1,6 +1,6 @@
 <dataset>
 
   <file_sources id="1" project_uuid="P1" file_uuid="F1" created_at="1416238020000" updated_at="1416239042000"
-    binary_data="" test_data="[null]" data_hash="" />
+    binary_data="" data_hash="" />
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceLineIndexerTest/db.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceLineIndexerTest/db.xml
index 4ed570abc884cc4d6a994b31a37428051cd82fd7..48e58478ab6ccdf2f251783200bb7f100964c2a1 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceLineIndexerTest/db.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/index/SourceLineIndexerTest/db.xml
@@ -1,6 +1,6 @@
 <dataset>
 
   <file_sources id="1" project_uuid="PROJECT_UUID" file_uuid="FILE_UUID" created_at="1416238020000" updated_at="1416239042000"
-                binary_data="" test_data="[null]" data_hash="DATA_HASH" />
+                binary_data="" data_hash="DATA_HASH" />
 
 </dataset>

diff --git a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml
index baf6790601ab3d6e3854d162fa8394c8e4cad1f3..4dcc5c21ee0bf1a75248b98a11d4f9a3dc8080a7 100644 (file)
--- a/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml
+++ b/server/sonar-server/src/test/resources/org/sonar/server/source/ws/HashActionTest/shared.xml
@@ -6,7 +6,6 @@
 
   <file_sources id="101" project_uuid="ABCD" file_uuid="CDEF"
                 binary_data="" data_hash="hash"
-                test_data="[null]"
                 line_hashes="987654"
                 src_hash="12345"
                 created_at="1414597442000" updated_at="1414683842000"/>

diff --git a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/909_add_file_sources_test_data.rb b/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/909_add_file_sources_test_data.rb
deleted file mode 100644 (file)
index 134ee56..0000000
--- a/server/sonar-web/src/main/webapp/WEB-INF/db/migrate/909_add_file_sources_test_data.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# SonarQube, open source software quality management tool.
-# Copyright (C) 2008-2014 SonarSource
-# mailto:contact AT sonarsource DOT com
-#
-# SonarQube is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 3 of the License, or (at your option) any later version.
-#
-# SonarQube is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-
-#
-# SonarQube 5.2
-# SONAR-6255
-#
-class AddFileSourcesTestData < ActiveRecord::Migration
-
-  def self.up
-    add_column 'file_sources', 'test_data', :binary, :null => true
-  end
-
-end

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 bcc10abe0b57f7d97b444018d080cfd4b51ffb4f..4879192217c9f870eb8f9a993874bf8cf61a8f50 100644 (file)
--- 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,7 +1,6 @@
 <dataset>
   <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]"

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 bd23aa0d917e2dc1ea621604e0dde3cd0a310dfe..1223c1869cd71597f2b7ed2df51acb5e09acac2d 100644 (file)
--- 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,7 +1,6 @@
 <dataset>
   <file_sources id="1" project_uuid="PROJECT_UUID" file_uuid="FILE_UUID"
                 binary_data="[null]"
-                test_data="[null]"
                 line_hashes="8d7b3d6b83c0a517eac07e1aac94b773&#10;9a0364b9e99bb480dd25e1f0284c8555"
                 data_hash="0263047cd758c68c27683625f072f010"
                 src_hash="123456"

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 39774b75559b8101422367df31a9eef892e49a29..b70d53511d00bba748b144093141b8be94574e00 100644 (file)
--- 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,7 +2,6 @@
 
   <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"

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 430a70baac3b4052cd5e2c4b12cab9462909267e..9b3a8b549a89a99ab9a3f6442b1ea21dc4a5666b 100644 (file)
--- 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,14 +1,12 @@
 <dataset>
   <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"/>

diff --git a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
index 59a46e128eac05c30f077e8f9a67576c0cbaaab8..78d238fd14ac47432fe1b98dc2344fca0eeccf41 100644 (file)
--- a/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
+++ b/sonar-core/src/main/java/org/sonar/core/persistence/DatabaseVersion.java
@@ -33,7 +33,7 @@ import java.util.List;
  */
 public class DatabaseVersion implements BatchComponent, ServerComponent {
 
-  public static final int LAST_VERSION = 909;
+  public static final int LAST_VERSION = 908;
 
   /**
    * List of all the tables.n

diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
index 17bda5bde4b36f3892f786527a64a70f10a34f07..32fdb045630711c5405bb2727bd0d4d756e29c88 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/rows-h2.sql
@@ -332,7 +332,6 @@ INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('905');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('906');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('907');
 INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('908');
-INSERT INTO SCHEMA_MIGRATIONS(VERSION) VALUES ('909');
 
 INSERT INTO USERS(ID, LOGIN, NAME, EMAIL, CRYPTED_PASSWORD, SALT, CREATED_AT, UPDATED_AT, REMEMBER_TOKEN, REMEMBER_TOKEN_EXPIRES_AT) VALUES (1, 'admin', 'Administrator', '', 'a373a0e667abb2604c1fd571eb4ad47fe8cc0878', '48bc4b0d93179b5103fd3885ea9119498e9d161b', '1418215735482', '1418215735482', null, null);
 ALTER TABLE USERS ALTER COLUMN ID RESTART WITH 2;

diff --git a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
index 0e7b81d2a4cd0ab915662374e4df96516a629c78..5ebe86e0e1b94031a043c0e34a7a3736c84afb59 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
+++ b/sonar-core/src/main/resources/org/sonar/core/persistence/schema-h2.ddl
@@ -562,7 +562,6 @@ CREATE TABLE "FILE_SOURCES" (
   "FILE_UUID" VARCHAR(50) NOT NULL,
   "LINE_HASHES" CLOB(2147483647),
   "BINARY_DATA" BLOB(167772150),
-  "TEST_DATA" BLOB(167772150),
   "DATA_HASH" VARCHAR(50) NOT NULL,
   "SRC_HASH" VARCHAR(50) NULL,
   "CREATED_AT" BIGINT NOT NULL,

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml
index b5e97717395bbbd84a7cf0d4a8733854582cb7aa..7caaa52651310aee0fe28d2ef680d24ce1d3b0b8 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources-result.xml
@@ -1,5 +1,5 @@
 <dataset>
 
-  <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" test_data="[null]" line_hashes="[null]" data_hash="321654988"
+  <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" data_hash="321654988"
                 created_at="123456789" updated_at="123456789" src_hash="123456"/>
 </dataset>

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml
index 05dc0c9015a413db1ea2518c0740f45dd54dff6d..aaae9915d98ca140221fbcb3450c2268a910c5ed 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/delete_file_sources_of_disabled_resources.xml
@@ -72,8 +72,8 @@
              depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000"
              build_date="1228222680000" version="[null]" path="[null]"/>
 
-  <file_sources id="1" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" test_data="[null]" line_hashes="[null]" data_hash="321654987"
+  <file_sources id="1" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" line_hashes="[null]" data_hash="321654987"
                 created_at="123456789" updated_at="123456789" src_hash="12345"/>
-  <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" test_data="[null]" line_hashes="[null]" data_hash="321654988"
+  <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" data_hash="321654988"
                 created_at="123456789" updated_at="123456789" src_hash="123456"/>
 </dataset>

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/select_purgeable_file_uuids.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/select_purgeable_file_uuids.xml
index 469122aeb01c14489131c6b1e4b72f8aca57c3e0..5bbb5aa58913b23ab27a03f09f5c9a324baa185f 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/select_purgeable_file_uuids.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/select_purgeable_file_uuids.xml
@@ -79,8 +79,8 @@
              depth="[null]" scope="PRJ" qualifier="TRK" created_at="1228222680000"
              build_date="1228222680000" version="[null]" path="[null]"/>
 
-  <file_sources id="1" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" test_data="[null]" line_hashes="[null]" data_hash="321654987"
+  <file_sources id="1" project_uuid="ABCD" file_uuid="GHIJ" binary_data="[null]" line_hashes="[null]" data_hash="321654987"
                 created_at="123456789" updated_at="123456789"/>
-  <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" test_data="[null]" line_hashes="[null]" data_hash="321654988"
+  <file_sources id="2" project_uuid="ABCD" file_uuid="KLMN" binary_data="[null]" line_hashes="[null]" data_hash="321654988"
                 created_at="123456789" updated_at="123456789"/>
 </dataset>

diff --git a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
index 9a1feb6e06541b748a48101ddc4d9177134c76dd..d50cc3926f5b062ec00f0accf80c5fbdf7b36a21 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
+++ b/sonar-core/src/test/resources/org/sonar/core/purge/PurgeDaoTest/shouldDeleteProject.xml
@@ -103,6 +103,6 @@
              depth="[null]" scope="FIL" qualifier="FIL" created_at="1228222680000"
              build_date="1228222680000"
              version="[null]" path="[null]"/>
-  <file_sources id="1" project_uuid="A" file_uuid="D" binary_data="[null]" test_data="[null]" line_hashes="[null]" data_hash="321654987"
+  <file_sources id="1" project_uuid="A" file_uuid="D" binary_data="[null]" line_hashes="[null]" data_hash="321654987"
                 created_at="123456789" updated_at="123456789"/>
 </dataset>