Fix crlf

author Evgeny Mandrikov <mandrikov@gmail.com>

Wed, 30 Mar 2011 22:09:23 +0000 (02:09 +0400)

committer Evgeny Mandrikov <mandrikov@gmail.com>

Thu, 31 Mar 2011 12:06:17 +0000 (16:06 +0400)
author Evgeny Mandrikov <mandrikov@gmail.com>
Wed, 30 Mar 2011 22:09:23 +0000 (02:09 +0400)
committer Evgeny Mandrikov <mandrikov@gmail.com>
Thu, 31 Mar 2011 12:06:17 +0000 (16:06 +0400)
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/sharedFixture.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/sharedFixture.xml

index 4fbd9f7d094cc1414857ce373201194453d7f741..c748a030e3a90f184b4b43eb5186475aafa249e1 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/sharedFixture.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/sharedFixture.xml
@@ -1,23 +1,23 @@
-<dataset>\r
-\r
-  <metrics id="1" name="foo" val_type="INT" description="[null]" domain="[null]"\r
-           short_name="" qualitative="false" user_managed="false"\r
-           enabled="false" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>\r
-  <metrics id="2" name="bar" val_type="INT" description="[null]" domain="[null]"\r
-           short_name="" qualitative="false" user_managed="false"\r
-           enabled="false" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>\r
-  <metrics id="3" name="boo" val_type="INT" description="[null]" domain="[null]"\r
-           short_name="" qualitative="false" user_managed="false"\r
-           enabled="false" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>\r
-\r
-  <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="mygroup:myartifact" name="[null]"\r
-            root_id="[null]"\r
-            description="[null]"\r
-            enabled="true" language="java" copy_resource_id="[null]"/>\r
-\r
-  <projects long_name="[null]" id="2" scope="PRJ" qualifier="TRK" kee="mygroup2:myartifact" name="[null]"\r
-            root_id="[null]"\r
-            description="[null]"\r
-            enabled="true" language="java" copy_resource_id="[null]"/>\r
-\r
+<dataset>
+
+  <metrics id="1" name="foo" val_type="INT" description="[null]" domain="[null]"
+           short_name="" qualitative="false" user_managed="false"
+           enabled="false" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>
+  <metrics id="2" name="bar" val_type="INT" description="[null]" domain="[null]"
+           short_name="" qualitative="false" user_managed="false"
+           enabled="false" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>
+  <metrics id="3" name="boo" val_type="INT" description="[null]" domain="[null]"
+           short_name="" qualitative="false" user_managed="false"
+           enabled="false" worst_value="[null]" optimized_best_value="[null]" best_value="[null]" direction="0" hidden="false"/>
+
+  <projects long_name="[null]" id="1" scope="PRJ" qualifier="TRK" kee="mygroup:myartifact" name="[null]"
+            root_id="[null]"
+            description="[null]"
+            enabled="true" language="java" copy_resource_id="[null]"/>
+
+  <projects long_name="[null]" id="2" scope="PRJ" qualifier="TRK" kee="mygroup2:myartifact" name="[null]"
+            root_id="[null]"
+            description="[null]"
+            enabled="true" language="java" copy_resource_id="[null]"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure-result.xml

index ceb6a73c68c15cd2bd132fbf75e382d5d9f85055..1905e69d94e03672f5b0caf614145e967ac6aca1 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure-result.xml
@@ -1,22 +1,22 @@
-<dataset>\r
-\r
-  <!--<project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]" rule_priority="[null]" alert_text="[null]"  id="1" project_id="1" metric_id="1" value="1" measure_date="2008-12-03 08:00:00.00" rule_id="[null]"-->\r
-  <!--snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>-->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    alert_status="[null]" description="[null]"/>\r
-\r
-\r
-  <!--<async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>-->\r
-  <!--<async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>-->\r
-  <!--<async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>-->\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"\r
-                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <!--<project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]" rule_priority="[null]" alert_text="[null]"  id="1" project_id="1" metric_id="1" value="1" measure_date="2008-12-03 08:00:00.00" rule_id="[null]"-->
+  <!--snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>-->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    alert_status="[null]" description="[null]"/>
+
+
+  <!--<async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>-->
+  <!--<async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>-->
+  <!--<async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>-->
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"
+                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure.xml

index e4e1e9f289d5a8d866a044fb3ebf9eb93fed72c2..a31a3a3103f28f9b26a4c55f56155cd233c683b7 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure.xml
@@ -1,26 +1,26 @@
-<dataset>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    alert_status="[null]" description="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    alert_status="[null]" description="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"\r
-                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    alert_status="[null]" description="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    alert_status="[null]" description="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"
+                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots-result.xml

index ae9389c25b23b39e8e318cf6ccc393aae495fe59..a9371f88cc4fb3b1aa9c82ad3b2c6ef92f9f2d52 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots-result.xml
@@ -1,11 +1,11 @@
-<dataset>\r
-\r
-  <!--<async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="[null]" metric_id="1" project_id="1"/>-->\r
-  <!--<async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="[null]" metric_id="1" project_id="1"/>-->\r
-  <!--<async_measure_snapshots id="3" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="[null]" metric_id="1" project_id="1"/>-->\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="2" project_id="1"/>\r
+<dataset>
+
+  <!--<async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="[null]" metric_id="1" project_id="1"/>-->
+  <!--<async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="[null]" metric_id="1" project_id="1"/>-->
+  <!--<async_measure_snapshots id="3" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="[null]" metric_id="1" project_id="1"/>-->
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="[null]" metric_id="2" project_id="1"/>
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots.xml

index 55b7e7ecc0ff774c92e331e2046b4193a47514e3..cf0a5f96390a34a931c44002166f81d193f9dc98 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots.xml
@@ -1,11 +1,11 @@
-<dataset>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="2" project_id="1"/>\r
+<dataset>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="[null]" metric_id="2" project_id="1"/>
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetAsyncMeasureSnapshotsFromSnapshotId.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetAsyncMeasureSnapshotsFromSnapshotId.xml

index e5d1c4892a0f123a7664222a8454064870c80fc9..f83aff294c3fc0402444df200be8ed7b5908866a 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetAsyncMeasureSnapshotsFromSnapshotId.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetAsyncMeasureSnapshotsFromSnapshotId.xml
@@ -1,26 +1,26 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-03 18:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    description="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="2" value="2"\r
-                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    description="[null]"/>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 18:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="1" measure_date="2008-12-04 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-03 18:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    description="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="2" value="2"
+                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    description="[null]"/>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 18:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="1" measure_date="2008-12-04 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetLastAsyncMeasureSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetLastAsyncMeasureSnapshot.xml

index 7adc403b439c3fa96ada2f452a8156440d751073..c449c6eef14a6083e1d4072b91072cf5e4ea9659 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetLastAsyncMeasureSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetLastAsyncMeasureSnapshot.xml
@@ -1,12 +1,12 @@
-<dataset>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-04 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"\r
-                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-04 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"
+                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshot.xml

index 705cebd5ef76293575a4771bea869289b0074efc..baba9aad126491ebcc2f8ae2ea7cb2a9f1da96f3 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshot.xml
@@ -1,11 +1,11 @@
-<dataset>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-04 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"\r
-                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>\r
+<dataset>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-04 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"
+                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshotsUntilDate.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshotsUntilDate.xml

index 645a4f4ca05f9e3489bfee6b45b374d1780a9fde..ff8b246f66b37e527b0b01940f149529ee0cbc5f 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshotsUntilDate.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshotsUntilDate.xml
@@ -1,50 +1,50 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-06 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    description="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    description="[null]"/>\r
-  <!-- measure inserted on snapshot 2 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    description="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"\r
-                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-06 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    description="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    description="[null]"/>
+  <!-- measure inserted on snapshot 2 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    description="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"
+                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextSnapshotsUntilDate.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextSnapshotsUntilDate.xml

index 3f139ece5507a076587f372e616158cae8f81921..096f1983d3bba6f7ab2c1822fe3f6f80f880eccc 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextSnapshotsUntilDate.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextSnapshotsUntilDate.xml
@@ -1,35 +1,35 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="FIL" qualifier="CLA" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="3" root_project_id="[null]" root_snapshot_id="3" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="5" scope="FIL" qualifier="CLA" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="4" root_project_id="[null]" root_snapshot_id="4" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="6" scope="PRJ" qualifier="TRK" created_at="2008-12-06 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"\r
-                    description="[null]"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="FIL" qualifier="CLA" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="3" root_project_id="[null]" root_snapshot_id="3" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="5" scope="FIL" qualifier="CLA" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="4" root_project_id="[null]" root_snapshot_id="4" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="6" scope="PRJ" qualifier="TRK" created_at="2008-12-06 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"
+                    description="[null]"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousAsyncMeasureSnapshots.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousAsyncMeasureSnapshots.xml

index b5a5b9dc96dcda50f9c756989973c86039dbd860..a268b957d617847575e0d4ad32fd8f1dc3041fff 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousAsyncMeasureSnapshots.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousAsyncMeasureSnapshots.xml
@@ -1,18 +1,18 @@
-<dataset>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="2" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-04 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="4" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"\r
-                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-  <async_measure_snapshots id="5" project_measure_id="5" snapshot_id="[null]" measure_date="2008-12-07 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="2" project_id="1"/>\r
-  <async_measure_snapshots id="6" project_measure_id="6" snapshot_id="[null]" measure_date="2008-12-08 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="7" project_measure_id="7" snapshot_id="[null]" measure_date="2008-12-09 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
+<dataset>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="2" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-04 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="4" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"
+                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>
+
+  <async_measure_snapshots id="5" project_measure_id="5" snapshot_id="[null]" measure_date="2008-12-07 08:00:00.00"
+                           snapshot_date="[null]" metric_id="2" project_id="1"/>
+  <async_measure_snapshots id="6" project_measure_id="6" snapshot_id="[null]" measure_date="2008-12-08 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="7" project_measure_id="7" snapshot_id="[null]" measure_date="2008-12-09 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousSnapshot.xml

index 1a0faac523260e8933f405b2590357811345bc1d..115b532c9943d0bf75e9922f3143f036bd1994d8 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousSnapshot.xml
@@ -1,24 +1,24 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="DIR" qualifier="PAC" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="1" root_project_id="[null]" root_snapshot_id="1" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="5" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="2"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="DIR" qualifier="PAC" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="1" root_project_id="[null]" root_snapshot_id="1" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="5" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="2"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot-result.xml

index d898eaa01cc7c3286acea419edffa50c16cc7902..7a12ccd2074e1d139254f80a8729b5f6c43967ca 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot-result.xml
@@ -1,28 +1,28 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to first sanspshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- New measure, after last snapshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-  <!-- No snapshot attached -->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-04 12:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to first sanspshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- New measure, after last snapshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+
+  <!-- No snapshot attached -->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-04 12:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot.xml

index 453e0ed20baac5f3ba844f8306c5f4531d0d53e0..4c2bea917dd774fc7d0fce1b0c35ea8f762b0d50 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot.xml
@@ -1,24 +1,24 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to first sanspshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- New measure, after last snapshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to first sanspshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- New measure, after last snapshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure-result.xml

index 640137738248f126521c9d667e10e1db2c050168..f10b82f86cda29f4b5d007786fecd55a7b22248d 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure-result.xml
@@ -1,28 +1,28 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to first sanspshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- New measure, just before first measure -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="50"\r
-                    measure_date="2008-12-02 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-  <!-- No snapshot attached -->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-02 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to first sanspshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- New measure, just before first measure -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="50"
+                    measure_date="2008-12-02 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+
+  <!-- No snapshot attached -->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-02 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure.xml

index c21c79b33cc4c4b9c42c956d0a06e74290294d93..bca00e3377290bd89fb91b27a02e58f0846af8b9 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure.xml
@@ -1,24 +1,24 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to first sanspshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- New measure, just before first measure -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="50"\r
-                    measure_date="2008-12-02 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to first sanspshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- New measure, just before first measure -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="50"
+                    measure_date="2008-12-02 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric-result.xml

index ed05c5cdfb72c3fef2e3fd5ed77394f1d7924248..7d20af585774d8f7e07be0224a50533b4adef4f1 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric-result.xml
@@ -1,37 +1,37 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to snapshot 3 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-05 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- Past measure inserted, have to be assigned only to snapshot 1 and 2 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="2" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to snapshot 3 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-05 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- Past measure inserted, have to be assigned only to snapshot 1 and 2 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="2" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric.xml

index f626a2ecdb29609ba27c13fca9380832b13bfaff..74d8837d110a08d5ee887e178c0cadc25ef2a0bf 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric.xml
@@ -1,33 +1,33 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to snapshot 3 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-05 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- Past measure inserted, have to be assigned only to snapshot 1 and 2 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to snapshot 3 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-05 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- Past measure inserted, have to be assigned only to snapshot 1 and 2 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot-result.xml

index 91a93f2d2c0c8120a54406e0d69b80715b488420..d881a39193f3954d1ae74a28989024a425c0fab9 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot-result.xml
@@ -1,42 +1,42 @@
-<dataset>\r
-\r
-  <!-- Previous snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <!-- New snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-02 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-02 10:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="5"\r
-                    measure_date="2008-12-03 10:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <!-- Previous async_measure_snapshots, attached to first snapshot -->\r
-  <async_measure_snapshots id="1" project_measure_id="2" snapshot_id="1" measure_date="2008-12-02 10:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="3" snapshot_id="1" measure_date="2008-12-03 10:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="2" project_id="1"/>\r
-\r
-  <!--async_measure_snapshots from previous snapshot created for last snapshot -->\r
-  <async_measure_snapshots id="3" project_measure_id="2" snapshot_id="2" measure_date="2008-12-02 10:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="3" snapshot_id="2" measure_date="2008-12-03 10:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <!-- Previous snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <!-- New snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-02 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-02 10:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="5"
+                    measure_date="2008-12-03 10:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <!-- Previous async_measure_snapshots, attached to first snapshot -->
+  <async_measure_snapshots id="1" project_measure_id="2" snapshot_id="1" measure_date="2008-12-02 10:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="3" snapshot_id="1" measure_date="2008-12-03 10:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="2" project_id="1"/>
+
+  <!--async_measure_snapshots from previous snapshot created for last snapshot -->
+  <async_measure_snapshots id="3" project_measure_id="2" snapshot_id="2" measure_date="2008-12-02 10:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="3" snapshot_id="2" measure_date="2008-12-03 10:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot.xml

index ff3766551731d0cafc0e3c04b71d8a59b110ab76..13c290cb14d9a5e557edf08bf670d9cc9e87a844 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot.xml
@@ -1,36 +1,36 @@
-<dataset>\r
-\r
-  <!-- Previous snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <!-- New snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-02 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-02 10:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="5"\r
-                    measure_date="2008-12-03 10:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <!-- Previous async_measure_snapshots, attached to first snapshot -->\r
-  <async_measure_snapshots id="1" project_measure_id="2" snapshot_id="1" measure_date="2008-12-02 10:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="3" snapshot_id="1" measure_date="2008-12-03 10:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <!-- Previous snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <!-- New snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-02 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-02 10:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="5"
+                    measure_date="2008-12-03 10:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <!-- Previous async_measure_snapshots, attached to first snapshot -->
+  <async_measure_snapshots id="1" project_measure_id="2" snapshot_id="1" measure_date="2008-12-02 10:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="3" snapshot_id="1" measure_date="2008-12-03 10:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot-result.xml

index 1fd4e3cb40855cf793a9523da5adc893047f1ac2..99475dfb9d1ba45697b49d3c515aba3f55f94dc7 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot-result.xml
@@ -1,45 +1,45 @@
-<dataset>\r
-\r
-  <!-- new snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!--latest-->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-03 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="6"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!--latest-->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="4" project_id="1" metric_id="2" value="7"\r
-                    measure_date="2008-12-03 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <!-- attached -->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="1" measure_date="2008-12-03 12:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="[null]" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="[null]" metric_id="2" project_id="1"/>\r
-  <!-- attached -->\r
-  <async_measure_snapshots id="4" project_measure_id="4" snapshot_id="1" measure_date="2008-12-03 12:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <!-- new snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!--latest-->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-03 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="6"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!--latest-->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="4" project_id="1" metric_id="2" value="7"
+                    measure_date="2008-12-03 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <!-- attached -->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="1" measure_date="2008-12-03 12:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="[null]" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="[null]" metric_id="2" project_id="1"/>
+  <!-- attached -->
+  <async_measure_snapshots id="4" project_measure_id="4" snapshot_id="1" measure_date="2008-12-03 12:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot.xml

index 6fde2608711eb1d2501b4e02d87f775681a2ac27..7ea8aa5fbaa38ec6eb6835acff2b5b05508dd880 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot.xml
@@ -1,43 +1,43 @@
-<dataset>\r
-\r
-  <!-- new snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!--latest-->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-03 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="6"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!--latest-->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="4" project_id="1" metric_id="2" value="7"\r
-                    measure_date="2008-12-03 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 12:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="[null]" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="[null]" metric_id="2" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="4" snapshot_id="[null]" measure_date="2008-12-03 12:00:00.00"\r
-                           snapshot_date="[null]" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <!-- new snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!--latest-->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-03 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="6"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!--latest-->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="4" project_id="1" metric_id="2" value="7"
+                    measure_date="2008-12-03 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 12:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="[null]" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="[null]" metric_id="2" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="4" snapshot_id="[null]" measure_date="2008-12-03 12:00:00.00"
+                           snapshot_date="[null]" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric-result.xml

index 6632b151e3f3d5d80ce8124ec7123019fd402725..d2b62cbf6d8eb79974aa73e1d0f44e833ca50314 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric-result.xml
@@ -1,59 +1,59 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-06 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to snapshot 1, 2 and 3 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- Assigned to snapshot 4 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- To be assigned only to snapshot 2 and 3 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <!-- Now assigned to no snapshot -->\r
-  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <!-- Now assigned to no snapshot -->\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"\r
-                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-  <!-- Now assigned to review 3 -->\r
-  <async_measure_snapshots id="5" project_measure_id="3" snapshot_id="2" measure_date="2008-12-04 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <!-- Now assigned to review 3 -->\r
-  <async_measure_snapshots id="6" project_measure_id="3" snapshot_id="3" measure_date="2008-12-04 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-06 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to snapshot 1, 2 and 3 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- Assigned to snapshot 4 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- To be assigned only to snapshot 2 and 3 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <!-- Now assigned to no snapshot -->
+  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <!-- Now assigned to no snapshot -->
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"
+                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>
+
+  <!-- Now assigned to review 3 -->
+  <async_measure_snapshots id="5" project_measure_id="3" snapshot_id="2" measure_date="2008-12-04 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <!-- Now assigned to review 3 -->
+  <async_measure_snapshots id="6" project_measure_id="3" snapshot_id="3" measure_date="2008-12-04 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric.xml

index d3165dc2f7ca4a7dcf4a9b48174861a921435aaf..9d343211f2992f33fc768fa589fa6d383849130e 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric.xml
@@ -1,49 +1,49 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-06 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to snapshot 1, 2 and 3 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- Assigned to snapshot 4 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- To be assigned only to snapshot 2 and 3 -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"\r
-                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="4" scope="PRJ" qualifier="TRK" created_at="2008-12-06 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to snapshot 1, 2 and 3 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- Assigned to snapshot 4 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-06 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- To be assigned only to snapshot 2 and 3 -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="4" measure_date="2008-12-06 08:00:00.00"
+                           snapshot_date="2008-12-06 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot-result.xml

index b63a7063f31a3fec0ee151bf1f246098a5aa0f51..f8df127f391c1e039a86e788ae3d86530a8d70de 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot-result.xml
@@ -1,24 +1,24 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-03 14:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="2" value="5"\r
-                    measure_date="2008-12-03 15:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 14:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="1" measure_date="2008-12-03 15:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-03 14:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="2" value="5"
+                    measure_date="2008-12-03 15:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 14:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="1" measure_date="2008-12-03 15:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot.xml

