NET-781 Move sensor test files into subfolder

SonarSource · Nov 28, 2024 · 2249e84 · 2249e84
1 parent d904f76
commit 2249e84
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 17 deletions.
diff --git a/.../plugins/AbstractFileCacheSensorTest.java → .../sensors/AbstractFileCacheSensorTest.java b/.../plugins/AbstractFileCacheSensorTest.java → .../sensors/AbstractFileCacheSensorTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonarsource.dotnet.shared.plugins;
+package org.sonarsource.dotnet.shared.plugins.sensors;
 
 import java.io.File;
 import java.io.IOException;
@@ -32,7 +32,8 @@
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.config.internal.MapSettings;
 import org.sonar.api.testfixtures.log.LogTester;
-import org.sonarsource.dotnet.shared.plugins.sensors.AbstractFileCacheSensor;
+import org.sonarsource.dotnet.shared.plugins.HashProvider;
+import org.sonarsource.dotnet.shared.plugins.PluginMetadata;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;

diff --git a/...d/plugins/AnalysisWarningsSensorTest.java → ...s/sensors/AnalysisWarningsSensorTest.java b/...d/plugins/AnalysisWarningsSensorTest.java → ...s/sensors/AnalysisWarningsSensorTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonarsource.dotnet.shared.plugins;
+package org.sonarsource.dotnet.shared.plugins.sensors;
 
 import java.io.File;
 import java.io.IOException;
@@ -33,7 +33,6 @@
 import org.sonar.api.notifications.AnalysisWarnings;
 import org.sonar.api.testfixtures.log.LogTester;
 import org.slf4j.event.Level;
-import org.sonarsource.dotnet.shared.plugins.sensors.AnalysisWarningsSensor;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.anyString;

diff --git a/...tnet/shared/plugins/DotNetSensorTest.java → ...red/plugins/sensors/DotNetSensorTest.java b/...tnet/shared/plugins/DotNetSensorTest.java → ...red/plugins/sensors/DotNetSensorTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonarsource.dotnet.shared.plugins;
+package org.sonarsource.dotnet.shared.plugins.sensors;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -41,7 +41,13 @@
 import org.sonar.api.rule.RuleKey;
 import org.sonar.api.scanner.sensor.ProjectSensor;
 import org.sonar.api.testfixtures.log.LogTester;
-import org.sonarsource.dotnet.shared.plugins.sensors.DotNetSensor;
+import org.sonarsource.dotnet.shared.plugins.PluginMetadata;
+import org.sonarsource.dotnet.shared.plugins.ProjectTypeCollector;
+import org.sonarsource.dotnet.shared.plugins.ProtobufDataImporter;
+import org.sonarsource.dotnet.shared.plugins.RealPathProvider;
+import org.sonarsource.dotnet.shared.plugins.ReportPathCollector;
+import org.sonarsource.dotnet.shared.plugins.RoslynDataImporter;
+import org.sonarsource.dotnet.shared.plugins.RoslynReport;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;

diff --git a/...et/shared/plugins/FileTypeSensorTest.java → ...d/plugins/sensors/FileTypeSensorTest.java b/...et/shared/plugins/FileTypeSensorTest.java → ...d/plugins/sensors/FileTypeSensorTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonarsource.dotnet.shared.plugins;
+package org.sonarsource.dotnet.shared.plugins.sensors;
 
 import java.io.File;
 import org.junit.Before;
@@ -30,7 +30,8 @@
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.config.internal.MapSettings;
 import org.sonar.api.testfixtures.log.LogTester;
-import org.sonarsource.dotnet.shared.plugins.sensors.FileTypeSensor;
+import org.sonarsource.dotnet.shared.plugins.PluginMetadata;
+import org.sonarsource.dotnet.shared.plugins.ProjectTypeCollector;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;

