From 87660673df0efcb981b8bd1c831d3df33e75810a Mon Sep 17 00:00:00 2001
From: Julien HENRY <julien.henry@sonarsource.com>
Date: Wed, 19 Oct 2016 10:33:11 +0200
Subject: [PATCH] Move old test API to deprecated package

---
 .../scanner/{ => deprecated}/test/DefaultCoverageBlock.java   | 2 +-
 .../sonar/scanner/{ => deprecated}/test/DefaultTestCase.java  | 2 +-
 .../sonar/scanner/{ => deprecated}/test/DefaultTestPlan.java  | 2 +-
 .../sonar/scanner/{ => deprecated}/test/DefaultTestable.java  | 2 +-
 .../sonar/scanner/{ => deprecated}/test/TestPlanBuilder.java  | 2 +-
 .../sonar/scanner/{ => deprecated}/test/TestableBuilder.java  | 2 +-
 .../org/sonar/scanner/{ => deprecated}/test/package-info.java | 2 +-
 .../scanner/report/TestExecutionAndCoveragePublisher.java     | 4 ++--
 .../java/org/sonar/scanner/scan/ProjectScanContainer.java     | 4 ++--
 9 files changed, 11 insertions(+), 11 deletions(-)
 rename sonar-scanner-engine/src/main/java/org/sonar/scanner/{ => deprecated}/test/DefaultCoverageBlock.java (97%)
 rename sonar-scanner-engine/src/main/java/org/sonar/scanner/{ => deprecated}/test/DefaultTestCase.java (99%)
 rename sonar-scanner-engine/src/main/java/org/sonar/scanner/{ => deprecated}/test/DefaultTestPlan.java (97%)
 rename sonar-scanner-engine/src/main/java/org/sonar/scanner/{ => deprecated}/test/DefaultTestable.java (98%)
 rename sonar-scanner-engine/src/main/java/org/sonar/scanner/{ => deprecated}/test/TestPlanBuilder.java (97%)
 rename sonar-scanner-engine/src/main/java/org/sonar/scanner/{ => deprecated}/test/TestableBuilder.java (97%)
 rename sonar-scanner-engine/src/main/java/org/sonar/scanner/{ => deprecated}/test/package-info.java (95%)

diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultCoverageBlock.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultCoverageBlock.java
similarity index 97%
rename from sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultCoverageBlock.java
rename to sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultCoverageBlock.java
index 003a099b8d6..95d8e2a2b77 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultCoverageBlock.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultCoverageBlock.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.scanner.test;
+package org.sonar.scanner.deprecated.test;
 
 import java.util.List;
 import org.sonar.api.batch.fs.internal.DefaultInputFile;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestCase.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestCase.java
similarity index 99%
rename from sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestCase.java
rename to sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestCase.java
index b87cee936d5..522b47307f8 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestCase.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestCase.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.scanner.test;
+package org.sonar.scanner.deprecated.test;
 
 import com.google.common.base.Preconditions;
 import java.util.LinkedHashMap;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestPlan.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestPlan.java
similarity index 97%
rename from sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestPlan.java
rename to sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestPlan.java
index 65f7da160a9..0c64de43637 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestPlan.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestPlan.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.scanner.test;
+package org.sonar.scanner.deprecated.test;
 
 import com.google.common.collect.Lists;
 import java.util.ArrayList;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestable.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestable.java
similarity index 98%
rename from sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestable.java
rename to sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestable.java
index cf99ba2cc75..e59067275b6 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/DefaultTestable.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/DefaultTestable.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.scanner.test;
+package org.sonar.scanner.deprecated.test;
 
 import java.util.List;
 import java.util.Map;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestPlanBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/TestPlanBuilder.java
similarity index 97%
rename from sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestPlanBuilder.java
rename to sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/TestPlanBuilder.java
index 7376eb0a174..94fbfd0ef18 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestPlanBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/TestPlanBuilder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.scanner.test;
+package org.sonar.scanner.deprecated.test;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestableBuilder.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/TestableBuilder.java
similarity index 97%
rename from sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestableBuilder.java
rename to sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/TestableBuilder.java
index 2f327a344f2..4c9c3de46fb 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/TestableBuilder.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/TestableBuilder.java
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-package org.sonar.scanner.test;
+package org.sonar.scanner.deprecated.test;
 
 import javax.annotation.CheckForNull;
 import org.sonar.api.batch.fs.InputFile;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/package-info.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/package-info.java
similarity index 95%
rename from sonar-scanner-engine/src/main/java/org/sonar/scanner/test/package-info.java
rename to sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/package-info.java
index e52c37000b7..d0d8c9b59ed 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/test/package-info.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/deprecated/test/package-info.java
@@ -18,6 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 @ParametersAreNonnullByDefault
-package org.sonar.scanner.test;
+package org.sonar.scanner.deprecated.test;
 
 import javax.annotation.ParametersAreNonnullByDefault;
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/TestExecutionAndCoveragePublisher.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/TestExecutionAndCoveragePublisher.java
index c920a34f0fe..e5f7cc0cbe1 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/TestExecutionAndCoveragePublisher.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/report/TestExecutionAndCoveragePublisher.java
@@ -30,14 +30,14 @@ import org.sonar.api.test.CoverageBlock;
 import org.sonar.api.test.MutableTestCase;
 import org.sonar.api.test.MutableTestPlan;
 import org.sonar.api.test.TestCase;
+import org.sonar.scanner.deprecated.test.DefaultTestable;
+import org.sonar.scanner.deprecated.test.TestPlanBuilder;
 import org.sonar.scanner.index.BatchComponent;
 import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.protocol.output.ScannerReport;
 import org.sonar.scanner.protocol.output.ScannerReport.CoverageDetail;
 import org.sonar.scanner.protocol.output.ScannerReport.Test;
 import org.sonar.scanner.protocol.output.ScannerReport.Test.TestStatus;
-import org.sonar.scanner.test.DefaultTestable;
-import org.sonar.scanner.test.TestPlanBuilder;
 import org.sonar.scanner.protocol.output.ScannerReportWriter;
 
 public class TestExecutionAndCoveragePublisher implements ReportPublisherStep {
diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
index 310acabe741..c7c34eb64d2 100644
--- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
+++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/scan/ProjectScanContainer.java
@@ -42,6 +42,8 @@ import org.sonar.scanner.bootstrap.ExtensionUtils;
 import org.sonar.scanner.bootstrap.MetricProvider;
 import org.sonar.scanner.cpd.CpdExecutor;
 import org.sonar.scanner.cpd.index.SonarCpdBlockIndex;
+import org.sonar.scanner.deprecated.test.TestPlanBuilder;
+import org.sonar.scanner.deprecated.test.TestableBuilder;
 import org.sonar.scanner.events.EventBus;
 import org.sonar.scanner.index.BatchComponentCache;
 import org.sonar.scanner.index.DefaultIndex;
@@ -90,8 +92,6 @@ import org.sonar.scanner.scan.measure.DeprecatedMetricFinder;
 import org.sonar.scanner.scan.measure.MeasureCache;
 import org.sonar.scanner.source.CodeColorizers;
 import org.sonar.scanner.storage.Storages;
-import org.sonar.scanner.test.TestPlanBuilder;
-import org.sonar.scanner.test.TestableBuilder;
 
 public class ProjectScanContainer extends ComponentContainer {
 
-- 
2.39.5