index 2c6b73de1a7a095a3e82ea06561475b5d76a567f..036b21882df00a197898ad508633379f1f62c366 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot.xml
@@ -1,24 +1,24 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-03 14:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="2" value="5"\r
-                    measure_date="2008-12-03 15:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 14:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 15:00:00.00"\r
-                           snapshot_date="[null]" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-03 14:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="2" value="5"
+                    measure_date="2008-12-03 15:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 14:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 15:00:00.00"
+                           snapshot_date="[null]" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots-result.xml

index 7663f7b1f302effe3c64ad718cb596ebcf116fbe..36a166be73503c504e92ad77004db82a0f504642 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots-result.xml
@@ -1,44 +1,44 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="10"\r
-                    measure_date="2008-12-03 8:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- New measure -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-04 8:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 8:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-  <!-- Now assigned to no snapshot -->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 8:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="[null]" measure_date="2008-12-03 8:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-\r
-  <!-- Now assigned to snapshot 2 and 3 -->\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="2" measure_date="2008-12-04 8:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="5" project_measure_id="2" snapshot_id="3" measure_date="2008-12-04 8:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="10"
+                    measure_date="2008-12-03 8:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- New measure -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-04 8:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 8:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+
+  <!-- Now assigned to no snapshot -->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 8:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="[null]" measure_date="2008-12-03 8:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+
+  <!-- Now assigned to snapshot 2 and 3 -->
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="2" measure_date="2008-12-04 8:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="5" project_measure_id="2" snapshot_id="3" measure_date="2008-12-04 8:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots.xml

index 177f4a1eed3c4f00e71b40299860bd1257a7b384..5478f7f10bc13defbfdab48d88c2546fa38953d6 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots.xml
@@ -1,36 +1,36 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="10"\r
-                    measure_date="2008-12-03 8:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- New measure -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-04 8:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 8:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-03 8:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="3" measure_date="2008-12-03 8:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="10"
+                    measure_date="2008-12-03 8:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- New measure -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-04 8:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 8:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-03 8:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="3" measure_date="2008-12-03 8:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot-result.xml

index 3283a09d2ef15fe3b8f2da089d0a9188aa14f183..977d0365d79cf667fe11df1f950e3af9466a412a 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot-result.xml
@@ -1,43 +1,43 @@
-<dataset>\r
-\r
-  <!-- Previous snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <!-- New snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- Assigned to first sanspshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <!-- Assigmed to no snapshot, because its new reviews -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-03 18:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="5"\r
-                    measure_date="2008-12-04 10:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <!-- async_measure_snapshots attached to first snapshot -->\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-  <!-- async_measure_snapshots now attached to last snapshot -->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-03 18:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="2" measure_date="2008-12-04 10:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <!-- Previous snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <!-- New snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- Assigned to first sanspshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <!-- Assigmed to no snapshot, because its new reviews -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-03 18:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="5"
+                    measure_date="2008-12-04 10:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <!-- async_measure_snapshots attached to first snapshot -->
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+
+  <!-- async_measure_snapshots now attached to last snapshot -->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-03 18:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="2" measure_date="2008-12-04 10:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot.xml

index 634cafee24cfbed67a7b100b9d2b49dbebce38a1..c73190edccd1f052fe38f89f2e134318c2a57287 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot.xml
@@ -1,42 +1,42 @@
-<dataset>\r
-\r
-  <!-- Previous snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <!-- New snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"/>\r
-\r
-  <!-- Assigned to first sanspshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <!-- Assigmed to no snapshot, because its new reviews -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-03 18:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="5"\r
-                    measure_date="2008-12-04 10:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <!-- async_measure_snapshots attached to first snapshot -->\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-  <!-- async_measure_snapshots attached to no snapshot -->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 18:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="[null]" measure_date="2008-12-04 10:00:00.00"\r
-                           snapshot_date="[null]" metric_id="2" project_id="1"/>\r
-\r
+<dataset>
+
+  <!-- Previous snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <!-- New snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"/>
+
+  <!-- Assigned to first sanspshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-02 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <!-- Assigmed to no snapshot, because its new reviews -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-03 18:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="3" project_id="1" metric_id="2" value="5"
+                    measure_date="2008-12-04 10:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <!-- async_measure_snapshots attached to first snapshot -->
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-02 12:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+
+  <!-- async_measure_snapshots attached to no snapshot -->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="[null]" measure_date="2008-12-03 18:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="3" snapshot_id="[null]" measure_date="2008-12-04 10:00:00.00"
+                           snapshot_date="[null]" metric_id="2" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot-result.xml

index 57705a616bad6b79317718f367ade99709c2a67b..04ea0cd38d6e6eaafebdabfa53317da86137f059 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot-result.xml
@@ -1,47 +1,47 @@
-<dataset>\r
-\r
-  <!-- First snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-02 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <!-- Last snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- New snapshot, inserted between last two -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-\r
-  <!-- reviews attached to first snapshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-01 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- reviews attached to last snapshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <!-- async_measure_snapshots attached to first snapshot -->\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-01 12:00:00.00"\r
-                           snapshot_date="2008-12-02 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <!-- async_measure_snapshots attached to last snapshot -->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-04 12:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
-\r
-  <!-- async_measure_snapshots created for the new snapshot -->\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-01 12:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <!-- First snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-02 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <!-- Last snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- New snapshot, inserted between last two -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+
+  <!-- reviews attached to first snapshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-01 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- reviews attached to last snapshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <!-- async_measure_snapshots attached to first snapshot -->
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-01 12:00:00.00"
+                           snapshot_date="2008-12-02 12:00:00.00" metric_id="1" project_id="1"/>
+  <!-- async_measure_snapshots attached to last snapshot -->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-04 12:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
+
+  <!-- async_measure_snapshots created for the new snapshot -->
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="3" measure_date="2008-12-01 12:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot.xml

index 7342409a29c32f6a220005b92e25307505d600c0..1916d0b87f4675a3c15d860611558404d4c072c3 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot.xml
@@ -1,42 +1,42 @@
-<dataset>\r
-\r
-  <!-- First snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-02 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <!-- Last snapshot -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!-- New snapshot, inserted between last two -->\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-\r
-  <!-- reviews attached to first snapshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-01 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- reviews attached to last snapshot -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"\r
-                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <!-- async_measure_snapshots attached to first snapshot -->\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-01 12:00:00.00"\r
-                           snapshot_date="2008-12-02 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <!-- async_measure_snapshots attached to last snapshot -->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-04 12:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <!-- First snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-02 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <!-- Last snapshot -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!-- New snapshot, inserted between last two -->
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+
+  <!-- reviews attached to first snapshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-01 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- reviews attached to last snapshot -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="5"
+                    measure_date="2008-12-04 12:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <!-- async_measure_snapshots attached to first snapshot -->
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="1" measure_date="2008-12-01 12:00:00.00"
+                           snapshot_date="2008-12-02 12:00:00.00" metric_id="1" project_id="1"/>
+  <!-- async_measure_snapshots attached to last snapshot -->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="2" measure_date="2008-12-04 12:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure-result.xml

index fcd63b79325215b955aab9ce44fe56c374f69e69..bbfd4845003da07d35a69eeee003345573e289ba 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure-result.xml
@@ -1,30 +1,30 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <!--<project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" id="1" project_id="1" metric_id="1" value="12" measure_date="2008-12-03 10:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>-->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-\r
-  <!--<async_measure_snapshots id="1" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 10:00:00.00"-->\r
-  <!--snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>-->\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="3" measure_date="2008-12-04 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <!--<project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" id="1" project_id="1" metric_id="1" value="12" measure_date="2008-12-03 10:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>-->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+
+  <!--<async_measure_snapshots id="1" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 10:00:00.00"-->
+  <!--snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>-->
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="3" measure_date="2008-12-04 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure.xml

index 0fe23dabe4bfcfd72abdb090bc9d576321ad20b9..d0a260f60f189c9c566b598feb4100d66fae9579 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure.xml
@@ -1,32 +1,32 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="12"\r
-                    measure_date="2008-12-03 10:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"\r
-                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 10:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="3" measure_date="2008-12-04 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="12"
+                    measure_date="2008-12-03 10:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="8"
+                    measure_date="2008-12-04 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 10:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="2" project_measure_id="2" snapshot_id="3" measure_date="2008-12-04 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure-result.xml

index 252cfc25be177b338ef8d02862257af473e5ac1e..ed2be1cb3460fc656920c9ff6ab3f24843aa7975 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure-result.xml
@@ -1,41 +1,41 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- async measure to be deleted -->\r
-  <!--<project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" id="2" project_id="1" metric_id="1" value="2" measure_date="2008-12-05 08:00:00.00" rule_id="[null]"-->\r
-  <!--snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>-->\r
-\r
-  <!-- old async measure snapshots -->\r
-  <!--<async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="[null]" metric_id="1" project_id="1" />-->\r
-\r
-  <!--<async_measure_snapshots id="2" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1" />-->\r
-  <!--<async_measure_snapshots id="3" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"-->\r
-  <!--snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1" />-->\r
-  <!--<async_measure_snapshots id="4" project_measure_id="2" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"-->\r
-  <!--snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1" />-->\r
-\r
-  <async_measure_snapshots id="5" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="6" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="7" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- async measure to be deleted -->
+  <!--<project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]" rule_priority="[null]" alert_text="[null]" id="2" project_id="1" metric_id="1" value="2" measure_date="2008-12-05 08:00:00.00" rule_id="[null]"-->
+  <!--snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>-->
+
+  <!-- old async measure snapshots -->
+  <!--<async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="[null]" metric_id="1" project_id="1" />-->
+
+  <!--<async_measure_snapshots id="2" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1" />-->
+  <!--<async_measure_snapshots id="3" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"-->
+  <!--snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1" />-->
+  <!--<async_measure_snapshots id="4" project_measure_id="2" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"-->
+  <!--snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1" />-->
+
+  <async_measure_snapshots id="5" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="6" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="7" project_measure_id="1" snapshot_id="3" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure.xml

index 6e1e6e87b2c6c3a2ea3a7ee24023f1dcd6a1bfbb..17b279547f25cbaf0b5e391eb1ef2816572c8289 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure.xml
@@ -1,39 +1,39 @@
-<dataset>\r
-\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"\r
-             project_id="1"\r
-              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"\r
-             path="[null]"/>\r
-\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"\r
-                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-  <!-- async measure to be deleted -->\r
-  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"\r
-                    rule_priority="[null]"\r
-                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"\r
-                    measure_date="2008-12-05 08:00:00.00" rule_id="[null]"\r
-                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>\r
-\r
-  <!-- old async measure snapshots -->\r
-  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="[null]" metric_id="1" project_id="1"/>\r
-\r
-  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"\r
-                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>\r
-  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"\r
-                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>\r
-\r
+<dataset>
+
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="1" scope="PRJ" qualifier="TRK" created_at="2008-12-03 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="2" scope="PRJ" qualifier="TRK" created_at="2008-12-04 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+  <snapshots period1_mode="[null]" period1_param="[null]" period1_date="[null]" period2_mode="[null]" period2_param="[null]" period2_date="[null]" period3_mode="[null]" period3_param="[null]" period3_date="[null]" period4_mode="[null]" period4_param="[null]" period4_date="[null]" period5_mode="[null]" period5_param="[null]" period5_date="[null]" depth="[null]" id="3" scope="PRJ" qualifier="TRK" created_at="2008-12-05 12:00:00.00" version="[null]"
+             project_id="1"
+              parent_snapshot_id="[null]" root_project_id="[null]" root_snapshot_id="[null]" status="P" islast="true"
+             path="[null]"/>
+
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="1" project_id="1" metric_id="1" value="1"
+                    measure_date="2008-12-03 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+  <!-- async measure to be deleted -->
+  <project_measures characteristic_id="[null]" url="[null]" variation_value_1="[null]" variation_value_2="[null]" variation_value_3="[null]" variation_value_4="[null]" variation_value_5="[null]"
+                    rule_priority="[null]"
+                    alert_text="[null]" id="2" project_id="1" metric_id="1" value="2"
+                    measure_date="2008-12-05 08:00:00.00" rule_id="[null]"
+                    snapshot_id="[null]" rules_category_id="[null]" text_value="[null]" tendency="[null]"/>
+
+  <!-- old async measure snapshots -->
+  <async_measure_snapshots id="1" project_measure_id="1" snapshot_id="[null]" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="[null]" metric_id="1" project_id="1"/>
+
+  <async_measure_snapshots id="2" project_measure_id="1" snapshot_id="1" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-03 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="3" project_measure_id="1" snapshot_id="2" measure_date="2008-12-03 08:00:00.00"
+                           snapshot_date="2008-12-04 12:00:00.00" metric_id="1" project_id="1"/>
+  <async_measure_snapshots id="4" project_measure_id="2" snapshot_id="3" measure_date="2008-12-05 08:00:00.00"
+                           snapshot_date="2008-12-05 12:00:00.00" metric_id="1" project_id="1"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml

index 3325d8baf745108c72ea501b03bf7f814e5e654d..ca00e8cb5c411ce6eeb01a0e2c4995ca0410100c 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml
@@ -1,7 +1,7 @@
-<dataset>\r
-\r
-  <rules_profiles id="1" provided="true" name="profile one" default_profile="0" language="java" enabled="true"/>\r
-  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>\r
-  <rules_profiles id="3" provided="true" name="profile three" default_profile="0" language="plsql" enabled="true"/>\r
-\r
+<dataset>
+
+  <rules_profiles id="1" provided="true" name="profile one" default_profile="0" language="java" enabled="true"/>
+  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
+  <rules_profiles id="3" provided="true" name="profile three" default_profile="0" language="plsql" enabled="true"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml

index 94757dbf118de941cd879253e22840a14ad8e968..c749a99827e23fc948649201ec5e5b879a38a05f 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml
@@ -1,19 +1,19 @@
-<dataset>\r
-\r
-  <rules_categories id="1" name="category one" description="[null]"/>\r
-\r
-  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>\r
-  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>\r
-\r
-  <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"\r
-         plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-  <rules id="2" name="bar" description="test" plugin_config_key="checker/bar"\r
-         plugin_rule_key="checkstyle.rule2" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-  <rules id="3" name="baz" description="test" plugin_config_key="checker/baz"\r
-         plugin_rule_key="checkstyle.rule3" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-\r
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/>\r
-  <active_rules id="2" profile_id="1" rule_id="2" failure_level="2"/>\r
-  <active_rules id="3" profile_id="1" rule_id="3" failure_level="2"/>\r
-\r
+<dataset>
+
+  <rules_categories id="1" name="category one" description="[null]"/>
+
+  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
+  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
+
+  <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"
+         plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+  <rules id="2" name="bar" description="test" plugin_config_key="checker/bar"
+         plugin_rule_key="checkstyle.rule2" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+  <rules id="3" name="baz" description="test" plugin_config_key="checker/baz"
+         plugin_rule_key="checkstyle.rule3" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/>
+  <active_rules id="2" profile_id="1" rule_id="2" failure_level="2"/>
+  <active_rules id="3" profile_id="1" rule_id="3" failure_level="2"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml

index de59da7e6e7909d8e1d9c51e54f55f83b8d4445d..428fe6d8b44af359a507cbaab8154771160093c7 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml
@@ -1,23 +1,23 @@
-<dataset>\r
-\r
-  <rules_categories id="1" name="category one" description="[null]"/>\r
-\r
-  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>\r
-  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>\r
-\r
-  <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"\r
-         plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-  <rules id="2" name="bar" description="test" plugin_config_key="checker/bar"\r
-         plugin_rule_key="checkstyle.rule2" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-  <rules id="3" name="baz" description="test" plugin_config_key="checker/baz"\r
-         plugin_rule_key="checkstyle.rule3" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-\r
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/>\r
-  <active_rules id="2" profile_id="1" rule_id="2" failure_level="2"/>\r
-  <active_rules id="3" profile_id="1" rule_id="3" failure_level="2"/>\r
-\r
-  <active_rules id="4" profile_id="2" rule_id="1" failure_level="2"/>\r
-  <active_rules id="5" profile_id="2" rule_id="2" failure_level="2"/>\r
-  <active_rules id="6" profile_id="2" rule_id="3" failure_level="2"/>\r
-\r
+<dataset>
+
+  <rules_categories id="1" name="category one" description="[null]"/>
+
+  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
+  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
+
+  <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"
+         plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+  <rules id="2" name="bar" description="test" plugin_config_key="checker/bar"
+         plugin_rule_key="checkstyle.rule2" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+  <rules id="3" name="baz" description="test" plugin_config_key="checker/baz"
+         plugin_rule_key="checkstyle.rule3" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/>
+  <active_rules id="2" profile_id="1" rule_id="2" failure_level="2"/>
+  <active_rules id="3" profile_id="1" rule_id="3" failure_level="2"/>
+
+  <active_rules id="4" profile_id="2" rule_id="1" failure_level="2"/>
+  <active_rules id="5" profile_id="2" rule_id="2" failure_level="2"/>
+  <active_rules id="6" profile_id="2" rule_id="3" failure_level="2"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml

index 94757dbf118de941cd879253e22840a14ad8e968..c749a99827e23fc948649201ec5e5b879a38a05f 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml
@@ -1,19 +1,19 @@
-<dataset>\r
-\r
-  <rules_categories id="1" name="category one" description="[null]"/>\r
-\r
-  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>\r
-  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>\r
-\r
-  <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"\r
-         plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-  <rules id="2" name="bar" description="test" plugin_config_key="checker/bar"\r
-         plugin_rule_key="checkstyle.rule2" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-  <rules id="3" name="baz" description="test" plugin_config_key="checker/baz"\r
-         plugin_rule_key="checkstyle.rule3" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-\r
-  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/>\r
-  <active_rules id="2" profile_id="1" rule_id="2" failure_level="2"/>\r
-  <active_rules id="3" profile_id="1" rule_id="3" failure_level="2"/>\r
-\r
+<dataset>
+
+  <rules_categories id="1" name="category one" description="[null]"/>
+
+  <rules_profiles id="1" provided="true" name="profile one" default_profile="1" language="java" enabled="true"/>
+  <rules_profiles id="2" provided="true" name="profile two" default_profile="0" language="java" enabled="true"/>
+
+  <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"
+         plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+  <rules id="2" name="bar" description="test" plugin_config_key="checker/bar"
+         plugin_rule_key="checkstyle.rule2" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+  <rules id="3" name="baz" description="test" plugin_config_key="checker/baz"
+         plugin_rule_key="checkstyle.rule3" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+
+  <active_rules id="1" profile_id="1" rule_id="1" failure_level="2"/>
+  <active_rules id="2" profile_id="1" rule_id="2" failure_level="2"/>
+  <active_rules id="3" profile_id="1" rule_id="3" failure_level="2"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml

index 7df82f674760c6b08f4cdeeb9060fc9305e3a44c..97861d8b3f514f391400eb52879b7e5124425929 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml
@@ -1,19 +1,19 @@
-<dataset>\r
-\r
-  <rules_categories id="1" name="category one" description="[null]"/>\r
-\r
-  <!-- Rules -->\r
-  <rules id="1" name="new1" description="test1" plugin_config_key="checker/new1"\r
-         plugin_rule_key="checkstyle.new1" plugin_name="PLUGIN_KEY" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-  <rules id="2" name="new2" description="test2" plugin_config_key="checker/new2"\r
-         plugin_rule_key="checkstyle.new2" plugin_name="PLUGIN_KEY" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-\r
-  <!-- Rules parameters -->\r
-  <rules_parameters id="1" rule_id="1" name="rule1_param1" description="rule1_desc1" param_type="r"\r
-      />\r
-  <rules_parameters id="2" rule_id="1" name="rule1_param2" description="rule1_desc2" param_type="r"\r
-      />\r
-  <rules_parameters id="3" rule_id="2" name="rule2_param1" description="rule2_desc1" param_type="r"\r
-      />\r
-\r
+<dataset>
+
+  <rules_categories id="1" name="category one" description="[null]"/>
+
+  <!-- Rules -->
+  <rules id="1" name="new1" description="test1" plugin_config_key="checker/new1"
+         plugin_rule_key="checkstyle.new1" plugin_name="PLUGIN_KEY" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+  <rules id="2" name="new2" description="test2" plugin_config_key="checker/new2"
+         plugin_rule_key="checkstyle.new2" plugin_name="PLUGIN_KEY" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+
+  <!-- Rules parameters -->
+  <rules_parameters id="1" rule_id="1" name="rule1_param1" description="rule1_desc1" param_type="r"
+      />
+  <rules_parameters id="2" rule_id="1" name="rule1_param2" description="rule1_desc2" param_type="r"
+      />
+  <rules_parameters id="3" rule_id="2" name="rule2_param1" description="rule2_desc1" param_type="r"
+      />
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml

index 42176327e0321085c55e4a8954fa60a1bb15c9c1..3ecb39c8d8d0b882b80121fb3f4ae3a1df546cdc 100644 (file)
--- a/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml
+++ b/sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml
@@ -1,8 +1,8 @@
-<dataset>\r
-\r
-  <rules_categories id="1" name="category one" description="[null]"/>\r
-\r
-  <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"\r
-         plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>\r
-\r
+<dataset>
+
+  <rules_categories id="1" name="category one" description="[null]"/>
+
+  <rules id="1" name="foo" description="test" plugin_config_key="checker/foo"
+         plugin_rule_key="checkstyle.rule1" plugin_name="plugin" enabled="true" cardinality="SINGLE" parent_id="[null]"/>
+
  </dataset>
 \ No newline at end of file
diff --git a/sonar-plugin-api/src/test/resources/META-INF/MANIFEST.MF b/sonar-plugin-api/src/test/resources/META-INF/MANIFEST.MF

index 1c312720b4d32cb6fafd588e25b8169b3d16830f..ce807b4fa4a8458fb1aa7b8c9caac92337e37c46 100644 (file)
--- a/sonar-plugin-api/src/test/resources/META-INF/MANIFEST.MF
+++ b/sonar-plugin-api/src/test/resources/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
-Manifest-Version: 1.0\r
-Archiver-Version: Plexus Archiver\r
-Created-By: Apache Maven\r
-Built-By: Sonar\r
-Build-Jdk: 1.5.0_09\r
-Plugin-Class: org.sonar.api.FakePlugin\r
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: Sonar
+Build-Jdk: 1.5.0_09
+Plugin-Class: org.sonar.api.FakePlugin
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_gradient.rhtml b/sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_gradient.rhtml

index 220f4f9b7a95f45ff39cde0f5fe0730c9f40414a..635136285f66641d1057a745e2a9021b02b5893a 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_gradient.rhtml
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_gradient.rhtml
@@ -1,20 +1,20 @@
-<%\r
-if color_metric && color_metric.worst_value && color_metric.best_value\r
-  min=0\r
-  max=0\r
-  if color_metric.worst_value<color_metric.best_value\r
-    min=color_metric.worst_value\r
-    max=color_metric.best_value\r
-    image = 'treemap_gradient.png'\r
-    id = 'treemap_gradient_direction_positive'\r
-  else\r
-    min=color_metric.best_value\r
-    max=color_metric.worst_value\r
-    image = 'treemap_gradient_inverted.png'\r
-    id = 'treemap_gradient_direction_negative'\r
-  end\r
-%>\r
-  <%= min -%><%= color_metric.suffix -%> <img id="<%= id -%>" src="<%= image_path image -%>" style="border: 1px solid #000; vertical-align:middle"> <%= max -%><%= color_metric.suffix -%>\r
-<%\r
-end\r
+<%
+if color_metric && color_metric.worst_value && color_metric.best_value
+  min=0
+  max=0
+  if color_metric.worst_value<color_metric.best_value
+    min=color_metric.worst_value
+    max=color_metric.best_value
+    image = 'treemap_gradient.png'
+    id = 'treemap_gradient_direction_positive'
+  else
+    min=color_metric.best_value
+    max=color_metric.worst_value
+    image = 'treemap_gradient_inverted.png'
+    id = 'treemap_gradient_direction_negative'
+  end
+%>
+  <%= min -%><%= color_metric.suffix -%> <img id="<%= id -%>" src="<%= image_path image -%>" style="border: 1px solid #000; vertical-align:middle"> <%= max -%><%= color_metric.suffix -%>
+<%
+end
  %>
 \ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_set_default.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_set_default.html.erb

index 2b5d46798062835faf2ece1553cbe0d73a774563..9b86f8d421fe21487fc378bcf4b5b9bcd375033f 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_set_default.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_set_default.html.erb
@@ -1,4 +1,4 @@
-<% form_tag(\r
-  {:controller => controller, :action => "update_default_treemap_metrics", :size_metric => @treemap.size_metric.key, :color_metric => @treemap.color_metric.key, :rid => rid}, \r
-  :id => 'form_set_default') do %>\r
-<% end %>\r
+<% form_tag(
+  {:controller => controller, :action => "update_default_treemap_metrics", :size_metric => @treemap.size_metric.key, :color_metric => @treemap.color_metric.key, :rid => rid}, 
+  :id => 'form_set_default') do %>
+<% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb

index 55c23fab821be0a19b036a558c5003445cba997c..66344364c10dd794efd302f136fcfc12ff7f75fe 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb
@@ -1,26 +1,26 @@
-<ol id="crumbs">\r
-  <li><a href="<%= ApplicationController.root_context -%>/">Home</a></li>\r
-  <%\r
-if @snapshot\r
-  resources=[]\r
-  s=@snapshot\r
-  while (s!=nil) do\r
-    resources<<s.project\r
-    s=s.parent\r
-  end\r
-\r
-  index=resources.size-1\r
-  while (index>=0) do\r
-    resource=resources[index]\r
-%>\r
-  <li><%= qualifier_icon(resource) -%> <a href="<%= url_for :overwrite_params => { :id => resource.key } -%>"><%= h resource.name -%></a></li>\r
-<%\r
-    index-=1\r
-  end\r
-elsif @project\r
-%>\r
-  <li><%= qualifier_icon(@project) -%> <a href="<%= url_for :overwrite_params => { :id => @project.key } -%>"><%= h @project.name -%></a></li>\r
-<%\r
-end\r
-%>\r
+<ol id="crumbs">
+  <li><a href="<%= ApplicationController.root_context -%>/">Home</a></li>
+  <%
+if @snapshot
+  resources=[]
+  s=@snapshot
+  while (s!=nil) do
+    resources<<s.project
+    s=s.parent
+  end
+
+  index=resources.size-1
+  while (index>=0) do
+    resource=resources[index]
+%>
+  <li><%= qualifier_icon(resource) -%> <a href="<%= url_for :overwrite_params => { :id => resource.key } -%>"><%= h resource.name -%></a></li>
+<%
+    index-=1
+  end
+elsif @project
+%>
+  <li><%= qualifier_icon(@project) -%> <a href="<%= url_for :overwrite_params => { :id => @project.key } -%>"><%= h @project.name -%></a></li>
+<%
+end
+%>
  </ol>
 \ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml b/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml

index 0cce193ad9ff32df3032d0d2d60fa22c81ca6891..cfb2a3049e97a4948f173f1f3a53e39e56b60596 100644 (file)
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml
@@ -1,21 +1,21 @@
-<h1>Database down.</h1>\r
-<div class="error">\r
-  Database connection cannot be established. Check that you have a database running\r
-  and configured for the following settings :\r
-  <table>\r
-  <tr>\r
-    <td>URL: &nbsp;&nbsp;</td>\r
-    <td><%= configuration('sonar.jdbc.url', '') -%>\r
-  </tr>\r
-  <tr>\r
-    <td>Login: &nbsp;&nbsp;</td>\r
-    <td><%= configuration('sonar.jdbc.username', '') -%>\r
-  </tr>\r
-  <tr>\r
-    <td>Driver: &nbsp;&nbsp;</td>\r
-    <td><%= configuration('sonar.jdbc.driverClassName', '') -%>\r
-  </tr>\r
-</table>\r
-  <br/><br/>\r
-<%= button_to "Try again", { :action => "index" }, :method => :get %>\r
+<h1>Database down.</h1>
+<div class="error">
+  Database connection cannot be established. Check that you have a database running
+  and configured for the following settings :
+  <table>
+  <tr>
+    <td>URL: &nbsp;&nbsp;</td>
+    <td><%= configuration('sonar.jdbc.url', '') -%>
+  </tr>
+  <tr>
+    <td>Login: &nbsp;&nbsp;</td>
+    <td><%= configuration('sonar.jdbc.username', '') -%>
+  </tr>
+  <tr>
+    <td>Driver: &nbsp;&nbsp;</td>
+    <td><%= configuration('sonar.jdbc.driverClassName', '') -%>
+  </tr>
+</table>
+  <br/><br/>
+<%= button_to "Try again", { :action => "index" }, :method => :get %>
  </div>
 \ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml b/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml

index 14c6a282ebc23ac06419c45d683fb7752ed1de7f..af659f50a9c505459922a78191530169dd3ffb4d 100755 (executable)
--- a/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml
+++ b/sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml
@@ -1,139 +1,139 @@
-# Sample localization file for English. Add more files in this directory for other locales.\r
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.\r
-\r
-# Slovak translations for Ruby on Rails (inspired by the Czech localization - thanx to Karel Minařík)\r
-# by Jozef Fulop (jofi-rails@silake.com)\r
- \r
-sk:\r
-    # ActiveSupport\r
-    support:\r
-        array:\r
-            words_connector: ', '\r
-            two_words_connector: ' a '\r
-            last_word_connector: ' a '\r
-                \r
-    # Date\r
-    date:\r
-        formats:\r
-            default: "%d. %m. %Y"\r
-            short: "%d %b"\r
-            long: "%d. %B %Y"\r
-        day_names: [Nedeľa, Pondelok, Utorok, Streda, Štvrtok, Piatok, Sobota]\r
-        abbr_day_names: [Ne, Po, Ut, St, Št, Pi, So]\r
-        month_names: [~, Január, Február, Marec, Apríl, Máj, Jún, Júl, August, September, Október, November, December]\r
-        abbr_month_names: [~, Jan, Feb, Mar, Apr, Máj, Jún, Júl, Aug, Sep, Okt, Nov, Dec]\r
-        order: [:day, :month, :year]\r
-\r
-    # Time\r
-    time:\r
-        formats:\r
-            default: "%a %d. %B %Y %H:%M %z"\r
-            short: "%d. %m. %H:%M"\r
-            long: "%A %d. %B %Y %H:%M"\r
-        am: 'dopoludnia'\r
-        pm: 'popoludní'\r
-\r
-    # Numbers\r
-    number:\r
-        format:\r
-            precision: 3\r
-            separator: '.'\r
-            delimiter: ','\r
-        currency:\r
-            format:\r
-                unit: '€'\r
-                precision: 2\r
-                format: '%n %u'\r
-                separator: ","\r
-                delimiter: " "\r
-        human:\r
-            format:\r
-                precision: 1\r
-                delimiter: ''\r
-            storage_units:\r
-                format: "%n %u"\r
-                units:\r
-                    byte:\r
-                        other: "B"\r
-                        one: "B"\r
-                    kb: "KB"\r
-                    mb: "MB"\r
-                    gb: "GB"\r
-                    tb: "TB"\r
-        percentage:\r
-            format:\r
-                delimiter: ''\r
-        precision:\r
-            format:\r
-                delimiter: ''\r
-    \r
-    # Distance of time ... helper\r
-    datetime:\r
-        prompts:\r
-            second: "Sekunda"\r
-            minute: "Minúta"\r
-            hour: "Hodina"\r
-            day: "Deň"\r
-            month: "Mesiac"\r
-            year: "Rok"\r
-        distance_in_words:    \r
-            half_a_minute: 'pol minutou'\r
-            less_than_x_seconds:\r
-                one: 'asi pred sekundou'\r
-                other: 'asi pred {{count}} sekundami'\r
-            x_seconds:\r
-                one: 'sekundou'\r
-                other: '{{count}} sekundami'\r
-            less_than_x_minutes:\r
-                one: 'pred necelou minútou'\r
-                other: 'pred ani nie {{count}} minútami'\r
-            x_minutes:\r
-                one: 'minútou'\r
-                other: '{{count}} minútami'\r
-            about_x_hours:\r
-                one: 'asi hodinou'\r
-                other: 'asi {{count}} hodinami'\r
-            x_days:\r
-                one: '24 hodinami'\r
-                other: '{{count}} dňami'\r
-            about_x_months:\r
-                one: 'asi mesiacom'\r
-                other: 'asi {{count}} mesiacmi'\r
-            x_months:\r
-                one: 'mesiacom'\r
-                other: '{{count}} mesiacmi'\r
-            about_x_years:\r
-                one: 'asi rokom'\r
-                other: 'asi {{count}} rokmi'\r
-            over_x_years:\r
-                one: 'pred viac ako rokom'\r
-                other: 'viac ako {{count}} rokmi'\r
-\r
-    # ActiveRecord validation messages\r
-    activerecord:                  \r
-        errors:\r
-            messages:\r
-                inclusion: "nie je v zozname povolených hodnôt"\r
-                exclusion: "je vyhradené pre iný účel"\r
-                invalid: "nie je platná hodnota"\r
-                confirmation: "nebolo potvrdené"\r
-                accepted: "musí byť potvrdené"\r
-                empty: "nesmie byť prázdný/é"\r
-                blank: "je povinná položka"\r
-                too_long: "je príliš dlhá/ý (max. {{count}} znakov)"\r
-                too_short: "je príliš krátký/á (min. {{count}} znakov)"\r
-                wrong_length: "nemá správnu dĺžku (očakáva sa {{count}} znakov)"\r
-                taken: "sa už nachádza v databáze"\r
-                not_a_number: "nie je číslo"\r
-                greater_than: "musí byť väčšíe ako {{count}}"\r
-                greater_than_or_equal_to: "musí byť väčšie alebo rovnaké ako {{count}}"\r
-                equal_to: "sa musí rovnať {{count}}"\r
-                less_than: "musí byť menšie ako {{count}}"\r
-                less_than_or_equal_to: "musí byť menšie ako {{count}}"\r
-                odd: "musí byť nepárne číslo"\r
-                even: "musí byť párne číslo"\r
-            template:\r
-                header:\r
-                    one: "Pri ukladaní objektu {{model}} došlo k chybám a nebolo možné objekt uložiť"\r
-                    other: "Pri ukladaní objektu {{model}} došlo ku {{count}} chybe/ám a nebolo možné objekt uložiť"\r
-                body: "Nasledujúce polia obsahujú chybne vyplnené údaje:"\r
+# Sample localization file for English. Add more files in this directory for other locales.
+# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+# Slovak translations for Ruby on Rails (inspired by the Czech localization - thanx to Karel Minařík)
+# by Jozef Fulop (jofi-rails@silake.com)
+ 
+sk:
+    # ActiveSupport
+    support:
+        array:
+            words_connector: ', '
+            two_words_connector: ' a '
+            last_word_connector: ' a '
+                
+    # Date
+    date:
+        formats:
+            default: "%d. %m. %Y"
+            short: "%d %b"
+            long: "%d. %B %Y"
+        day_names: [Nedeľa, Pondelok, Utorok, Streda, Štvrtok, Piatok, Sobota]
+        abbr_day_names: [Ne, Po, Ut, St, Št, Pi, So]
+        month_names: [~, Január, Február, Marec, Apríl, Máj, Jún, Júl, August, September, Október, November, December]
+        abbr_month_names: [~, Jan, Feb, Mar, Apr, Máj, Jún, Júl, Aug, Sep, Okt, Nov, Dec]
+        order: [:day, :month, :year]
+
+    # Time
+    time:
+        formats:
+            default: "%a %d. %B %Y %H:%M %z"
+            short: "%d. %m. %H:%M"
+            long: "%A %d. %B %Y %H:%M"
+        am: 'dopoludnia'
+        pm: 'popoludní'
+
+    # Numbers
+    number:
+        format:
+            precision: 3
+            separator: '.'
+            delimiter: ','
+        currency:
+            format:
+                unit: '€'
+                precision: 2
+                format: '%n %u'
+                separator: ","
+                delimiter: " "
+        human:
+            format:
+                precision: 1
+                delimiter: ''
+            storage_units:
+                format: "%n %u"
+                units:
+                    byte:
+                        other: "B"
+                        one: "B"
+                    kb: "KB"
+                    mb: "MB"
+                    gb: "GB"
+                    tb: "TB"
+        percentage:
+            format:
+                delimiter: ''
+        precision:
+            format:
+                delimiter: ''
+    
+    # Distance of time ... helper
+    datetime:
+        prompts:
+            second: "Sekunda"
+            minute: "Minúta"
+            hour: "Hodina"
+            day: "Deň"
+            month: "Mesiac"
+            year: "Rok"
+        distance_in_words:    
+            half_a_minute: 'pol minutou'
+            less_than_x_seconds:
+                one: 'asi pred sekundou'
+                other: 'asi pred {{count}} sekundami'
+            x_seconds:
+                one: 'sekundou'
+                other: '{{count}} sekundami'
+            less_than_x_minutes:
+                one: 'pred necelou minútou'
+                other: 'pred ani nie {{count}} minútami'
+            x_minutes:
+                one: 'minútou'
+                other: '{{count}} minútami'
+            about_x_hours:
+                one: 'asi hodinou'
+                other: 'asi {{count}} hodinami'
+            x_days:
+                one: '24 hodinami'
+                other: '{{count}} dňami'
+            about_x_months:
+                one: 'asi mesiacom'
+                other: 'asi {{count}} mesiacmi'
+            x_months:
+                one: 'mesiacom'
+                other: '{{count}} mesiacmi'
+            about_x_years:
+                one: 'asi rokom'
+                other: 'asi {{count}} rokmi'
+            over_x_years:
+                one: 'pred viac ako rokom'
+                other: 'viac ako {{count}} rokmi'
+
+    # ActiveRecord validation messages
+    activerecord:                  
+        errors:
+            messages:
+                inclusion: "nie je v zozname povolených hodnôt"
+                exclusion: "je vyhradené pre iný účel"
+                invalid: "nie je platná hodnota"
+                confirmation: "nebolo potvrdené"
+                accepted: "musí byť potvrdené"
+                empty: "nesmie byť prázdný/é"
+                blank: "je povinná položka"
+                too_long: "je príliš dlhá/ý (max. {{count}} znakov)"
+                too_short: "je príliš krátký/á (min. {{count}} znakov)"
+                wrong_length: "nemá správnu dĺžku (očakáva sa {{count}} znakov)"
+                taken: "sa už nachádza v databáze"
+                not_a_number: "nie je číslo"
+                greater_than: "musí byť väčšíe ako {{count}}"
+                greater_than_or_equal_to: "musí byť väčšie alebo rovnaké ako {{count}}"
+                equal_to: "sa musí rovnať {{count}}"
+                less_than: "musí byť menšie ako {{count}}"
+                less_than_or_equal_to: "musí byť menšie ako {{count}}"
+                odd: "musí byť nepárne číslo"
+                even: "musí byť párne číslo"
+            template:
+                header:
+                    one: "Pri ukladaní objektu {{model}} došlo k chybám a nebolo možné objekt uložiť"
+                    other: "Pri ukladaní objektu {{model}} došlo ku {{count}} chybe/ám a nebolo možné objekt uložiť"
+                body: "Nasledujúce polia obsahujú chybne vyplnené údaje:"
diff --git a/sonar-server/src/main/webapp/javascripts/prototip.js b/sonar-server/src/main/webapp/javascripts/prototip.js