diff --git a/.../dotnet/shared/plugins/LogSensorTest.java → ...shared/plugins/sensors/LogSensorTest.java b/.../dotnet/shared/plugins/LogSensorTest.java → ...shared/plugins/sensors/LogSensorTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonarsource.dotnet.shared.plugins;
+package org.sonarsource.dotnet.shared.plugins.sensors;
 
 import java.io.File;
 import java.util.Collections;
@@ -26,7 +26,8 @@
 import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor;
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.testfixtures.log.LogTester;
-import org.sonarsource.dotnet.shared.plugins.sensors.LogSensor;
+import org.sonarsource.dotnet.shared.plugins.ModuleConfiguration;
+import org.sonarsource.dotnet.shared.plugins.PluginMetadata;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;
@@ -48,7 +49,7 @@ public class LogSensorTest {
   private LogSensor sensor;
 
   @Before
-  public void prepare() throws Exception {
+  public void prepare() {
     logTester.setLevel(Level.DEBUG);
     context = SensorContextTester.create(temp.getRoot());
     PluginMetadata metadata = mock(PluginMetadata.class);

diff --git a/.../shared/plugins/PropertiesSensorTest.java → ...plugins/sensors/PropertiesSensorTest.java b/.../shared/plugins/PropertiesSensorTest.java → ...plugins/sensors/PropertiesSensorTest.java
@@ -14,15 +14,18 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonarsource.dotnet.shared.plugins;
+package org.sonarsource.dotnet.shared.plugins.sensors;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collections;
 import org.junit.Test;
 import org.sonar.api.batch.sensor.SensorContext;
 import org.sonar.api.batch.sensor.SensorDescriptor;
-import org.sonarsource.dotnet.shared.plugins.sensors.PropertiesSensor;
+import org.sonarsource.dotnet.shared.plugins.ModuleConfiguration;
+import org.sonarsource.dotnet.shared.plugins.PluginMetadata;
+import org.sonarsource.dotnet.shared.plugins.ReportPathCollector;
+import org.sonarsource.dotnet.shared.plugins.RoslynReport;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;

diff --git a/...hared/plugins/TelemetryProcessorTest.java → ...ugins/sensors/TelemetryProcessorTest.java b/...hared/plugins/TelemetryProcessorTest.java → ...ugins/sensors/TelemetryProcessorTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonarsource.dotnet.shared.plugins;
+package org.sonarsource.dotnet.shared.plugins.sensors;
 
 import java.util.ArrayList;
 import org.apache.commons.lang3.tuple.Pair;
@@ -28,7 +28,8 @@
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.testfixtures.log.LogTester;
 import org.sonarsource.dotnet.protobuf.SonarAnalyzer;
-import org.sonarsource.dotnet.shared.plugins.sensors.TelemetryProcessor;
+import org.sonarsource.dotnet.shared.plugins.PluginMetadata;
+import org.sonarsource.dotnet.shared.plugins.TelemetryCollector;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.anyString;

diff --git a/...t/shared/plugins/TelemetrySensorTest.java → .../plugins/sensors/TelemetrySensorTest.java b/...t/shared/plugins/TelemetrySensorTest.java → .../plugins/sensors/TelemetrySensorTest.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the Sonar Source-Available License
  * along with this program; if not, see https://sonarsource.com/license/ssal/
  */
-package org.sonarsource.dotnet.shared.plugins;
+package org.sonarsource.dotnet.shared.plugins.sensors;
 
 import java.io.File;
 import java.util.Arrays;
@@ -26,7 +26,9 @@
 import org.sonar.api.batch.sensor.internal.DefaultSensorDescriptor;
 import org.sonar.api.batch.sensor.internal.SensorContextTester;
 import org.sonar.api.testfixtures.log.LogTester;
-import org.sonarsource.dotnet.shared.plugins.sensors.TelemetrySensor;
+import org.sonarsource.dotnet.shared.plugins.ModuleConfiguration;
+import org.sonarsource.dotnet.shared.plugins.PluginMetadata;
+import org.sonarsource.dotnet.shared.plugins.TelemetryCollector;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.Mockito.mock;