index b530fb3d092bac5a2d90fc1897df743cbe15a4e2..d3e73862a3bce9161a9c78c6ea59eca83853e933 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/prototip.js
+++ b/sonar-server/src/main/webapp/javascripts/prototip.js
@@ -1,281 +1,281 @@
-//  Prototip 1.0.2\r
-//  by Nick Stakenburg - http://www.nickstakenburg.com\r
-//  08-08-2007\r
-//\r
-//  More information on this project:\r
-//  http://www.nickstakenburg.com/projects/prototip/\r
-//\r
-//  Licensed under the Creative Commons Attribution 3.0 License\r
-//  http://creativecommons.org/licenses/by/3.0/\r
-//\r
-\r
-var Tips = {\r
-  tips: [],\r
-  zIndex: 1200,\r
-\r
-  add: function(tip) {\r
-    this.tips.push(tip);\r
-  },\r
-\r
-  remove: function(element) {\r
-    var tip = this.tips.find(function(t){ return t.element == $(element); });\r
-    if (!tip) return;\r
-\r
-    this.tips = this.tips.reject(function(t) { return t==tip; });\r
-    tip.deactivate();\r
-    if(tip.tooltip) tip.wrapper.remove();\r
-    if(tip.underlay) tip.underlay.remove();\r
-  }\r
-}\r
-\r
-var Tip = Class.create();\r
-Tip.prototype = {\r
-\r
-  initialize: function(element, content) {\r
-    this.element = $(element);\r
-    Tips.remove(this.element);\r
-\r
-    this.content = content;\r
-\r
-    this.options = Object.extend({\r
-      className: 'tooltip',\r
-      duration: 0.3,                                   // duration of the effect\r
-      effect: false,                                   // false, 'appear' or 'blind'\r
-      hook: false,                                             // { element: {'topLeft|topRight|bottomLeft|bottomRight'}, tip: {'topLeft|topRight|bottomLeft|bottomRight'}\r
-      offset: (arguments[2] && arguments[2].hook) ? {x:0, y:0} : {x:16, y:16},\r
-      fixed: false,                                            // follow the mouse if false\r
-      target: this.element,                            // or another element\r
-      title: false,\r
-      viewport: true                                   // keep within viewport if mouse is followed\r
-    }, arguments[2] || {});\r
-\r
-    this.target = $(this.options.target);\r
-\r
-    if (this.options.hook) {\r
-      this.options.fixed = true;\r
-      this.options.viewport = false;\r
-    }\r
-\r
-       if (this.options.effect) {\r
-      this.queue = { position: 'end', limit: 1, scope: ''}\r
-      var c = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";\r
-      for (var i=0; i<6; i++) {\r
-        var r = Math.floor(Math.random() * c.length);\r
-        this.queue.scope += c.substring(r,r+1);\r
-      }\r
-    }\r
-\r
-    this.buildWrapper();\r
-\r
-    Tips.add(this);\r
-    this.activate();\r
-  },\r
-\r
-  activate: function() {\r
-    this.eventShow = this.showTip.safeBind(this);\r
-    this.eventHide = this.hideTip.safeBind(this);\r
-\r
-    this.element.observe('mousemove', this.eventShow);\r
-    this.element.observe('mouseout', this.eventHide);\r
-  },\r
-\r
-  deactivate: function() {\r
-    this.element.stopObserving('mousemove', this.eventShow);\r
-    this.element.stopObserving('mouseout', this.eventHide);\r
-  },\r
-\r
-  buildWrapper: function() {\r
-  this.wrapper = document.createElement('div');\r
-    Element.setStyle(this.wrapper, {\r
-      position: 'absolute',\r
-      zIndex: Tips.zIndex+1,\r
-      display: 'none'\r
-    });\r
-\r
-    // IE select fix\r
-    if (Prototype.Browser.IE) {\r
-      this.underlay = document.createElement('iframe');\r
-      this.underlay.src = 'javascript:;';\r
-      Element.setStyle(this.underlay, {\r
-        position: 'absolute',\r
-        display: 'none',\r
-        border: 0,\r
-        margin: 0,\r
-        opacity: 0.01,\r
-        padding: 0,\r
-        background: 'none',\r
-        zIndex: Tips.zIndex\r
-      });\r
-    }\r
-  },\r
-\r
-  buildTip: function() {\r
-    if(Prototype.Browser.IE) document.body.appendChild(this.underlay); // IE selectbox fix\r
-\r
-    // add the tooltip\r
-    this.tooltip = this.wrapper.appendChild(document.createElement('div'));\r
-    this.tooltip.className = this.options.className;\r
-    this.tooltip.style.position = 'relative';\r
-\r
-    // add the title\r
-    if (this.options.title) {\r
-      this.title = this.tooltip.appendChild(document.createElement('div'));\r
-      this.title.className = 'title';\r
-      Element.update(this.title, this.options.title);\r
-    }\r
-\r
-    // content\r
-    this.tip = this.tooltip.appendChild(document.createElement('div'));\r
-    this.tip.className = 'content';\r
-    Element.update(this.tip, this.content);\r
-\r
-    // add wrapper to the body\r
-    document.body.appendChild(this.wrapper);\r
-\r
-    // prepare for effects\r
-    var w = this.wrapper.getDimensions();\r
-    this.wrapper.setStyle({ width: w.width+'px', height: w.height+'px' });\r
-    if (Prototype.Browser.IE) this.underlay.setStyle({ width: w.width+'px', height: w.height+'px' });\r
-    Element.hide(this.tooltip);\r
-  },\r
-\r
-  showTip: function(event){\r
-    if (!this.tooltip) this.buildTip();\r
-    this.positionTip(event); // follow mouse\r
-    if (this.wrapper.visible() && this.options.effect != 'appear') return;\r
-\r
-    if (Prototype.Browser.IE) this.underlay.show(); // IE select fix\r
-    this.wrapper.show();\r
-\r
-    if (!this.options.effect) {\r
-      this.tooltip.show(); \r
-    } else {\r
-      // stop running effect\r
-         if (this.activeEffect) Effect.Queues.get(this.queue.scope).remove(this.activeEffect);\r
-      // start new\r
-         this.activeEffect = Effect[Effect.PAIRS[this.options.effect][0]](this.tooltip, { duration: this.options.duration, queue: this.queue});\r
-       }\r
-  },\r
-\r
-  hideTip: function(event){\r
-    if(!this.wrapper.visible()) return;\r
-       \r
-       if (!this.options.effect) {\r
-      if (Prototype.Browser.IE) { this.underlay.hide(); } // select fix\r
-      this.tooltip.hide();\r
-      this.wrapper.hide();\r
-    }\r
-    else {\r
-      // stop running effect\r
-         if (this.activeEffect) Effect.Queues.get(this.queue.scope).remove(this.activeEffect);\r
-      // start new\r
-         this.activeEffect = Effect[Effect.PAIRS[this.options.effect][1]](this.tooltip, { duration: this.options.duration, queue: this.queue, afterFinish: function(){\r
-        if (Prototype.Browser.IE) this.underlay.hide(); // select fix\r
-        this.wrapper.hide();\r
-      }.bind(this)});\r
-    }\r
-  },\r
-\r
-  positionTip: function(event){\r
-    // calculate\r
-    var offset = {'left': this.options.offset.x,'top': this.options.offset.y};\r
-    var targetPosition = Position.cumulativeOffset(this.target);\r
-    var tipd = this.wrapper.getDimensions();\r
-    var pos = {\r
-      'left': (this.options.fixed) ? targetPosition[0] : Event.pointerX(event),\r
-      'top': (this.options.fixed) ? targetPosition[1] : Event.pointerY(event)\r
-    }\r
-\r
-    // add offsets\r
-    pos.left += offset.left;\r
-    pos.top += offset.top;\r
-\r
-    if (this.options.hook) {\r
-      var dims = {'target': this.target.getDimensions(), 'tip': tipd}\r
-      var hooks = {'target': Position.cumulativeOffset(this.target), 'tip': Position.cumulativeOffset(this.target)}\r
-\r
-      for(var z in hooks) {\r
-        switch(this.options.hook[z]){\r
-          case 'topRight':\r
-            hooks[z][0] += dims[z].width;\r
-            break;\r
-          case 'bottomLeft':\r
-            hooks[z][1] += dims[z].height;\r
-            break;\r
-          case 'bottomRight':\r
-            hooks[z][0] += dims[z].width;\r
-            hooks[z][1] += dims[z].height;\r
-            break;\r
-        }\r
-      }\r
-\r
-      // move based on hooks\r
-      pos.left += -1*(hooks.tip[0] - hooks.target[0]);\r
-      pos.top += -1*(hooks.tip[1] - hooks.target[1]);\r
-    }\r
-\r
-    // move tooltip when there is a different target when following mouse\r
-    if (!this.options.fixed && this.element !== this.target) {\r
-      var elementPosition = Position.cumulativeOffset(this.element);\r
-      pos.left += -1*(elementPosition[0] - targetPosition[0]);\r
-      pos.top += -1*(elementPosition[1] - targetPosition[1]);\r
-       }\r
-\r
-    if (!this.options.fixed && this.options.viewport) {\r
-      var scroll = this.getScrollOffsets();\r
-      var viewport = this.viewportSize();\r
-      var pair = {'left': 'width', 'top': 'height'};\r
-\r
-      for(var z in pair) {\r
-        if ((pos[z] + tipd[pair[z]] - scroll[z]) > viewport[pair[z]]) {\r
-          pos[z] = pos[z] - tipd[pair[z]] - 2*offset[z];\r
-               }\r
-      }\r
-    }\r
-\r
-    // position\r
-    this.wrapper.setStyle({\r
-      left: pos.left + 'px',\r
-      top: pos.top + 'px'\r
-    });\r
-\r
-    if (Prototype.Browser.IE) this.underlay.setStyle({ left: pos.left+'px', top: pos.top+'px' });\r
-  },\r
-\r
-  // Functions below hopefully won't be needed with prototype 1.6\r
-  viewportWidth: function(){\r
-    if (Prototype.Browser.Opera) return document.body.clientWidth;\r
-    return document.documentElement.clientWidth;\r
-  },\r
-\r
-  viewportHeight: function(){\r
-    if (Prototype.Browser.Opera) return document.body.clientHeight;\r
-    if (Prototype.Browser.WebKit) return this.innerHeight;\r
-    return document.documentElement.clientHeight;\r
-  },\r
-\r
-  viewportSize : function(){\r
-    return {'height': this.viewportHeight(), 'width': this.viewportWidth()};\r
-  },\r
-\r
-  getScrollLeft: function(){\r
-         return this.pageXOffset || document.documentElement.scrollLeft;\r
-  },\r
-  \r
-  getScrollTop: function(){\r
-    return this.pageYOffset || document.documentElement.scrollTop;\r
-  },\r
-\r
-  getScrollOffsets: function(){\r
-    return {'left': this.getScrollLeft(), 'top': this.getScrollTop()}\r
-  }\r
-}\r
-\r
-/* fix for $A is not defined on Firefox */\r
-Function.prototype.safeBind = function() {\r
-  var __method = this, args = $A(arguments), object = args.shift();\r
-  return function() {\r
-       if (typeof $A == 'function')\r
-    return __method.apply(object, args.concat($A(arguments)));\r
-  }\r
+//  Prototip 1.0.2
+//  by Nick Stakenburg - http://www.nickstakenburg.com
+//  08-08-2007
+//
+//  More information on this project:
+//  http://www.nickstakenburg.com/projects/prototip/
+//
+//  Licensed under the Creative Commons Attribution 3.0 License
+//  http://creativecommons.org/licenses/by/3.0/
+//
+
+var Tips = {
+  tips: [],
+  zIndex: 1200,
+
+  add: function(tip) {
+    this.tips.push(tip);
+  },
+
+  remove: function(element) {
+    var tip = this.tips.find(function(t){ return t.element == $(element); });
+    if (!tip) return;
+
+    this.tips = this.tips.reject(function(t) { return t==tip; });
+    tip.deactivate();
+    if(tip.tooltip) tip.wrapper.remove();
+    if(tip.underlay) tip.underlay.remove();
+  }
+}
+
+var Tip = Class.create();
+Tip.prototype = {
+
+  initialize: function(element, content) {
+    this.element = $(element);
+    Tips.remove(this.element);
+
+    this.content = content;
+
+    this.options = Object.extend({
+      className: 'tooltip',
+      duration: 0.3,                                   // duration of the effect
+      effect: false,                                   // false, 'appear' or 'blind'
+      hook: false,                                             // { element: {'topLeft|topRight|bottomLeft|bottomRight'}, tip: {'topLeft|topRight|bottomLeft|bottomRight'}
+      offset: (arguments[2] && arguments[2].hook) ? {x:0, y:0} : {x:16, y:16},
+      fixed: false,                                            // follow the mouse if false
+      target: this.element,                            // or another element
+      title: false,
+      viewport: true                                   // keep within viewport if mouse is followed
+    }, arguments[2] || {});
+
+    this.target = $(this.options.target);
+
+    if (this.options.hook) {
+      this.options.fixed = true;
+      this.options.viewport = false;
+    }
+
+       if (this.options.effect) {
+      this.queue = { position: 'end', limit: 1, scope: ''}
+      var c = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz";
+      for (var i=0; i<6; i++) {
+        var r = Math.floor(Math.random() * c.length);
+        this.queue.scope += c.substring(r,r+1);
+      }
+    }
+
+    this.buildWrapper();
+
+    Tips.add(this);
+    this.activate();
+  },
+
+  activate: function() {
+    this.eventShow = this.showTip.safeBind(this);
+    this.eventHide = this.hideTip.safeBind(this);
+
+    this.element.observe('mousemove', this.eventShow);
+    this.element.observe('mouseout', this.eventHide);
+  },
+
+  deactivate: function() {
+    this.element.stopObserving('mousemove', this.eventShow);
+    this.element.stopObserving('mouseout', this.eventHide);
+  },
+
+  buildWrapper: function() {
+  this.wrapper = document.createElement('div');
+    Element.setStyle(this.wrapper, {
+      position: 'absolute',
+      zIndex: Tips.zIndex+1,
+      display: 'none'
+    });
+
+    // IE select fix
+    if (Prototype.Browser.IE) {
+      this.underlay = document.createElement('iframe');
+      this.underlay.src = 'javascript:;';
+      Element.setStyle(this.underlay, {
+        position: 'absolute',
+        display: 'none',
+        border: 0,
+        margin: 0,
+        opacity: 0.01,
+        padding: 0,
+        background: 'none',
+        zIndex: Tips.zIndex
+      });
+    }
+  },
+
+  buildTip: function() {
+    if(Prototype.Browser.IE) document.body.appendChild(this.underlay); // IE selectbox fix
+
+    // add the tooltip
+    this.tooltip = this.wrapper.appendChild(document.createElement('div'));
+    this.tooltip.className = this.options.className;
+    this.tooltip.style.position = 'relative';
+
+    // add the title
+    if (this.options.title) {
+      this.title = this.tooltip.appendChild(document.createElement('div'));
+      this.title.className = 'title';
+      Element.update(this.title, this.options.title);
+    }
+
+    // content
+    this.tip = this.tooltip.appendChild(document.createElement('div'));
+    this.tip.className = 'content';
+    Element.update(this.tip, this.content);
+
+    // add wrapper to the body
+    document.body.appendChild(this.wrapper);
+
+    // prepare for effects
+    var w = this.wrapper.getDimensions();
+    this.wrapper.setStyle({ width: w.width+'px', height: w.height+'px' });
+    if (Prototype.Browser.IE) this.underlay.setStyle({ width: w.width+'px', height: w.height+'px' });
+    Element.hide(this.tooltip);
+  },
+
+  showTip: function(event){
+    if (!this.tooltip) this.buildTip();
+    this.positionTip(event); // follow mouse
+    if (this.wrapper.visible() && this.options.effect != 'appear') return;
+
+    if (Prototype.Browser.IE) this.underlay.show(); // IE select fix
+    this.wrapper.show();
+
+    if (!this.options.effect) {
+      this.tooltip.show(); 
+    } else {
+      // stop running effect
+         if (this.activeEffect) Effect.Queues.get(this.queue.scope).remove(this.activeEffect);
+      // start new
+         this.activeEffect = Effect[Effect.PAIRS[this.options.effect][0]](this.tooltip, { duration: this.options.duration, queue: this.queue});
+       }
+  },
+
+  hideTip: function(event){
+    if(!this.wrapper.visible()) return;
+       
+       if (!this.options.effect) {
+      if (Prototype.Browser.IE) { this.underlay.hide(); } // select fix
+      this.tooltip.hide();
+      this.wrapper.hide();
+    }
+    else {
+      // stop running effect
+         if (this.activeEffect) Effect.Queues.get(this.queue.scope).remove(this.activeEffect);
+      // start new
+         this.activeEffect = Effect[Effect.PAIRS[this.options.effect][1]](this.tooltip, { duration: this.options.duration, queue: this.queue, afterFinish: function(){
+        if (Prototype.Browser.IE) this.underlay.hide(); // select fix
+        this.wrapper.hide();
+      }.bind(this)});
+    }
+  },
+
+  positionTip: function(event){
+    // calculate
+    var offset = {'left': this.options.offset.x,'top': this.options.offset.y};
+    var targetPosition = Position.cumulativeOffset(this.target);
+    var tipd = this.wrapper.getDimensions();
+    var pos = {
+      'left': (this.options.fixed) ? targetPosition[0] : Event.pointerX(event),
+      'top': (this.options.fixed) ? targetPosition[1] : Event.pointerY(event)
+    }
+
+    // add offsets
+    pos.left += offset.left;
+    pos.top += offset.top;
+
+    if (this.options.hook) {
+      var dims = {'target': this.target.getDimensions(), 'tip': tipd}
+      var hooks = {'target': Position.cumulativeOffset(this.target), 'tip': Position.cumulativeOffset(this.target)}
+
+      for(var z in hooks) {
+        switch(this.options.hook[z]){
+          case 'topRight':
+            hooks[z][0] += dims[z].width;
+            break;
+          case 'bottomLeft':
+            hooks[z][1] += dims[z].height;
+            break;
+          case 'bottomRight':
+            hooks[z][0] += dims[z].width;
+            hooks[z][1] += dims[z].height;
+            break;
+        }
+      }
+
+      // move based on hooks
+      pos.left += -1*(hooks.tip[0] - hooks.target[0]);
+      pos.top += -1*(hooks.tip[1] - hooks.target[1]);
+    }
+
+    // move tooltip when there is a different target when following mouse
+    if (!this.options.fixed && this.element !== this.target) {
+      var elementPosition = Position.cumulativeOffset(this.element);
+      pos.left += -1*(elementPosition[0] - targetPosition[0]);
+      pos.top += -1*(elementPosition[1] - targetPosition[1]);
+       }
+
+    if (!this.options.fixed && this.options.viewport) {
+      var scroll = this.getScrollOffsets();
+      var viewport = this.viewportSize();
+      var pair = {'left': 'width', 'top': 'height'};
+
+      for(var z in pair) {
+        if ((pos[z] + tipd[pair[z]] - scroll[z]) > viewport[pair[z]]) {
+          pos[z] = pos[z] - tipd[pair[z]] - 2*offset[z];
+               }
+      }
+    }
+
+    // position
+    this.wrapper.setStyle({
+      left: pos.left + 'px',
+      top: pos.top + 'px'
+    });
+
+    if (Prototype.Browser.IE) this.underlay.setStyle({ left: pos.left+'px', top: pos.top+'px' });
+  },
+
+  // Functions below hopefully won't be needed with prototype 1.6
+  viewportWidth: function(){
+    if (Prototype.Browser.Opera) return document.body.clientWidth;
+    return document.documentElement.clientWidth;
+  },
+
+  viewportHeight: function(){
+    if (Prototype.Browser.Opera) return document.body.clientHeight;
+    if (Prototype.Browser.WebKit) return this.innerHeight;
+    return document.documentElement.clientHeight;
+  },
+
+  viewportSize : function(){
+    return {'height': this.viewportHeight(), 'width': this.viewportWidth()};
+  },
+
+  getScrollLeft: function(){
+         return this.pageXOffset || document.documentElement.scrollLeft;
+  },
+  
+  getScrollTop: function(){
+    return this.pageYOffset || document.documentElement.scrollTop;
+  },
+
+  getScrollOffsets: function(){
+    return {'left': this.getScrollLeft(), 'top': this.getScrollTop()}
+  }
+}
+
+/* fix for $A is not defined on Firefox */
+Function.prototype.safeBind = function() {
+  var __method = this, args = $A(arguments), object = args.shift();
+  return function() {
+       if (typeof $A == 'function')
+    return __method.apply(object, args.concat($A(arguments)));
+  }
  }
 \ No newline at end of file
diff --git a/sonar-server/src/main/webapp/javascripts/tablekit.js b/sonar-server/src/main/webapp/javascripts/tablekit.js

index 3bc154d7b4b536d219f263ea0d3c6b2178e14868..ddc5643a2f9020a6846fc660e41d34e6ca7f2c89 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/tablekit.js
+++ b/sonar-server/src/main/webapp/javascripts/tablekit.js
@@ -1,853 +1,853 @@
-/*\r
-*\r
-* Copyright (c) 2007 Andrew Tetlaw & Millstream Web Software\r
-* http://www.millstream.com.au/view/code/tablekit/\r
-* Version: 1.2.1 2007-03-11\r
-*\r
-* Permission is hereby granted, free of charge, to any person\r
-* obtaining a copy of this software and associated documentation\r
-* files (the "Software"), to deal in the Software without\r
-* restriction, including without limitation the rights to use, copy,\r
-* modify, merge, publish, distribute, sublicense, and/or sell copies\r
-* of the Software, and to permit persons to whom the Software is\r
-* furnished to do so, subject to the following conditions:\r
-*\r
-* The above copyright notice and this permission notice shall be\r
-* included in all copies or substantial portions of the Software.\r
-*\r
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\r
-* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\r
-* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND\r
-* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS\r
-* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN\r
-* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\r
-* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\r
-* SOFTWARE.\r
-* *\r
-*/\r
-\r
-// Use the TableKit class constructure if you'd prefer to init your tables as JS objects\r
-var TableKit = Class.create();\r
-\r
-TableKit.prototype = {\r
-       initialize : function(elm, options) {\r
-               var table = $(elm);\r
-               if(table.tagName !== "TABLE") {\r
-                       return;\r
-               }\r
-               TableKit.register(table,Object.extend(TableKit.options,options || {}));\r
-               this.id = table.id;\r
-               var op = TableKit.option('sortable resizable editable', this.id);\r
-               if(op.sortable) {\r
-                       TableKit.Sortable.init(table);\r
-               }\r
-               if(op.resizable) {\r
-                       TableKit.Resizable.init(table);\r
-               }\r
-               if(op.editable) {\r
-                       TableKit.Editable.init(table);\r
-               }\r
-       },\r
-       sort : function(column, order) {\r
-               TableKit.Sortable.sort(this.id, column, order);\r
-       },\r
-       resizeColumn : function(column, w) {\r
-               TableKit.Resizable.resize(this.id, column, w);\r
-       },\r
-       editCell : function(row, column) {\r
-               TableKit.Editable.editCell(this.id, row, column);\r
-       }\r
-};\r
-\r
-Object.extend(TableKit, {\r
-       getBodyRows : function(table) {\r
-               table = $(table);\r
-               var id = table.id;\r
-               if(!TableKit.rows[id]) {\r
-                       TableKit.rows[id] = (table.tHead && table.tHead.rows.length > 0) ? $A(table.tBodies[0].rows) : $A(table.rows).without(table.rows[0]);\r
-               }\r
-               return TableKit.rows[id];\r
-       },\r
-       getHeaderCells : function(table, cell) {\r
-               if(!table) { table = $(cell).up('table'); }\r
-               var id = table.id;\r
-               if(!TableKit.heads[id]) {\r
-                       TableKit.heads[id] = $A((table.tHead && table.tHead.rows.length > 0) ? table.tHead.rows[table.tHead.rows.length-1].cells : table.rows[0].cells);\r
-               }\r
-               return TableKit.heads[id];\r
-       },\r
-       getCellIndex : function(cell) {\r
-               return $A(cell.parentNode.cells).indexOf(cell);\r
-       },\r
-       getRowIndex : function(row) {\r
-               return $A(row.parentNode.rows).indexOf(row);\r
-       },\r
-       getCellText : function(cell, refresh) {\r
-               if(!cell) { return ""; }\r
-               TableKit.registerCell(cell);\r
-               var data = TableKit.cells[cell.id];\r
-               if(refresh || data.refresh || !data.textContent) {\r
-                  // SONAR HACK : add an attribute x like <td x="25"> to directly set the value\r
-                  x = $(cell).readAttribute('x');\r
-                  if (x!=null && x!='') {\r
-                    data.textContent = x;\r
-                  } else {\r
-                    data.textContent = cell.textContent ? cell.textContent : cell.innerText;\r
-                  }\r
-                  data.refresh = false;\r
-               }\r
-               return data.textContent;\r
-       },\r
-       register : function(table, options) {\r
-               if(!table.id) {\r
-                       TableKit._tblcount += 1;\r
-                       table.id = "tablekit-table-" + TableKit._tblcount;\r
-               }\r
-               var id = table.id;\r
-               TableKit.tables[id] = TableKit.tables[id] ? Object.extend(TableKit.tables[id], options || {}) : Object.extend({sortable:false,resizable:false,editable:false}, options || {});\r
-       },\r
-       registerCell : function(cell) {\r
-               if(!cell.id) {\r
-                       TableKit._cellcount += 1;\r
-                       cell.id = "tablekit-cell-" + TableKit._cellcount;\r
-               }\r
-               if(!TableKit.cells[cell.id]) {\r
-                       TableKit.cells[cell.id] = {textContent : '', htmlContent : '', active : false};\r
-               }\r
-       },\r
-       isSortable : function(table) {\r
-               return TableKit.tables[table.id] ? TableKit.tables[table.id].sortable : false;\r
-       },\r
-       isResizable : function(table) {\r
-               return TableKit.tables[table.id] ? TableKit.tables[table.id].resizable : false;\r
-       },\r
-       isEditable : function(table) {\r
-               return TableKit.tables[table.id] ? TableKit.tables[table.id].editable : false;\r
-       },\r
-       setup : function(o) {\r
-               Object.extend(TableKit.options, o || {} );\r
-       },\r
-       option : function(s, id, o1, o2) {\r
-               o1 = o1 || TableKit.options;\r
-               o2 = o2 || (id ? (TableKit.tables[id] ? TableKit.tables[id] : {}) : {});\r
-               var key = id + s;\r
-               if(!TableKit._opcache[key]){\r
-                       TableKit._opcache[key] = $A($w(s)).inject([],function(a,v){\r
-                               a.push(a[v] = o2[v] || o1[v]);\r
-                               return a;\r
-                       });\r
-               }\r
-               return TableKit._opcache[key];\r
-       },\r
-       e : function(event) {\r
-               return event || window.event;\r
-       },\r
-       tables : {},\r
-       _opcache : {},\r
-       cells : {},\r
-       rows : {},\r
-       heads : {},\r
-       options : {\r
-               autoLoad : false,\r
-               stripe : true,\r
-               sortable : true,\r
-               resizable : true,\r
-               editable : true,\r
-               rowEvenClass : 'roweven',\r
-               rowOddClass : 'rowodd',\r
-               sortableSelector : ['table.sortable'],\r
-               columnClass : 'sortcol',\r
-               descendingClass : 'sortdesc',\r
-               ascendingClass : 'sortasc',\r
-               noSortClass : 'nosort',\r
-               sortFirstAscendingClass : 'sortfirstasc',\r
-               sortFirstDecendingClass : 'sortfirstdesc',\r
-               resizableSelector : ['table.resizable'],\r
-               minWidth : 10,\r
-               showHandle : true,\r
-               resizeOnHandleClass : 'resize-handle-active',\r
-               editableSelector : ['table.editable'],\r
-               formClassName : 'editable-cell-form',\r
-               noEditClass : 'noedit',\r
-               editAjaxURI : '/',\r
-               editAjaxOptions : {}\r
-       },\r
-       _tblcount : 0,\r
-       _cellcount : 0,\r
-       load : function() {\r
-               if(TableKit.options.autoLoad) {\r
-                       if(TableKit.options.sortable) {\r
-                               $A(TableKit.options.sortableSelector).each(function(s){\r
-                                       $$(s).each(function(t) {\r
-                                               TableKit.Sortable.init(t);\r
-                                       });\r
-                               });\r
-                       }\r
-                       if(TableKit.options.resizable) {\r
-                               $A(TableKit.options.resizableSelector).each(function(s){\r
-                                       $$(s).each(function(t) {\r
-                                               TableKit.Resizable.init(t);\r
-                                       });\r
-                               });\r
-                       }\r
-                       if(TableKit.options.editable) {\r
-                               $A(TableKit.options.editableSelector).each(function(s){\r
-                                       $$(s).each(function(t) {\r
-                                               TableKit.Editable.init(t);\r
-                                       });\r
-                               });\r
-                       }\r
-               }\r
-       }\r
-});\r
-\r
-TableKit.Rows = {\r
-       stripe : function(table) {\r
-               var rows = TableKit.getBodyRows(table);\r
-               rows.each(function(r,i) {\r
-                       TableKit.Rows.addStripeClass(table,r,i);\r
-               });\r
-       },\r
-       addStripeClass : function(t,r,i) {\r
-               t = t || r.up('table');\r
-               var op = TableKit.option('rowEvenClass rowOddClass', t.id);\r
-               var css = ((i+1)%2 === 0 ? op[0] : op[1]);\r
-               // using prototype's assClassName/RemoveClassName was not efficient for large tables, hence:\r
-               var cn = r.className.split(/\s+/);\r
-               var newCn = [];\r
-               for(var x = 0, l = cn.length; x < l; x += 1) {\r
-                       if(cn[x] !== op[0] && cn[x] !== op[1]) { newCn.push(cn[x]); }\r
-               }\r
-               newCn.push(css);\r
-               r.className = newCn.join(" ");\r
-       }\r
-};\r
-\r
-TableKit.Sortable = {\r
-       init : function(elm, options){\r
-               var table = $(elm);\r
-               if(table.tagName !== "TABLE") {\r
-                       return;\r
-               }\r
-               TableKit.register(table,Object.extend(options || {},{sortable:true}));\r
-               var sortFirst;\r
-               var cells = TableKit.getHeaderCells(table);\r
-               var op = TableKit.option('noSortClass columnClass sortFirstAscendingClass sortFirstDecendingClass', table.id);\r
-               cells.each(function(c){\r
-                       c = $(c);\r
-                       if(!c.hasClassName(op.noSortClass)) {\r
-                               Event.observe(c, 'mousedown', TableKit.Sortable._sort);\r
-                               c.addClassName(op.columnClass);\r
-                               if(c.hasClassName(op.sortFirstAscendingClass) || c.hasClassName(op.sortFirstDecendingClass)) {\r
-                                       sortFirst = c;\r
-                               }\r
-                       }\r
-               });\r
-\r
-               if(sortFirst) {\r
-                       if(sortFirst.hasClassName(op.sortFirstAscendingClass)) {\r
-                               TableKit.Sortable.sort(table, sortFirst, 1);\r
-                       } else {\r
-                               TableKit.Sortable.sort(table, sortFirst, -1);\r
-                       }\r
-               } else { // just add row stripe classes\r
-                       TableKit.Rows.stripe(table);\r
-               }\r
-       },\r
-       reload : function(table) {\r
-               table = $(table);\r
-               var cells = TableKit.getHeaderCells(table);\r
-               var op = TableKit.option('noSortClass columnClass', table.id);\r
-               cells.each(function(c){\r
-                       c = $(c);\r
-                       if(!c.hasClassName(op.noSortClass)) {\r
-                               Event.stopObserving(c, 'mousedown', TableKit.Sortable._sort);\r
-                               c.removeClassName(op.columnClass);\r
-                       }\r
-               });\r
-               TableKit.Sortable.init(table);\r
-       },\r
-       _sort : function(e) {\r
-               if(TableKit.Resizable._onHandle) {return;}\r
-               e = TableKit.e(e);\r
-               Event.stop(e);\r
-               var cell = Event.element(e);\r
-               while(!(cell.tagName && cell.tagName.match(/td|th/gi))) {\r
-                       cell = cell.parentNode;\r
-               }\r
-               TableKit.Sortable.sort(null, cell);\r
-       },\r
-       sort : function(table, index, order) {\r
-               var cell;\r
-               if(typeof index === 'number') {\r
-                       if(!table || (table.tagName && table.tagName !== "TABLE")) {\r
-                               return;\r
-                       }\r
-                       table = $(table);\r
-                       index = Math.min(table.rows[0].cells.length, index);\r
-                       index = Math.max(1, index);\r
-                       index -= 1;\r
-                       cell = (table.tHead && table.tHead.rows.length > 0) ? $(table.tHead.rows[table.tHead.rows.length-1].cells[index]) : $(table.rows[0].cells[index]);\r
-               } else {\r
-                       cell = $(index);\r
-                       table = table ? $(table) : cell.up('table');\r
-                       index = TableKit.getCellIndex(cell);\r
-               }\r
-               var op = TableKit.option('noSortClass descendingClass ascendingClass', table.id);\r
-\r
-               if(cell.hasClassName(op.noSortClass)) {return;}\r
-\r
-               order = order ? order : (cell.hasClassName(op.descendingClass) ? 1 : -1);\r
-               var rows = TableKit.getBodyRows(table);\r
-\r
-               if(cell.hasClassName(op.ascendingClass) || cell.hasClassName(op.descendingClass)) {\r
-                       rows.reverse(); // if it was already sorted we just need to reverse it.\r
-               } else {\r
-                       var datatype = TableKit.Sortable.getDataType(cell,index,table);\r
-                       var tkst = TableKit.Sortable.types;\r
-                       rows.sort(function(a,b) {\r
-                               return order * tkst[datatype].compare(TableKit.getCellText(a.cells[index]),TableKit.getCellText(b.cells[index]));\r
-                       });\r
-               }\r
-               var tb = table.tBodies[0];\r
-               var tkr = TableKit.Rows;\r
-               rows.each(function(r,i) {\r
-                       tb.appendChild(r);\r
-                       //tkr.addStripeClass(table,r,i);\r
-               });\r
-               TableKit.Rows.stripe(table);\r
-               var hcells = TableKit.getHeaderCells(null, cell);\r
-               $A(hcells).each(function(c,i){\r
-                       c = $(c);\r
-                       c.removeClassName(op.ascendingClass);\r
-                       c.removeClassName(op.descendingClass);\r
-                       if(index === i) {\r
-                               if(order === 1) {\r
-                                       c.removeClassName(op.descendingClass);\r
-                                       c.addClassName(op.ascendingClass);\r
-                               } else {\r
-                                       c.removeClassName(op.ascendingClass);\r
-                                       c.addClassName(op.descendingClass);\r
-                               }\r
-                       }\r
-               });\r
-       },\r
-       types : {},\r
-       detectors : [],\r
-       addSortType : function() {\r
-               $A(arguments).each(function(o){\r
-                       TableKit.Sortable.types[o.name] = o;\r
-               });\r
-       },\r
-       getDataType : function(cell,index,table) {\r
-               cell = $(cell);\r
-               index = (index || index === 0) ? index : TableKit.getCellIndex(cell);\r
-\r
-               var colcache = TableKit.Sortable._coltypecache;\r
-               var cache = colcache[table.id] ? colcache[table.id] : (colcache[table.id] = {});\r
-\r
-               if(!cache[index]) {\r
-                       var t = '';\r
-                       // first look for a data type id on the heading row cell\r
-                       if(cell.id && TableKit.Sortable.types[cell.id]) {\r
-                               t = cell.id;\r
-                       }\r
-                       t = cell.classNames().detect(function(n){ // then look for a data type classname on the heading row cell\r
-                               return (TableKit.Sortable.types[n]) ? true : false;\r
-                       });\r
-                       if(!t) {\r
-                               var rows = TableKit.getBodyRows(table);\r
-                               cell = rows[0].cells[index]; // grab same index cell from body row to try and match data type\r
-                               t = TableKit.Sortable.detectors.detect(\r
-                                               function(d){\r
-                                                       return TableKit.Sortable.types[d].detect(TableKit.getCellText(cell));\r
-                                               });\r
-                       }\r
-                       cache[index] = t;\r
-               }\r
-               return cache[index];\r
-       },\r
-       _coltypecache : {}\r
-};\r
-\r
-TableKit.Sortable.detectors = $A($w('date-iso date date-eu date-au time currency datasize number casesensitivetext text')); // setting it here because Safari complained when I did it above...\r
-\r
-TableKit.Sortable.Type = Class.create();\r
-TableKit.Sortable.Type.prototype = {\r
-       initialize : function(name, options){\r
-               this.name = name;\r
-               options = Object.extend({\r
-                       normal : function(v){\r
-                               return v;\r
-                       },\r
-                       pattern : /.*/\r
-               }, options || {});\r
-               this.normal = options.normal;\r
-               this.pattern = options.pattern;\r
-               if(options.compare) {\r
-                       this.compare = options.compare;\r
-               }\r
-               if(options.detect) {\r
-                       this.detect = options.detect;\r
-               }\r
-       },\r
-       compare : function(a,b){\r
-               return TableKit.Sortable.Type.compare(this.normal(a), this.normal(b));\r
-       },\r
-       detect : function(v){\r
-               return this.pattern.test(v);\r
-       }\r
-};\r
-\r
-TableKit.Sortable.Type.compare = function(a,b) {\r
-       return a < b ? -1 : a === b ? 0 : 1;\r
-};\r
-\r
-TableKit.Sortable.addSortType(\r
-       new TableKit.Sortable.Type('number', {\r
-               pattern : /^[-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?/,\r
-               normal : function(v) {\r
-                       // This will grab the first thing that looks like a number from a string, so you can use it to order a column of various srings containing numbers.\r
-                       v = parseFloat(v.replace(/^.*?([-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?).*$/,"$1"));\r
-                       return isNaN(v) ? 0 : v;\r
-               }}),\r
-       new TableKit.Sortable.Type('text',{\r
-               normal : function(v) {\r
-                       return v ? v.toLowerCase() : '';\r
-               }}),\r
-       new TableKit.Sortable.Type('casesensitivetext',{pattern : /^[A-Z]+$/}),\r
-       new TableKit.Sortable.Type('datasize',{\r
-               pattern : /^[-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?\s?[k|m|g|t]b$/i,\r
-               normal : function(v) {\r
-                       var r = v.match(/^([-+]?[\d]*\.?[\d]+([eE][-+]?[\d]+)?)\s?([k|m|g|t]?b)?/i);\r
-                       var b = r[1] ? Number(r[1]).valueOf() : 0;\r
-                       var m = r[3] ? r[3].substr(0,1).toLowerCase() : '';\r
-                       var result = b;\r
-                       switch(m) {\r
-                               case  'k':\r
-                                       result = b * 1024;\r
-                                       break;\r
-                               case  'm':\r
-                                       result = b * 1024 * 1024;\r
-                                       break;\r
-                               case  'g':\r
-                                       result = b * 1024 * 1024 * 1024;\r
-                                       break;\r
-                               case  't':\r
-                                       result = b * 1024 * 1024 * 1024 * 1024;\r
-                                       break;\r
-                       }\r
-                       return result;\r
-               }}),\r
-       new TableKit.Sortable.Type('date-au',{\r
-               pattern : /^\d{2}\/\d{2}\/\d{4}\s?(?:\d{1,2}\:\d{2}(?:\:\d{2})?\s?[a|p]?m?)?/i,\r
-               normal : function(v) {\r
-                       if(!this.pattern.test(v)) {return 0;}\r
-                       var r = v.match(/^(\d{2})\/(\d{2})\/(\d{4})\s?(?:(\d{1,2})\:(\d{2})(?:\:(\d{2}))?\s?([a|p]?m?))?/i);\r
-                       var yr_num = r[3];\r
-                       var mo_num = parseInt(r[2],10)-1;\r
-                       var day_num = r[1];\r
-                       var hr_num = r[4] ? r[4] : 0;\r
-                       if(r[7] && r[7].toLowerCase().indexOf('p') !== -1) {\r
-                               hr_num = parseInt(r[4],10) + 12;\r
-                       }\r
-                       var min_num = r[5] ? r[5] : 0;\r
-                       var sec_num = r[6] ? r[6] : 0;\r
-                       return new Date(yr_num, mo_num, day_num, hr_num, min_num, sec_num, 0).valueOf();\r
-               }}),\r
-       new TableKit.Sortable.Type('date-us',{\r
-               pattern : /^\d{2}\/\d{2}\/\d{4}\s?(?:\d{1,2}\:\d{2}(?:\:\d{2})?\s?[a|p]?m?)?/i,\r
-               normal : function(v) {\r
-                       if(!this.pattern.test(v)) {return 0;}\r
-                       var r = v.match(/^(\d{2})\/(\d{2})\/(\d{4})\s?(?:(\d{1,2})\:(\d{2})(?:\:(\d{2}))?\s?([a|p]?m?))?/i);\r
-                       var yr_num = r[3];\r
-                       var mo_num = parseInt(r[1],10)-1;\r
-                       var day_num = r[2];\r
-                       var hr_num = r[4] ? r[4] : 0;\r
-                       if(r[7] && r[7].toLowerCase().indexOf('p') !== -1) {\r
-                               hr_num = parseInt(r[4],10) + 12;\r
-                       }\r
-                       var min_num = r[5] ? r[5] : 0;\r
-                       var sec_num = r[6] ? r[6] : 0;\r
-                       return new Date(yr_num, mo_num, day_num, hr_num, min_num, sec_num, 0).valueOf();\r
-               }}),\r
-       new TableKit.Sortable.Type('date-eu',{\r
-               pattern : /^\d{2}-\d{2}-\d{4}/i,\r
-               normal : function(v) {\r
-                       if(!this.pattern.test(v)) {return 0;}\r
-                       var r = v.match(/^(\d{2})-(\d{2})-(\d{4})/);\r
-                       var yr_num = r[3];\r
-                       var mo_num = parseInt(r[2],10)-1;\r
-                       var day_num = r[1];\r
-                       return new Date(yr_num, mo_num, day_num).valueOf();\r
-               }}),\r
-       new TableKit.Sortable.Type('date-iso',{\r
-               pattern : /[\d]{4}-[\d]{2}-[\d]{2}(?:T[\d]{2}\:[\d]{2}(?:\:[\d]{2}(?:\.[\d]+)?)?(Z|([-+][\d]{2}:[\d]{2})?)?)?/, // 2005-03-26T19:51:34Z\r
-               normal : function(v) {\r
-                       if(!this.pattern.test(v)) {return 0;}\r
-                   var d = v.match(/([\d]{4})(-([\d]{2})(-([\d]{2})(T([\d]{2}):([\d]{2})(:([\d]{2})(\.([\d]+))?)?(Z|(([-+])([\d]{2}):([\d]{2})))?)?)?)?/);\r
-                   var offset = 0;\r
-                   var date = new Date(d[1], 0, 1);\r
-                   if (d[3]) { date.setMonth(d[3] - 1) ;}\r
-                   if (d[5]) { date.setDate(d[5]); }\r
-                   if (d[7]) { date.setHours(d[7]); }\r
-                   if (d[8]) { date.setMinutes(d[8]); }\r
-                   if (d[10]) { date.setSeconds(d[10]); }\r
-                   if (d[12]) { date.setMilliseconds(Number("0." + d[12]) * 1000); }\r
-                   if (d[14]) {\r
-                       offset = (Number(d[16]) * 60) + Number(d[17]);\r
-                       offset *= ((d[15] === '-') ? 1 : -1);\r
-                   }\r
-                   offset -= date.getTimezoneOffset();\r
-                   if(offset !== 0) {\r
-                       var time = (Number(date) + (offset * 60 * 1000));\r
-                       date.setTime(Number(time));\r
-                   }\r
-                       return date.valueOf();\r
-               }}),\r
-       new TableKit.Sortable.Type('date',{\r
-               pattern: /^(?:sun|mon|tue|wed|thu|fri|sat)\,\s\d{1,2}\s(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\s\d{4}(?:\s\d{2}\:\d{2}(?:\:\d{2})?(?:\sGMT(?:[+-]\d{4})?)?)?/i, //Mon, 18 Dec 1995 17:28:35 GMT\r
-               compare : function(a,b) { // must be standard javascript date format\r
-                       if(a && b) {\r
-                               return TableKit.Sortable.Type.compare(new Date(a),new Date(b));\r
-                       } else {\r
-                               return TableKit.Sortable.Type.compare(a ? 1 : 0, b ? 1 : 0);\r
-                       }\r
-               }}),\r
-       new TableKit.Sortable.Type('time',{\r
-               pattern : /^\d{1,2}\:\d{2}(?:\:\d{2})?(?:\s[a|p]m)?$/i,\r
-               compare : function(a,b) {\r
-                       var d = new Date();\r
-                       var ds = d.getMonth() + "/" + d.getDate() + "/" + d.getFullYear() + " ";\r
-                       return TableKit.Sortable.Type.compare(new Date(ds + a),new Date(ds + b));\r
-               }}),\r
-       new TableKit.Sortable.Type('currency',{\r
-               pattern : /^[$£¥\80¤]/, // dollar,pound,yen,euro,generic currency symbol\r
-               normal : function(v) {\r
-                       return v ? parseFloat(v.replace(/[^-\d\.]/g,'')) : 0;\r
-               }})\r
-);\r
-\r
-TableKit.Resizable = {\r
-       init : function(elm, options){\r
-               var table = $(elm);\r
-               if(table.tagName !== "TABLE") {return;}\r
-               TableKit.register(table,Object.extend(options || {},{resizable:true}));\r
-               var cells = TableKit.getHeaderCells(table);\r
-               cells.each(function(c){\r
-                       c = $(c);\r
-                       Event.observe(c, 'mouseover', TableKit.Resizable.initDetect);\r
-                       Event.observe(c, 'mouseout', TableKit.Resizable.killDetect);\r
-               });\r
-       },\r
-       resize : function(table, index, w) {\r
-               var cell;\r
-               if(typeof index === 'number') {\r
-                       if(!table || (table.tagName && table.tagName !== "TABLE")) {return;}\r
-                       table = $(table);\r
-                       index = Math.min(table.rows[0].cells.length, index);\r
-                       index = Math.max(1, index);\r
-                       index -= 1;\r
-                       cell = (table.tHead && table.tHead.rows.length > 0) ? $(table.tHead.rows[table.tHead.rows.length-1].cells[index]) : $(table.rows[0].cells[index]);\r
-               } else {\r
-                       cell = $(index);\r
-                       table = table ? $(table) : cell.up('table');\r
-                       index = TableKit.getCellIndex(cell);\r
-               }\r
-               var pad = parseInt(cell.getStyle('paddingLeft'),10) + parseInt(cell.getStyle('paddingRight'),10);\r
-               w = Math.max(w-pad, TableKit.option('minWidth', table.id)[0]);\r
-\r
-               cell.setStyle({'width' : w + 'px'});\r
-       },\r
-       initDetect : function(e) {\r
-               e = TableKit.e(e);\r
-               var cell = Event.element(e);\r
-               Event.observe(cell, 'mousemove', TableKit.Resizable.detectHandle);\r
-               Event.observe(cell, 'mousedown', TableKit.Resizable.startResize);\r
-       },\r
-       detectHandle : function(e) {\r
-               e = TableKit.e(e);\r
-               var cell = Event.element(e);\r
-               if(TableKit.Resizable.pointerPos(cell,Event.pointerX(e),Event.pointerY(e))){\r
-                       cell.addClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);\r
-                       TableKit.Resizable._onHandle = true;\r
-               } else {\r
-                       cell.removeClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);\r
-                       TableKit.Resizable._onHandle = false;\r
-               }\r
-       },\r
-       killDetect : function(e) {\r
-               e = TableKit.e(e);\r
-               TableKit.Resizable._onHandle = false;\r
-               var cell = Event.element(e);\r
-               Event.stopObserving(cell, 'mousemove', TableKit.Resizable.detectHandle);\r
-               Event.stopObserving(cell, 'mousedown', TableKit.Resizable.startResize);\r
-               cell.removeClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);\r
-       },\r
-       startResize : function(e) {\r
-               e = TableKit.e(e);\r
-               if(!TableKit.Resizable._onHandle) {return;}\r
-               var cell = Event.element(e);\r
-               Event.stopObserving(cell, 'mousemove', TableKit.Resizable.detectHandle);\r
-               Event.stopObserving(cell, 'mousedown', TableKit.Resizable.startResize);\r
-               Event.stopObserving(cell, 'mouseout', TableKit.Resizable.killDetect);\r
-               TableKit.Resizable._cell = cell;\r
-               var table = cell.up('table');\r
-               TableKit.Resizable._tbl = table;\r
-               if(TableKit.option('showHandle', table.id)[0]) {\r
-                       TableKit.Resizable._handle = $(document.createElement('div')).addClassName('resize-handle').setStyle({\r
-                               'top' : Position.cumulativeOffset(cell)[1] + 'px',\r
-                               'left' : Event.pointerX(e) + 'px',\r
-                               'height' : table.getDimensions().height + 'px'\r
-                       });\r
-                       document.body.appendChild(TableKit.Resizable._handle);\r
-               }\r
-               Event.observe(document, 'mousemove', TableKit.Resizable.drag);\r
-               Event.observe(document, 'mouseup', TableKit.Resizable.endResize);\r
-               Event.stop(e);\r
-       },\r
-       endResize : function(e) {\r
-               e = TableKit.e(e);\r
-               var cell = TableKit.Resizable._cell;\r
-               TableKit.Resizable.resize(null, cell, (Event.pointerX(e) - Position.cumulativeOffset(cell)[0]));\r
-               Event.stopObserving(document, 'mousemove', TableKit.Resizable.drag);\r
-               Event.stopObserving(document, 'mouseup', TableKit.Resizable.endResize);\r
-               if(TableKit.option('showHandle', TableKit.Resizable._tbl.id)[0]) {\r
-                       $$('div.resize-handle').each(function(elm){\r
-                               document.body.removeChild(elm);\r
-                       });\r
-               }\r
-               Event.observe(cell, 'mouseout', TableKit.Resizable.killDetect);\r
-               TableKit.Resizable._tbl = TableKit.Resizable._handle = TableKit.Resizable._cell = null;\r
-               Event.stop(e);\r
-       },\r
-       drag : function(e) {\r
-               e = TableKit.e(e);\r
-               if(TableKit.Resizable._handle === null) {\r
-                       try {\r
-                               TableKit.Resizable.resize(TableKit.Resizable._tbl, TableKit.Resizable._cell, (Event.pointerX(e) - Position.cumulativeOffset(TableKit.Resizable._cell)[0]));\r
-                       } catch(e) {}\r
-               } else {\r
-                       TableKit.Resizable._handle.setStyle({'left' : Event.pointerX(e) + 'px'});\r
-               }\r
-               return false;\r
-       },\r
-       pointerPos : function(element, x, y) {\r
-       var offset = Position.cumulativeOffset(element);\r
-           return (y >= offset[1] &&\r
-                   y <  offset[1] + element.offsetHeight &&\r
-                   x >= offset[0] + element.offsetWidth - 5 &&\r
-                   x <  offset[0] + element.offsetWidth);\r
-       },\r
-       _onHandle : false,\r
-       _cell : null,\r
-       _tbl : null,\r
-       _handle : null\r
-};\r
-\r
-\r
-TableKit.Editable = {\r
-       init : function(elm, options){\r
-               var table = $(elm);\r
-               if(table.tagName !== "TABLE") {return;}\r
-               TableKit.register(table,Object.extend(options || {},{editable:true}));\r
-               Event.observe(table.tBodies[0], 'click', TableKit.Editable._editCell);\r
-       },\r
-       _editCell : function(e) {\r
-               e = TableKit.e(e);\r
-               var cell = Event.findElement(e,'td');\r
-               TableKit.Editable.editCell(null, cell);\r
-       },\r
-       editCell : function(table, index, cindex) {\r
-               var cell, row;\r
-               if(typeof index === 'number') {\r
-                       if(!table || (table.tagName && table.tagName !== "TABLE")) {return;}\r
-                       table = $(table);\r
-                       index = Math.min(table.tBodies[0].rows.length, index);\r
-                       index = Math.max(1, index);\r
-                       index -= 1;\r
-                       cindex = Math.min(table.rows[0].cells.length, cindex);\r
-                       cindex = Math.max(1, cindex);\r
-                       cindex -= 1;\r
-                       row = $(table.tBodies[0].rows[index]);\r
-                       cell = $(row.cells[cindex]);\r
-               } else {\r
-                       cell = $(index);\r
-                       table = (table && table.tagName && table.tagName !== "TABLE") ? $(table) : cell.up('table');\r
-                       row = cell.up('tr');\r
-               }\r
-               var op = TableKit.option('noEditClass', table.id);\r
-               if(cell.hasClassName(op.noEditClass)) {return;}\r
-\r
-               var head = $(TableKit.getHeaderCells(table, cell)[TableKit.getCellIndex(cell)]);\r
-               if(head.hasClassName(op.noEditClass)) {return;}\r
-\r
-               TableKit.registerCell(cell);\r
-               var data = TableKit.cells[cell.id];\r
-               if(data.active) {return;}\r
-               data.htmlContent = cell.innerHTML;\r
-               var ftype = TableKit.Editable.types['text-input'];\r
-               if(head.id && TableKit.Editable.types[head.id]) {\r
-                       ftype = TableKit.Editable.types[head.id];\r
-               } else {\r
-                       var n = head.classNames().detect(function(n){\r
-                                       return (TableKit.Editable.types[n]) ? true : false;\r
-                       });\r
-                       ftype = n ? TableKit.Editable.types[n] : ftype;\r
-               }\r
-               ftype.edit(cell);\r
-               data.active = true;\r
-       },\r
-       types : {},\r
-       addCellEditor : function(o) {\r
-               if(o && o.name) { TableKit.Editable.types[o.name] = o; }\r
-       }\r
-};\r
-\r
-TableKit.Editable.CellEditor = Class.create();\r
-TableKit.Editable.CellEditor.prototype = {\r
-       initialize : function(name, options){\r
-               this.name = name;\r
-               this.options = Object.extend({\r
-                       element : 'input',\r
-                       attributes : {name : 'value', type : 'text'},\r
-                       selectOptions : [],\r
-                       showSubmit : true,\r
-                       submitText : 'OK',\r
-                       showCancel : true,\r
-                       cancelText : 'Cancel',\r
-                       ajaxURI : null,\r
-                       ajaxOptions : null\r
-               }, options || {});\r
-       },\r
-       edit : function(cell) {\r
-               cell = $(cell);\r
-               var op = this.options;\r
-               var table = cell.up('table');\r
-\r
-               var form = $(document.createElement("form"));\r
-               form.id = cell.id + '-form';\r
-               form.addClassName(TableKit.option('formClassName', table.id)[0]);\r
-               form.onsubmit = this._submit.bindAsEventListener(this);\r
-\r
-               var field = document.createElement(op.element);\r
-                       $H(op.attributes).each(function(v){\r
-                               field[v.key] = v.value;\r
-                       });\r
-                       switch(op.element) {\r
-                               case 'input':\r
-                               case 'textarea':\r
-                               field.value = TableKit.getCellText(cell);\r
-                               break;\r
-\r
-                               case 'select':\r
-                               var txt = TableKit.getCellText(cell);\r
-                               $A(op.selectOptions).each(function(v){\r
-                                       field.options[field.options.length] = new Option(v[0], v[1]);\r
-                                       if(txt === v[1]) {\r
-                                               field.options[field.options.length-1].selected = 'selected';\r
-                                       }\r
-                               });\r
-                               break;\r
-                       }\r
-                       form.appendChild(field);\r
-                       if(op.element === 'textarea') {\r
-                               form.appendChild(document.createElement("br"));\r
-                       }\r
-                       if(op.showSubmit) {\r
-                               var okButton = document.createElement("input");\r
-                               okButton.type = "submit";\r
-                               okButton.value = op.submitText;\r
-                               okButton.className = 'editor_ok_button';\r
-                               form.appendChild(okButton);\r
-                       }\r
-                       if(op.showCancel) {\r
-                               var cancelLink = document.createElement("a");\r
-                               cancelLink.href = "#";\r
-                               cancelLink.appendChild(document.createTextNode(op.cancelText));\r
-                               cancelLink.onclick = this._cancel.bindAsEventListener(this);\r
-                               cancelLink.className = 'editor_cancel';\r
-                               form.appendChild(cancelLink);\r
-                       }\r
-                       cell.innerHTML = '';\r
-                       cell.appendChild(form);\r
-       },\r
-       _submit : function(e) {\r
-               var cell = Event.findElement(e,'td');\r
-               var form = Event.findElement(e,'form');\r
-               Event.stop(e);\r
-               this.submit(cell,form);\r
-       },\r
-       submit : function(cell, form) {\r
-               var op = this.options;\r
-               form = form ? form : cell.down('form');\r
-               var head = $(TableKit.getHeaderCells(null, cell)[TableKit.getCellIndex(cell)]);\r
-               var row = cell.up('tr');\r
-               var table = cell.up('table');\r
-               var s = '&row=' + (TableKit.getRowIndex(row)+1) + '&cell=' + (TableKit.getCellIndex(cell)+1) + '&id=' + row.id + '&field=' + head.id + '&' + Form.serialize(form);\r
-               this.ajax = new Ajax.Updater(cell, op.ajaxURI || TableKit.option('editAjaxURI', table.id)[0], Object.extend(op.ajaxOptions || TableKit.option('editAjaxOptions', table.id)[0], {\r
-                       postBody : s,\r
-                       onComplete : function() {\r
-                               var data = TableKit.cells[cell.id];\r
-                               data.active = false;\r
-                               data.refresh = true; // mark cell cache for refreshing, in case cell contents has changed and sorting is applied\r
-                       }\r
-               }));\r
-       },\r
-       _cancel : function(e) {\r
-               var cell = Event.findElement(e,'td');\r
-               Event.stop(e);\r
-               this.cancel(cell);\r
-       },\r
-       cancel : function(cell) {\r
-               this.ajax = null;\r
-               var data = TableKit.cells[cell.id];\r
-               cell.innerHTML = data.htmlContent;\r
-               data.htmlContent = '';\r
-               data.active = false;\r
-       },\r
-       ajax : null\r
-};\r
-\r
-TableKit.Editable.textInput = function(n,attributes) {\r
-       TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {\r
-               element : 'input',\r
-               attributes : Object.extend({name : 'value', type : 'text'}, attributes||{})\r
-       }));\r
-};\r
-TableKit.Editable.textInput('text-input');\r
-\r
-TableKit.Editable.multiLineInput = function(n,attributes) {\r
-       TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {\r
-               element : 'textarea',\r
-               attributes : Object.extend({name : 'value', rows : '5', cols : '20'}, attributes||{})\r
-       }));\r
-};\r
-TableKit.Editable.multiLineInput('multi-line-input');\r
-\r
-TableKit.Editable.selectInput = function(n,attributes,selectOptions) {\r
-       TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {\r
-               element : 'select',\r
-               attributes : Object.extend({name : 'value'}, attributes||{}),\r
-               'selectOptions' : selectOptions\r
-       }));\r
-};\r
-\r
-/*\r
-TableKit.Bench = {\r
-       bench : [],\r
-       start : function(){\r
-               TableKit.Bench.bench[0] = new Date().getTime();\r
-       },\r
-       end : function(s){\r
-               TableKit.Bench.bench[1] = new Date().getTime();\r
-               alert(s + ' ' + ((TableKit.Bench.bench[1]-TableKit.Bench.bench[0])/1000)+' seconds.') //console.log(s + ' ' + ((TableKit.Bench.bench[1]-TableKit.Bench.bench[0])/1000)+' seconds.')\r
-               TableKit.Bench.bench = [];\r
-       }\r
-} */\r
-\r
-if(window.FastInit) {\r
-       FastInit.addOnLoad(TableKit.load);\r
-} else {\r
-       Event.observe(window, 'load', TableKit.load);\r
+/*
+*
+* Copyright (c) 2007 Andrew Tetlaw & Millstream Web Software
+* http://www.millstream.com.au/view/code/tablekit/
+* Version: 1.2.1 2007-03-11
+*
+* Permission is hereby granted, free of charge, to any person
+* obtaining a copy of this software and associated documentation
+* files (the "Software"), to deal in the Software without
+* restriction, including without limitation the rights to use, copy,
+* modify, merge, publish, distribute, sublicense, and/or sell copies
+* of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be
+* included in all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+* SOFTWARE.
+* *
+*/
+
+// Use the TableKit class constructure if you'd prefer to init your tables as JS objects
+var TableKit = Class.create();
+
+TableKit.prototype = {
+       initialize : function(elm, options) {
+               var table = $(elm);
+               if(table.tagName !== "TABLE") {
+                       return;
+               }
+               TableKit.register(table,Object.extend(TableKit.options,options || {}));
+               this.id = table.id;
+               var op = TableKit.option('sortable resizable editable', this.id);
+               if(op.sortable) {
+                       TableKit.Sortable.init(table);
+               }
+               if(op.resizable) {
+                       TableKit.Resizable.init(table);
+               }
+               if(op.editable) {
+                       TableKit.Editable.init(table);
+               }
+       },
+       sort : function(column, order) {
+               TableKit.Sortable.sort(this.id, column, order);
+       },
+       resizeColumn : function(column, w) {
+               TableKit.Resizable.resize(this.id, column, w);
+       },
+       editCell : function(row, column) {
+               TableKit.Editable.editCell(this.id, row, column);
+       }
+};
+
+Object.extend(TableKit, {
+       getBodyRows : function(table) {
+               table = $(table);
+               var id = table.id;
+               if(!TableKit.rows[id]) {
+                       TableKit.rows[id] = (table.tHead && table.tHead.rows.length > 0) ? $A(table.tBodies[0].rows) : $A(table.rows).without(table.rows[0]);
+               }
+               return TableKit.rows[id];
+       },
+       getHeaderCells : function(table, cell) {
+               if(!table) { table = $(cell).up('table'); }
+               var id = table.id;
+               if(!TableKit.heads[id]) {
+                       TableKit.heads[id] = $A((table.tHead && table.tHead.rows.length > 0) ? table.tHead.rows[table.tHead.rows.length-1].cells : table.rows[0].cells);
+               }
+               return TableKit.heads[id];
+       },
+       getCellIndex : function(cell) {
+               return $A(cell.parentNode.cells).indexOf(cell);
+       },
+       getRowIndex : function(row) {
+               return $A(row.parentNode.rows).indexOf(row);
+       },
+       getCellText : function(cell, refresh) {
+               if(!cell) { return ""; }
+               TableKit.registerCell(cell);
+               var data = TableKit.cells[cell.id];
+               if(refresh || data.refresh || !data.textContent) {
+                  // SONAR HACK : add an attribute x like <td x="25"> to directly set the value
+                  x = $(cell).readAttribute('x');
+                  if (x!=null && x!='') {
+                    data.textContent = x;
+                  } else {
+                    data.textContent = cell.textContent ? cell.textContent : cell.innerText;
+                  }
+                  data.refresh = false;
+               }
+               return data.textContent;
+       },
+       register : function(table, options) {
+               if(!table.id) {
+                       TableKit._tblcount += 1;
+                       table.id = "tablekit-table-" + TableKit._tblcount;
+               }
+               var id = table.id;
+               TableKit.tables[id] = TableKit.tables[id] ? Object.extend(TableKit.tables[id], options || {}) : Object.extend({sortable:false,resizable:false,editable:false}, options || {});
+       },
+       registerCell : function(cell) {
+               if(!cell.id) {
+                       TableKit._cellcount += 1;
+                       cell.id = "tablekit-cell-" + TableKit._cellcount;
+               }
+               if(!TableKit.cells[cell.id]) {
+                       TableKit.cells[cell.id] = {textContent : '', htmlContent : '', active : false};
+               }
+       },
+       isSortable : function(table) {
+               return TableKit.tables[table.id] ? TableKit.tables[table.id].sortable : false;
+       },
+       isResizable : function(table) {
+               return TableKit.tables[table.id] ? TableKit.tables[table.id].resizable : false;
+       },
+       isEditable : function(table) {
+               return TableKit.tables[table.id] ? TableKit.tables[table.id].editable : false;
+       },
+       setup : function(o) {
+               Object.extend(TableKit.options, o || {} );
+       },
+       option : function(s, id, o1, o2) {
+               o1 = o1 || TableKit.options;
+               o2 = o2 || (id ? (TableKit.tables[id] ? TableKit.tables[id] : {}) : {});
+               var key = id + s;
+               if(!TableKit._opcache[key]){
+                       TableKit._opcache[key] = $A($w(s)).inject([],function(a,v){
+                               a.push(a[v] = o2[v] || o1[v]);
+                               return a;
+                       });
+               }
+               return TableKit._opcache[key];
+       },
+       e : function(event) {
+               return event || window.event;
+       },
+       tables : {},
+       _opcache : {},
+       cells : {},
+       rows : {},
+       heads : {},
+       options : {
+               autoLoad : false,
+               stripe : true,
+               sortable : true,
+               resizable : true,
+               editable : true,
+               rowEvenClass : 'roweven',
+               rowOddClass : 'rowodd',
+               sortableSelector : ['table.sortable'],
+               columnClass : 'sortcol',
+               descendingClass : 'sortdesc',
+               ascendingClass : 'sortasc',
+               noSortClass : 'nosort',
+               sortFirstAscendingClass : 'sortfirstasc',
+               sortFirstDecendingClass : 'sortfirstdesc',
+               resizableSelector : ['table.resizable'],
+               minWidth : 10,
+               showHandle : true,
+               resizeOnHandleClass : 'resize-handle-active',
+               editableSelector : ['table.editable'],
+               formClassName : 'editable-cell-form',
+               noEditClass : 'noedit',
+               editAjaxURI : '/',
+               editAjaxOptions : {}
+       },
+       _tblcount : 0,
+       _cellcount : 0,
+       load : function() {
+               if(TableKit.options.autoLoad) {
+                       if(TableKit.options.sortable) {
+                               $A(TableKit.options.sortableSelector).each(function(s){
+                                       $$(s).each(function(t) {
+                                               TableKit.Sortable.init(t);
+                                       });
+                               });
+                       }
+                       if(TableKit.options.resizable) {
+                               $A(TableKit.options.resizableSelector).each(function(s){
+                                       $$(s).each(function(t) {
+                                               TableKit.Resizable.init(t);
+                                       });
+                               });
+                       }
+                       if(TableKit.options.editable) {
+                               $A(TableKit.options.editableSelector).each(function(s){
+                                       $$(s).each(function(t) {
+                                               TableKit.Editable.init(t);
+                                       });
+                               });
+                       }
+               }
+       }
+});
+
+TableKit.Rows = {
+       stripe : function(table) {
+               var rows = TableKit.getBodyRows(table);
+               rows.each(function(r,i) {
+                       TableKit.Rows.addStripeClass(table,r,i);
+               });
+       },
+       addStripeClass : function(t,r,i) {
+               t = t || r.up('table');
+               var op = TableKit.option('rowEvenClass rowOddClass', t.id);
+               var css = ((i+1)%2 === 0 ? op[0] : op[1]);
+               // using prototype's assClassName/RemoveClassName was not efficient for large tables, hence:
+               var cn = r.className.split(/\s+/);
+               var newCn = [];
+               for(var x = 0, l = cn.length; x < l; x += 1) {
+                       if(cn[x] !== op[0] && cn[x] !== op[1]) { newCn.push(cn[x]); }
+               }
+               newCn.push(css);
+               r.className = newCn.join(" ");
+       }
+};
+
+TableKit.Sortable = {
+       init : function(elm, options){
+               var table = $(elm);
+               if(table.tagName !== "TABLE") {
+                       return;
+               }
+               TableKit.register(table,Object.extend(options || {},{sortable:true}));
+               var sortFirst;
+               var cells = TableKit.getHeaderCells(table);
+               var op = TableKit.option('noSortClass columnClass sortFirstAscendingClass sortFirstDecendingClass', table.id);
+               cells.each(function(c){
+                       c = $(c);
+                       if(!c.hasClassName(op.noSortClass)) {
+                               Event.observe(c, 'mousedown', TableKit.Sortable._sort);
+                               c.addClassName(op.columnClass);
+                               if(c.hasClassName(op.sortFirstAscendingClass) || c.hasClassName(op.sortFirstDecendingClass)) {
+                                       sortFirst = c;
+                               }
+                       }
+               });
+
+               if(sortFirst) {
+                       if(sortFirst.hasClassName(op.sortFirstAscendingClass)) {
+                               TableKit.Sortable.sort(table, sortFirst, 1);
+                       } else {
+                               TableKit.Sortable.sort(table, sortFirst, -1);
+                       }
+               } else { // just add row stripe classes
+                       TableKit.Rows.stripe(table);
+               }
+       },
+       reload : function(table) {
+               table = $(table);
+               var cells = TableKit.getHeaderCells(table);
+               var op = TableKit.option('noSortClass columnClass', table.id);
+               cells.each(function(c){
+                       c = $(c);
+                       if(!c.hasClassName(op.noSortClass)) {
+                               Event.stopObserving(c, 'mousedown', TableKit.Sortable._sort);
+                               c.removeClassName(op.columnClass);
+                       }
+               });
+               TableKit.Sortable.init(table);
+       },
+       _sort : function(e) {
+               if(TableKit.Resizable._onHandle) {return;}
+               e = TableKit.e(e);
+               Event.stop(e);
+               var cell = Event.element(e);
+               while(!(cell.tagName && cell.tagName.match(/td|th/gi))) {
+                       cell = cell.parentNode;
+               }
+               TableKit.Sortable.sort(null, cell);
+       },
+       sort : function(table, index, order) {
+               var cell;
+               if(typeof index === 'number') {
+                       if(!table || (table.tagName && table.tagName !== "TABLE")) {
+                               return;
+                       }
+                       table = $(table);
+                       index = Math.min(table.rows[0].cells.length, index);
+                       index = Math.max(1, index);
+                       index -= 1;
+                       cell = (table.tHead && table.tHead.rows.length > 0) ? $(table.tHead.rows[table.tHead.rows.length-1].cells[index]) : $(table.rows[0].cells[index]);
+               } else {
+                       cell = $(index);
+                       table = table ? $(table) : cell.up('table');
+                       index = TableKit.getCellIndex(cell);
+               }
+               var op = TableKit.option('noSortClass descendingClass ascendingClass', table.id);
+
+               if(cell.hasClassName(op.noSortClass)) {return;}
+
+               order = order ? order : (cell.hasClassName(op.descendingClass) ? 1 : -1);
+               var rows = TableKit.getBodyRows(table);
+
+               if(cell.hasClassName(op.ascendingClass) || cell.hasClassName(op.descendingClass)) {
+                       rows.reverse(); // if it was already sorted we just need to reverse it.
+               } else {
+                       var datatype = TableKit.Sortable.getDataType(cell,index,table);
+                       var tkst = TableKit.Sortable.types;
+                       rows.sort(function(a,b) {
+                               return order * tkst[datatype].compare(TableKit.getCellText(a.cells[index]),TableKit.getCellText(b.cells[index]));
+                       });
+               }
+               var tb = table.tBodies[0];
+               var tkr = TableKit.Rows;
+               rows.each(function(r,i) {
+                       tb.appendChild(r);
+                       //tkr.addStripeClass(table,r,i);
+               });
+               TableKit.Rows.stripe(table);
+               var hcells = TableKit.getHeaderCells(null, cell);
+               $A(hcells).each(function(c,i){
+                       c = $(c);
+                       c.removeClassName(op.ascendingClass);
+                       c.removeClassName(op.descendingClass);
+                       if(index === i) {
+                               if(order === 1) {
+                                       c.removeClassName(op.descendingClass);
+                                       c.addClassName(op.ascendingClass);
+                               } else {
+                                       c.removeClassName(op.ascendingClass);
+                                       c.addClassName(op.descendingClass);
+                               }
+                       }
+               });
+       },
+       types : {},
+       detectors : [],
+       addSortType : function() {
+               $A(arguments).each(function(o){
+                       TableKit.Sortable.types[o.name] = o;
+               });
+       },
+       getDataType : function(cell,index,table) {
+               cell = $(cell);
+               index = (index || index === 0) ? index : TableKit.getCellIndex(cell);
+
+               var colcache = TableKit.Sortable._coltypecache;
+               var cache = colcache[table.id] ? colcache[table.id] : (colcache[table.id] = {});
+
+               if(!cache[index]) {
+                       var t = '';
+                       // first look for a data type id on the heading row cell
+                       if(cell.id && TableKit.Sortable.types[cell.id]) {
+                               t = cell.id;
+                       }
+                       t = cell.classNames().detect(function(n){ // then look for a data type classname on the heading row cell
+                               return (TableKit.Sortable.types[n]) ? true : false;
+                       });
+                       if(!t) {
+                               var rows = TableKit.getBodyRows(table);
+                               cell = rows[0].cells[index]; // grab same index cell from body row to try and match data type
+                               t = TableKit.Sortable.detectors.detect(
+                                               function(d){
+                                                       return TableKit.Sortable.types[d].detect(TableKit.getCellText(cell));
+                                               });
+                       }
+                       cache[index] = t;
+               }
+               return cache[index];
+       },
+       _coltypecache : {}
+};
+
+TableKit.Sortable.detectors = $A($w('date-iso date date-eu date-au time currency datasize number casesensitivetext text')); // setting it here because Safari complained when I did it above...
+
+TableKit.Sortable.Type = Class.create();
+TableKit.Sortable.Type.prototype = {
+       initialize : function(name, options){
+               this.name = name;
+               options = Object.extend({
+                       normal : function(v){
+                               return v;
+                       },
+                       pattern : /.*/
+               }, options || {});
+               this.normal = options.normal;
+               this.pattern = options.pattern;
+               if(options.compare) {
+                       this.compare = options.compare;
+               }
+               if(options.detect) {
+                       this.detect = options.detect;
+               }
+       },
+       compare : function(a,b){
+               return TableKit.Sortable.Type.compare(this.normal(a), this.normal(b));
+       },
+       detect : function(v){
+               return this.pattern.test(v);
+       }
+};
+
+TableKit.Sortable.Type.compare = function(a,b) {
+       return a < b ? -1 : a === b ? 0 : 1;
+};
+
+TableKit.Sortable.addSortType(
+       new TableKit.Sortable.Type('number', {
+               pattern : /^[-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?/,
+               normal : function(v) {
+                       // This will grab the first thing that looks like a number from a string, so you can use it to order a column of various srings containing numbers.
+                       v = parseFloat(v.replace(/^.*?([-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?).*$/,"$1"));
+                       return isNaN(v) ? 0 : v;
+               }}),
+       new TableKit.Sortable.Type('text',{
+               normal : function(v) {
+                       return v ? v.toLowerCase() : '';
+               }}),
+       new TableKit.Sortable.Type('casesensitivetext',{pattern : /^[A-Z]+$/}),
+       new TableKit.Sortable.Type('datasize',{
+               pattern : /^[-+]?[\d]*\.?[\d]+(?:[eE][-+]?[\d]+)?\s?[k|m|g|t]b$/i,
+               normal : function(v) {
+                       var r = v.match(/^([-+]?[\d]*\.?[\d]+([eE][-+]?[\d]+)?)\s?([k|m|g|t]?b)?/i);
+                       var b = r[1] ? Number(r[1]).valueOf() : 0;
+                       var m = r[3] ? r[3].substr(0,1).toLowerCase() : '';
+                       var result = b;
+                       switch(m) {
+                               case  'k':
+                                       result = b * 1024;
+                                       break;
+                               case  'm':
+                                       result = b * 1024 * 1024;
+                                       break;
+                               case  'g':
+                                       result = b * 1024 * 1024 * 1024;
+                                       break;
+                               case  't':
+                                       result = b * 1024 * 1024 * 1024 * 1024;
+                                       break;
+                       }
+                       return result;
+               }}),
+       new TableKit.Sortable.Type('date-au',{
+               pattern : /^\d{2}\/\d{2}\/\d{4}\s?(?:\d{1,2}\:\d{2}(?:\:\d{2})?\s?[a|p]?m?)?/i,
+               normal : function(v) {
+                       if(!this.pattern.test(v)) {return 0;}
+                       var r = v.match(/^(\d{2})\/(\d{2})\/(\d{4})\s?(?:(\d{1,2})\:(\d{2})(?:\:(\d{2}))?\s?([a|p]?m?))?/i);
+                       var yr_num = r[3];
+                       var mo_num = parseInt(r[2],10)-1;
+                       var day_num = r[1];
+                       var hr_num = r[4] ? r[4] : 0;
+                       if(r[7] && r[7].toLowerCase().indexOf('p') !== -1) {
+                               hr_num = parseInt(r[4],10) + 12;
+                       }
+                       var min_num = r[5] ? r[5] : 0;
+                       var sec_num = r[6] ? r[6] : 0;
+                       return new Date(yr_num, mo_num, day_num, hr_num, min_num, sec_num, 0).valueOf();
+               }}),
+       new TableKit.Sortable.Type('date-us',{
+               pattern : /^\d{2}\/\d{2}\/\d{4}\s?(?:\d{1,2}\:\d{2}(?:\:\d{2})?\s?[a|p]?m?)?/i,
+               normal : function(v) {
+                       if(!this.pattern.test(v)) {return 0;}
+                       var r = v.match(/^(\d{2})\/(\d{2})\/(\d{4})\s?(?:(\d{1,2})\:(\d{2})(?:\:(\d{2}))?\s?([a|p]?m?))?/i);
+                       var yr_num = r[3];
+                       var mo_num = parseInt(r[1],10)-1;
+                       var day_num = r[2];
+                       var hr_num = r[4] ? r[4] : 0;
+                       if(r[7] && r[7].toLowerCase().indexOf('p') !== -1) {
+                               hr_num = parseInt(r[4],10) + 12;
+                       }
+                       var min_num = r[5] ? r[5] : 0;
+                       var sec_num = r[6] ? r[6] : 0;
+                       return new Date(yr_num, mo_num, day_num, hr_num, min_num, sec_num, 0).valueOf();
+               }}),
+       new TableKit.Sortable.Type('date-eu',{
+               pattern : /^\d{2}-\d{2}-\d{4}/i,
+               normal : function(v) {
+                       if(!this.pattern.test(v)) {return 0;}
+                       var r = v.match(/^(\d{2})-(\d{2})-(\d{4})/);
+                       var yr_num = r[3];
+                       var mo_num = parseInt(r[2],10)-1;
+                       var day_num = r[1];
+                       return new Date(yr_num, mo_num, day_num).valueOf();
+               }}),
+       new TableKit.Sortable.Type('date-iso',{
+               pattern : /[\d]{4}-[\d]{2}-[\d]{2}(?:T[\d]{2}\:[\d]{2}(?:\:[\d]{2}(?:\.[\d]+)?)?(Z|([-+][\d]{2}:[\d]{2})?)?)?/, // 2005-03-26T19:51:34Z
+               normal : function(v) {
+                       if(!this.pattern.test(v)) {return 0;}
+                   var d = v.match(/([\d]{4})(-([\d]{2})(-([\d]{2})(T([\d]{2}):([\d]{2})(:([\d]{2})(\.([\d]+))?)?(Z|(([-+])([\d]{2}):([\d]{2})))?)?)?)?/);
+                   var offset = 0;
+                   var date = new Date(d[1], 0, 1);
+                   if (d[3]) { date.setMonth(d[3] - 1) ;}
+                   if (d[5]) { date.setDate(d[5]); }
+                   if (d[7]) { date.setHours(d[7]); }
+                   if (d[8]) { date.setMinutes(d[8]); }
+                   if (d[10]) { date.setSeconds(d[10]); }
+                   if (d[12]) { date.setMilliseconds(Number("0." + d[12]) * 1000); }
+                   if (d[14]) {
+                       offset = (Number(d[16]) * 60) + Number(d[17]);
+                       offset *= ((d[15] === '-') ? 1 : -1);
+                   }
+                   offset -= date.getTimezoneOffset();
+                   if(offset !== 0) {
+                       var time = (Number(date) + (offset * 60 * 1000));
+                       date.setTime(Number(time));
+                   }
+                       return date.valueOf();
+               }}),
+       new TableKit.Sortable.Type('date',{
+               pattern: /^(?:sun|mon|tue|wed|thu|fri|sat)\,\s\d{1,2}\s(?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec)\s\d{4}(?:\s\d{2}\:\d{2}(?:\:\d{2})?(?:\sGMT(?:[+-]\d{4})?)?)?/i, //Mon, 18 Dec 1995 17:28:35 GMT
+               compare : function(a,b) { // must be standard javascript date format
+                       if(a && b) {
+                               return TableKit.Sortable.Type.compare(new Date(a),new Date(b));
+                       } else {
+                               return TableKit.Sortable.Type.compare(a ? 1 : 0, b ? 1 : 0);
+                       }
+               }}),
+       new TableKit.Sortable.Type('time',{
+               pattern : /^\d{1,2}\:\d{2}(?:\:\d{2})?(?:\s[a|p]m)?$/i,
+               compare : function(a,b) {
+                       var d = new Date();
+                       var ds = d.getMonth() + "/" + d.getDate() + "/" + d.getFullYear() + " ";
+                       return TableKit.Sortable.Type.compare(new Date(ds + a),new Date(ds + b));
+               }}),
+       new TableKit.Sortable.Type('currency',{
+               pattern : /^[$£¥\80¤]/, // dollar,pound,yen,euro,generic currency symbol
+               normal : function(v) {
+                       return v ? parseFloat(v.replace(/[^-\d\.]/g,'')) : 0;
+               }})
+);
+
+TableKit.Resizable = {
+       init : function(elm, options){
+               var table = $(elm);
+               if(table.tagName !== "TABLE") {return;}
+               TableKit.register(table,Object.extend(options || {},{resizable:true}));
+               var cells = TableKit.getHeaderCells(table);
+               cells.each(function(c){
+                       c = $(c);
+                       Event.observe(c, 'mouseover', TableKit.Resizable.initDetect);
+                       Event.observe(c, 'mouseout', TableKit.Resizable.killDetect);
+               });
+       },
+       resize : function(table, index, w) {
+               var cell;
+               if(typeof index === 'number') {
+                       if(!table || (table.tagName && table.tagName !== "TABLE")) {return;}
+                       table = $(table);
+                       index = Math.min(table.rows[0].cells.length, index);
+                       index = Math.max(1, index);
+                       index -= 1;
+                       cell = (table.tHead && table.tHead.rows.length > 0) ? $(table.tHead.rows[table.tHead.rows.length-1].cells[index]) : $(table.rows[0].cells[index]);
+               } else {
+                       cell = $(index);
+                       table = table ? $(table) : cell.up('table');
+                       index = TableKit.getCellIndex(cell);
+               }
+               var pad = parseInt(cell.getStyle('paddingLeft'),10) + parseInt(cell.getStyle('paddingRight'),10);
+               w = Math.max(w-pad, TableKit.option('minWidth', table.id)[0]);
+
+               cell.setStyle({'width' : w + 'px'});
+       },
+       initDetect : function(e) {
+               e = TableKit.e(e);
+               var cell = Event.element(e);
+               Event.observe(cell, 'mousemove', TableKit.Resizable.detectHandle);
+               Event.observe(cell, 'mousedown', TableKit.Resizable.startResize);
+       },
+       detectHandle : function(e) {
+               e = TableKit.e(e);
+               var cell = Event.element(e);
+               if(TableKit.Resizable.pointerPos(cell,Event.pointerX(e),Event.pointerY(e))){
+                       cell.addClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);
+                       TableKit.Resizable._onHandle = true;
+               } else {
+                       cell.removeClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);
+                       TableKit.Resizable._onHandle = false;
+               }
+       },
+       killDetect : function(e) {
+               e = TableKit.e(e);
+               TableKit.Resizable._onHandle = false;
+               var cell = Event.element(e);
+               Event.stopObserving(cell, 'mousemove', TableKit.Resizable.detectHandle);
+               Event.stopObserving(cell, 'mousedown', TableKit.Resizable.startResize);
+               cell.removeClassName(TableKit.option('resizeOnHandleClass', cell.up('table').id)[0]);
+       },
+       startResize : function(e) {
+               e = TableKit.e(e);
+               if(!TableKit.Resizable._onHandle) {return;}
+               var cell = Event.element(e);
+               Event.stopObserving(cell, 'mousemove', TableKit.Resizable.detectHandle);
+               Event.stopObserving(cell, 'mousedown', TableKit.Resizable.startResize);
+               Event.stopObserving(cell, 'mouseout', TableKit.Resizable.killDetect);
+               TableKit.Resizable._cell = cell;
+               var table = cell.up('table');
+               TableKit.Resizable._tbl = table;
+               if(TableKit.option('showHandle', table.id)[0]) {
+                       TableKit.Resizable._handle = $(document.createElement('div')).addClassName('resize-handle').setStyle({
+                               'top' : Position.cumulativeOffset(cell)[1] + 'px',
+                               'left' : Event.pointerX(e) + 'px',
+                               'height' : table.getDimensions().height + 'px'
+                       });
+                       document.body.appendChild(TableKit.Resizable._handle);
+               }
+               Event.observe(document, 'mousemove', TableKit.Resizable.drag);
+               Event.observe(document, 'mouseup', TableKit.Resizable.endResize);
+               Event.stop(e);
+       },
+       endResize : function(e) {
+               e = TableKit.e(e);
+               var cell = TableKit.Resizable._cell;
+               TableKit.Resizable.resize(null, cell, (Event.pointerX(e) - Position.cumulativeOffset(cell)[0]));
+               Event.stopObserving(document, 'mousemove', TableKit.Resizable.drag);
+               Event.stopObserving(document, 'mouseup', TableKit.Resizable.endResize);
+               if(TableKit.option('showHandle', TableKit.Resizable._tbl.id)[0]) {
+                       $$('div.resize-handle').each(function(elm){
+                               document.body.removeChild(elm);
+                       });
+               }
+               Event.observe(cell, 'mouseout', TableKit.Resizable.killDetect);
+               TableKit.Resizable._tbl = TableKit.Resizable._handle = TableKit.Resizable._cell = null;
+               Event.stop(e);
+       },
+       drag : function(e) {
+               e = TableKit.e(e);
+               if(TableKit.Resizable._handle === null) {
+                       try {
+                               TableKit.Resizable.resize(TableKit.Resizable._tbl, TableKit.Resizable._cell, (Event.pointerX(e) - Position.cumulativeOffset(TableKit.Resizable._cell)[0]));
+                       } catch(e) {}
+               } else {
+                       TableKit.Resizable._handle.setStyle({'left' : Event.pointerX(e) + 'px'});
+               }
+               return false;
+       },
+       pointerPos : function(element, x, y) {
+       var offset = Position.cumulativeOffset(element);
+           return (y >= offset[1] &&
+                   y <  offset[1] + element.offsetHeight &&
+                   x >= offset[0] + element.offsetWidth - 5 &&
+                   x <  offset[0] + element.offsetWidth);
+       },
+       _onHandle : false,
+       _cell : null,
+       _tbl : null,
+       _handle : null
+};
+
+
+TableKit.Editable = {
+       init : function(elm, options){
+               var table = $(elm);
+               if(table.tagName !== "TABLE") {return;}
+               TableKit.register(table,Object.extend(options || {},{editable:true}));
+               Event.observe(table.tBodies[0], 'click', TableKit.Editable._editCell);
+       },
+       _editCell : function(e) {
+               e = TableKit.e(e);
+               var cell = Event.findElement(e,'td');
+               TableKit.Editable.editCell(null, cell);
+       },
+       editCell : function(table, index, cindex) {
+               var cell, row;
+               if(typeof index === 'number') {
+                       if(!table || (table.tagName && table.tagName !== "TABLE")) {return;}
+                       table = $(table);
+                       index = Math.min(table.tBodies[0].rows.length, index);
+                       index = Math.max(1, index);
+                       index -= 1;
+                       cindex = Math.min(table.rows[0].cells.length, cindex);
+                       cindex = Math.max(1, cindex);
+                       cindex -= 1;
+                       row = $(table.tBodies[0].rows[index]);
+                       cell = $(row.cells[cindex]);
+               } else {
+                       cell = $(index);
+                       table = (table && table.tagName && table.tagName !== "TABLE") ? $(table) : cell.up('table');
+                       row = cell.up('tr');
+               }
+               var op = TableKit.option('noEditClass', table.id);
+               if(cell.hasClassName(op.noEditClass)) {return;}
+
+               var head = $(TableKit.getHeaderCells(table, cell)[TableKit.getCellIndex(cell)]);
+               if(head.hasClassName(op.noEditClass)) {return;}
+
+               TableKit.registerCell(cell);
+               var data = TableKit.cells[cell.id];
+               if(data.active) {return;}
+               data.htmlContent = cell.innerHTML;
+               var ftype = TableKit.Editable.types['text-input'];
+               if(head.id && TableKit.Editable.types[head.id]) {
+                       ftype = TableKit.Editable.types[head.id];
+               } else {
+                       var n = head.classNames().detect(function(n){
+                                       return (TableKit.Editable.types[n]) ? true : false;
+                       });
+                       ftype = n ? TableKit.Editable.types[n] : ftype;
+               }
+               ftype.edit(cell);
+               data.active = true;
+       },
+       types : {},
+       addCellEditor : function(o) {
+               if(o && o.name) { TableKit.Editable.types[o.name] = o; }
+       }
+};
+
+TableKit.Editable.CellEditor = Class.create();
+TableKit.Editable.CellEditor.prototype = {
+       initialize : function(name, options){
+               this.name = name;
+               this.options = Object.extend({
+                       element : 'input',
+                       attributes : {name : 'value', type : 'text'},
+                       selectOptions : [],
+                       showSubmit : true,
+                       submitText : 'OK',
+                       showCancel : true,
+                       cancelText : 'Cancel',
+                       ajaxURI : null,
+                       ajaxOptions : null
+               }, options || {});
+       },
+       edit : function(cell) {
+               cell = $(cell);
+               var op = this.options;
+               var table = cell.up('table');
+
+               var form = $(document.createElement("form"));
+               form.id = cell.id + '-form';
+               form.addClassName(TableKit.option('formClassName', table.id)[0]);
+               form.onsubmit = this._submit.bindAsEventListener(this);
+
+               var field = document.createElement(op.element);
+                       $H(op.attributes).each(function(v){
+                               field[v.key] = v.value;
+                       });
+                       switch(op.element) {
+                               case 'input':
+                               case 'textarea':
+                               field.value = TableKit.getCellText(cell);
+                               break;
+
+                               case 'select':
+                               var txt = TableKit.getCellText(cell);
+                               $A(op.selectOptions).each(function(v){
+                                       field.options[field.options.length] = new Option(v[0], v[1]);
+                                       if(txt === v[1]) {
+                                               field.options[field.options.length-1].selected = 'selected';
+                                       }
+                               });
+                               break;
+                       }
+                       form.appendChild(field);
+                       if(op.element === 'textarea') {
+                               form.appendChild(document.createElement("br"));
+                       }
+                       if(op.showSubmit) {
+                               var okButton = document.createElement("input");
+                               okButton.type = "submit";
+                               okButton.value = op.submitText;
+                               okButton.className = 'editor_ok_button';
+                               form.appendChild(okButton);
+                       }
+                       if(op.showCancel) {
+                               var cancelLink = document.createElement("a");
+                               cancelLink.href = "#";
+                               cancelLink.appendChild(document.createTextNode(op.cancelText));
+                               cancelLink.onclick = this._cancel.bindAsEventListener(this);
+                               cancelLink.className = 'editor_cancel';
+                               form.appendChild(cancelLink);
+                       }
+                       cell.innerHTML = '';
+                       cell.appendChild(form);
+       },
+       _submit : function(e) {
+               var cell = Event.findElement(e,'td');
+               var form = Event.findElement(e,'form');
+               Event.stop(e);
+               this.submit(cell,form);
+       },
+       submit : function(cell, form) {
+               var op = this.options;
+               form = form ? form : cell.down('form');
+               var head = $(TableKit.getHeaderCells(null, cell)[TableKit.getCellIndex(cell)]);
+               var row = cell.up('tr');
+               var table = cell.up('table');
+               var s = '&row=' + (TableKit.getRowIndex(row)+1) + '&cell=' + (TableKit.getCellIndex(cell)+1) + '&id=' + row.id + '&field=' + head.id + '&' + Form.serialize(form);
+               this.ajax = new Ajax.Updater(cell, op.ajaxURI || TableKit.option('editAjaxURI', table.id)[0], Object.extend(op.ajaxOptions || TableKit.option('editAjaxOptions', table.id)[0], {
+                       postBody : s,
+                       onComplete : function() {
+                               var data = TableKit.cells[cell.id];
+                               data.active = false;
+                               data.refresh = true; // mark cell cache for refreshing, in case cell contents has changed and sorting is applied
+                       }
+               }));
+       },
+       _cancel : function(e) {
+               var cell = Event.findElement(e,'td');
+               Event.stop(e);
+               this.cancel(cell);
+       },
+       cancel : function(cell) {
+               this.ajax = null;
+               var data = TableKit.cells[cell.id];
+               cell.innerHTML = data.htmlContent;
+               data.htmlContent = '';
+               data.active = false;
+       },
+       ajax : null
+};
+
+TableKit.Editable.textInput = function(n,attributes) {
+       TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {
+               element : 'input',
+               attributes : Object.extend({name : 'value', type : 'text'}, attributes||{})
+       }));
+};
+TableKit.Editable.textInput('text-input');
+
+TableKit.Editable.multiLineInput = function(n,attributes) {
+       TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {
+               element : 'textarea',
+               attributes : Object.extend({name : 'value', rows : '5', cols : '20'}, attributes||{})
+       }));
+};
+TableKit.Editable.multiLineInput('multi-line-input');
+
+TableKit.Editable.selectInput = function(n,attributes,selectOptions) {
+       TableKit.Editable.addCellEditor(new TableKit.Editable.CellEditor(n, {
+               element : 'select',
+               attributes : Object.extend({name : 'value'}, attributes||{}),
+               'selectOptions' : selectOptions
+       }));
+};
+
+/*
+TableKit.Bench = {
+       bench : [],
+       start : function(){
+               TableKit.Bench.bench[0] = new Date().getTime();
+       },
+       end : function(s){
+               TableKit.Bench.bench[1] = new Date().getTime();
+               alert(s + ' ' + ((TableKit.Bench.bench[1]-TableKit.Bench.bench[0])/1000)+' seconds.') //console.log(s + ' ' + ((TableKit.Bench.bench[1]-TableKit.Bench.bench[0])/1000)+' seconds.')
+               TableKit.Bench.bench = [];
+       }
+} */
+
+if(window.FastInit) {
+       FastInit.addOnLoad(TableKit.load);
+} else {
+       Event.observe(window, 'load', TableKit.load);
  }
 \ No newline at end of file
diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties

index 3dd830384bbc6727cea2e1c5769aad0d88915e1b..287ce487033962909065757a94fd5d15b0cfd494 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties
+++ b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties
@@ -1,5 +1,5 @@
-#Generated by Maven\r
-#Fri Nov 23 14:23:53 CET 2007\r
-groupId=org.codehaus.sonar\r
-artifactId=sonar-core\r
+#Generated by Maven
+#Fri Nov 23 14:23:53 CET 2007
+groupId=org.codehaus.sonar
+artifactId=sonar-core
  version=
 \ No newline at end of file
diff --git a/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-without-version.properties b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-without-version.properties

index 1d828008fdd8a03b8637187103f0b2dc382c3dd9..8d70c2289f86b515c81dbbf1856357693efd57f2 100644 (file)
--- a/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-without-version.properties
+++ b/sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-without-version.properties
@@ -1,4 +1,4 @@
-#Generated by Maven\r
-#Fri Nov 23 14:23:53 CET 2007\r
-groupId=org.codehaus.sonar\r
-artifactId=sonar-core\r
+#Generated by Maven
+#Fri Nov 23 14:23:53 CET 2007
+groupId=org.codehaus.sonar
+artifactId=sonar-core
author	Evgeny Mandrikov <mandrikov@gmail.com>
	Wed, 30 Mar 2011 22:09:23 +0000 (02:09 +0400)
committer	Evgeny Mandrikov <mandrikov@gmail.com>
	Thu, 31 Mar 2011 12:06:17 +0000 (16:06 +0400)
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/sharedFixture.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasure.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testDeleteAsyncMeasureSnapshots.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetAsyncMeasureSnapshotsFromSnapshotId.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetLastAsyncMeasureSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextAsyncMeasureSnapshotsUntilDate.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetNextSnapshotsUntilDate.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousAsyncMeasureSnapshots.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresDaoTest/testGetPreviousSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addFutureSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/addInvisibleMeasure.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignAPastMeasureToNextSnapshotsWithDifferentMetric.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresToLastSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignLatestMeasuresWhenNoPreviousSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasureToFutureSnapshotsWithDifferentMetric.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignMeasuresWhenNoPreviousSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasureToFutureSnapshots.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignNewMeasuresToLastSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/assignPastMeasuresToPastSnapshot.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteLastMeasure.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/AsyncMeasuresServiceTest/deleteMeasure.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/ProfilesDaoTest/shouldGetProfiles.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules-result.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldDeleteActiveRules.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetActiveRules.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleParams.xml		patch \| blob \| history
sonar-core/src/test/resources/org/sonar/jpa/dao/RulesDaoTest/shouldGetRuleWithRuleKeyAndPluginKey.xml		patch \| blob \| history
sonar-plugin-api/src/test/resources/META-INF/MANIFEST.MF		patch \| blob \| history
sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_gradient.rhtml		patch \| blob \| history
sonar-server/src/main/webapp/WEB-INF/app/views/components/_treemap_set_default.html.erb		patch \| blob \| history
sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_breadcrumb.html.erb		patch \| blob \| history
sonar-server/src/main/webapp/WEB-INF/app/views/setup/dbdown.rhtml		patch \| blob \| history
sonar-server/src/main/webapp/WEB-INF/config/locales/defaults/sk.yml		patch \| blob \| history
sonar-server/src/main/webapp/javascripts/prototip.js		patch \| blob \| history
sonar-server/src/main/webapp/javascripts/tablekit.js		patch \| blob \| history
sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-with-empty-version.properties		patch \| blob \| history
sonar-server/src/test/resources/org/sonar/server/platform/ServerImplTest/pom-without-version.properties		patch \| blob \| history