From 0ce4b44063a61a2a36b060148075000a73fb1342 Mon Sep 17 00:00:00 2001 From: guwirth Date: Mon, 4 Jan 2016 18:13:03 +0100 Subject: [PATCH] NUnit support update sonar-dotnet-tests-library to 1.2 use "sonar.cxx.nunit.reportsPaths" for NUnit reports rename derived classes from MSTestXxx to CxxUnitTestXxx clean-up folder structure (tests/xunit and tests/dotnet) close #722 --- pom.xml | 2 +- .../java/org/sonar/plugins/cxx/CxxPlugin.java | 21 ++++++++---- .../dotnet/CxxUnitTestResultsProvider.java} | 21 ++++++------ .../cxx/tests/dotnet/package-info.java | 27 ++++++++++++++++ .../cxx/{ => tests}/xunit/CxxXunitSensor.java | 2 +- .../cxx/{ => tests}/xunit/TestCase.java | 2 +- .../cxx/{ => tests}/xunit/TestFile.java | 2 +- .../{ => tests}/xunit/XunitReportParser.java | 2 +- .../cxx/{ => tests}/xunit/package-info.java | 2 +- .../org/sonar/plugins/cxx/CxxPluginTest.java | 2 +- .../CxxUnitTestResultsProviderTest.java} | 32 ++++++++++--------- .../{ => tests}/xunit/CxxXunitSensorTest.java | 2 +- .../cxx/{ => tests}/xunit/TestCaseTest.java | 2 +- .../cxx/{ => tests}/xunit/TestFileTest.java | 2 +- .../xunit/XunitReportParserTest.java | 2 +- 15 files changed, 80 insertions(+), 43 deletions(-) rename sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/{xunit/MSTestResultsProvider.java => tests/dotnet/CxxUnitTestResultsProvider.java} (66%) create mode 100644 sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/dotnet/package-info.java rename sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/{ => tests}/xunit/CxxXunitSensor.java (99%) rename sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/{ => tests}/xunit/TestCase.java (99%) rename sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/{ => tests}/xunit/TestFile.java (98%) rename sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/{ => tests}/xunit/XunitReportParser.java (99%) rename sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/{ => tests}/xunit/package-info.java (95%) rename sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/{xunit/MSTestResultsProviderTest.java => tests/dotnet/CxxUnitTestResultsProviderTest.java} (75%) rename sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/{ => tests}/xunit/CxxXunitSensorTest.java (99%) rename sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/{ => tests}/xunit/TestCaseTest.java (97%) rename sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/{ => tests}/xunit/TestFileTest.java (98%) rename sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/{ => tests}/xunit/XunitReportParserTest.java (98%) diff --git a/pom.xml b/pom.xml index e862f700ef..41874d52c3 100644 --- a/pom.xml +++ b/pom.xml @@ -222,7 +222,7 @@ org.codehaus.sonar.dotnet.tests sonar-dotnet-tests-library - 1.1.2 + 1.2 org.hamcrest diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java index 18e53e6280..2aeef3f76a 100644 --- a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java +++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java @@ -45,10 +45,10 @@ import org.sonar.plugins.cxx.valgrind.CxxValgrindSensor; import org.sonar.plugins.cxx.veraxx.CxxVeraxxRuleRepository; import org.sonar.plugins.cxx.veraxx.CxxVeraxxSensor; -import org.sonar.plugins.cxx.xunit.CxxXunitSensor; -import org.sonar.plugins.cxx.xunit.MSTestResultsProvider; -import org.sonar.plugins.cxx.xunit.MSTestResultsProvider.MSTestResultsAggregator; -import org.sonar.plugins.cxx.xunit.MSTestResultsProvider.MSTestResultsImportSensor; +import org.sonar.plugins.cxx.tests.xunit.CxxXunitSensor; +import org.sonar.plugins.cxx.tests.dotnet.CxxUnitTestResultsProvider; +import org.sonar.plugins.cxx.tests.dotnet.CxxUnitTestResultsProvider.CxxUnitTestResultsAggregator; +import org.sonar.plugins.cxx.tests.dotnet.CxxUnitTestResultsProvider.CxxUnitTestResultsImportSensor; import org.sonar.plugins.cxx.utils.CxxMetrics; import com.google.common.collect.ImmutableList; @@ -374,12 +374,19 @@ private static List testingAndCoverageProperties() { .type(PropertyType.BOOLEAN) .index(7) .build(), - PropertyDefinition.builder(MSTestResultsProvider.VISUAL_STUDIO_TEST_RESULTS_PROPERTY_KEY) + PropertyDefinition.builder(CxxUnitTestResultsProvider.VISUAL_STUDIO_TEST_RESULTS_PROPERTY_KEY) .name("Visual Studio Test Reports Paths") .description("Example: \"report.trx\", \"report1.trx,report2.trx\" or \"C:/report.trx\"") .subCategory(subcateg) .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE) .index(8) + .build(), + PropertyDefinition.builder(CxxUnitTestResultsProvider.NUNIT_TEST_RESULTS_PROPERTY_KEY) + .name("Nunit Test Reports Paths") + .description("Example: \"nunit.xml\", \"nunit1.xml,nunit2.xml\" or \"C:/nunit.xml\"") + .subCategory(subcateg) + .onQualifiers(Qualifiers.PROJECT, Qualifiers.MODULE) + .index(9) .build() ); } @@ -415,8 +422,8 @@ public List getExtensions() { l.add(CxxExternalRulesSensor.class); l.add(CxxExternalRuleRepository.class); l.add(CxxRuleRepository.class); - l.add(MSTestResultsAggregator.class); - l.add(MSTestResultsImportSensor.class); + l.add(CxxUnitTestResultsAggregator.class); + l.add(CxxUnitTestResultsImportSensor.class); l.add(CxxSourceCodeColorizer.class); l.addAll(generalProperties()); diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/MSTestResultsProvider.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/dotnet/CxxUnitTestResultsProvider.java similarity index 66% rename from sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/MSTestResultsProvider.java rename to sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/dotnet/CxxUnitTestResultsProvider.java index 074ec7914c..eb96fad379 100644 --- a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/MSTestResultsProvider.java +++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/dotnet/CxxUnitTestResultsProvider.java @@ -17,32 +17,33 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.dotnet; import org.sonar.api.config.Settings; import org.sonar.plugins.dotnet.tests.UnitTestConfiguration; import org.sonar.plugins.dotnet.tests.UnitTestResultsAggregator; import org.sonar.plugins.dotnet.tests.UnitTestResultsImportSensor; -public class MSTestResultsProvider { +public class CxxUnitTestResultsProvider { public static final String VISUAL_STUDIO_TEST_RESULTS_PROPERTY_KEY = "sonar.cxx.vstest.reportsPaths"; - private static final UnitTestConfiguration UNIT_TEST_CONF = new UnitTestConfiguration(VISUAL_STUDIO_TEST_RESULTS_PROPERTY_KEY); - - private MSTestResultsProvider() { + public static final String NUNIT_TEST_RESULTS_PROPERTY_KEY = "sonar.cxx.nunit.reportsPaths"; + private static final UnitTestConfiguration UNIT_TEST_CONF = new UnitTestConfiguration(VISUAL_STUDIO_TEST_RESULTS_PROPERTY_KEY, NUNIT_TEST_RESULTS_PROPERTY_KEY); + + private CxxUnitTestResultsProvider() { } - public static class MSTestResultsAggregator extends UnitTestResultsAggregator { + public static class CxxUnitTestResultsAggregator extends UnitTestResultsAggregator { - public MSTestResultsAggregator(Settings settings) { + public CxxUnitTestResultsAggregator(Settings settings) { super(UNIT_TEST_CONF, settings); } } - public static class MSTestResultsImportSensor extends UnitTestResultsImportSensor { - - public MSTestResultsImportSensor(MSTestResultsAggregator unitTestResultsAggregator) { + public static class CxxUnitTestResultsImportSensor extends UnitTestResultsImportSensor { + + public CxxUnitTestResultsImportSensor(CxxUnitTestResultsAggregator unitTestResultsAggregator) { super(unitTestResultsAggregator); } diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/dotnet/package-info.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/dotnet/package-info.java new file mode 100644 index 0000000000..6bd195f456 --- /dev/null +++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/dotnet/package-info.java @@ -0,0 +1,27 @@ +/* + * Sonar C++ Plugin (Community) + * Copyright (C) 2010 Neticoa SAS France + * sonarqube@googlegroups.com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 + */ + +/** + * Package with sensor to evaluate Unit Test specific report files. + */ +@ParametersAreNonnullByDefault +package org.sonar.plugins.cxx.tests.dotnet; + +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/CxxXunitSensor.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/CxxXunitSensor.java similarity index 99% rename from sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/CxxXunitSensor.java rename to sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/CxxXunitSensor.java index 7cf771490c..93bece1ed1 100644 --- a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/CxxXunitSensor.java +++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/CxxXunitSensor.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import java.io.File; import java.io.InputStream; diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/TestCase.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/TestCase.java similarity index 99% rename from sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/TestCase.java rename to sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/TestCase.java index 135fe0819f..b5cff21490 100644 --- a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/TestCase.java +++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/TestCase.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import org.apache.commons.lang.StringEscapeUtils; diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/TestFile.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/TestFile.java similarity index 98% rename from sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/TestFile.java rename to sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/TestFile.java index 0da81dd120..34a0a8953d 100644 --- a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/TestFile.java +++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/TestFile.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import java.util.ArrayList; import java.util.List; diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/XunitReportParser.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/XunitReportParser.java similarity index 99% rename from sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/XunitReportParser.java rename to sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/XunitReportParser.java index 7495a9ff8a..4e97800e29 100644 --- a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/XunitReportParser.java +++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/XunitReportParser.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import java.text.ParseException; import java.util.LinkedList; diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/package-info.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/package-info.java similarity index 95% rename from sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/package-info.java rename to sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/package-info.java index 11d75b919e..fa06c2192e 100644 --- a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/xunit/package-info.java +++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/tests/xunit/package-info.java @@ -22,6 +22,6 @@ * Package with sensor to evaluate Unit Test specific report files. */ @ParametersAreNonnullByDefault -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import javax.annotation.ParametersAreNonnullByDefault; diff --git a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/CxxPluginTest.java b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/CxxPluginTest.java index d17f53b7e5..5eed0cb91d 100644 --- a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/CxxPluginTest.java +++ b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/CxxPluginTest.java @@ -28,6 +28,6 @@ public class CxxPluginTest { @Test public void testGetExtensions() throws Exception { CxxPlugin plugin = new CxxPlugin(); - assertEquals(63, plugin.getExtensions().size()); + assertEquals(64, plugin.getExtensions().size()); } } diff --git a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/MSTestResultsProviderTest.java b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/dotnet/CxxUnitTestResultsProviderTest.java similarity index 75% rename from sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/MSTestResultsProviderTest.java rename to sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/dotnet/CxxUnitTestResultsProviderTest.java index afa229cd90..cfa9953fd3 100644 --- a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/MSTestResultsProviderTest.java +++ b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/dotnet/CxxUnitTestResultsProviderTest.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.dotnet; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -32,19 +32,21 @@ import org.sonar.api.batch.SensorContext; import org.sonar.api.batch.fs.internal.DefaultFileSystem; import org.sonar.plugins.cxx.TestUtils; -import org.sonar.plugins.cxx.xunit.MSTestResultsProvider.MSTestResultsAggregator; -import org.sonar.plugins.cxx.xunit.MSTestResultsProvider.MSTestResultsImportSensor; +import org.sonar.plugins.cxx.tests.dotnet.CxxUnitTestResultsProvider.CxxUnitTestResultsAggregator; +import org.sonar.plugins.cxx.tests.dotnet.CxxUnitTestResultsProvider.CxxUnitTestResultsImportSensor; import org.sonar.plugins.dotnet.tests.UnitTestResults; import org.sonar.plugins.dotnet.tests.UnitTestResultsImportSensor; +import org.sonar.plugins.dotnet.tests.WildcardPatternFileProvider; import com.google.common.collect.ImmutableList; -public class MSTestResultsProviderTest { +public class CxxUnitTestResultsProviderTest { + private Project project; private SensorContext context; - private MSTestResultsAggregator resultsAggregator; - private MSTestResultsImportSensor sensor; + private CxxUnitTestResultsAggregator resultsAggregator; + private CxxUnitTestResultsImportSensor sensor; @Before public void setUp() { @@ -56,7 +58,7 @@ public void setUp() { @Test public void should_execute_on_project() { - resultsAggregator = mock(MSTestResultsAggregator.class); + resultsAggregator = mock(CxxUnitTestResultsAggregator.class); when(resultsAggregator.hasUnitTestResultsProperty()).thenReturn(true); assertThat(new UnitTestResultsImportSensor(resultsAggregator).shouldExecuteOnProject(project)).isTrue(); @@ -67,11 +69,11 @@ public void should_execute_on_project() { @Test public void should_not_analyze_on_reactor_project() { - when(project.isRoot()).thenReturn(true); + when(project.isRoot()).thenReturn(false); when(project.getModules()).thenReturn(ImmutableList.of(mock(Project.class))); - resultsAggregator = mock(MSTestResultsAggregator.class); - sensor = new MSTestResultsImportSensor(resultsAggregator); + resultsAggregator = mock(CxxUnitTestResultsAggregator.class); + sensor = new CxxUnitTestResultsImportSensor(resultsAggregator); sensor.analyse(project, context); verify(context, Mockito.never()).saveMeasure(Mockito.any(Metric.class), Mockito.anyDouble()); @@ -79,19 +81,19 @@ public void should_not_analyze_on_reactor_project() { @Test public void should_analyze_on_multi_module_modules() { - when(project.isRoot()).thenReturn(false); + when(project.isRoot()).thenReturn(true); - resultsAggregator = mock(MSTestResultsAggregator.class); + resultsAggregator = mock(CxxUnitTestResultsAggregator.class); UnitTestResults results = mock(UnitTestResults.class); when(results.tests()).thenReturn(1.0); when(results.passedPercentage()).thenCallRealMethod(); when(results.skipped()).thenReturn(0.0); - when(results.failed()).thenReturn(1.0); + when(results.failures()).thenReturn(1.0); when(results.errors()).thenReturn(0.0); - when(resultsAggregator.aggregate(Mockito.any(UnitTestResults.class))).thenReturn(results); - sensor = new MSTestResultsImportSensor(resultsAggregator); + when(resultsAggregator.aggregate(Mockito.any(WildcardPatternFileProvider.class), Mockito.any(UnitTestResults.class))).thenReturn(results); + sensor = new CxxUnitTestResultsImportSensor(resultsAggregator); sensor.analyse(project, context); verify(context, Mockito.atLeastOnce()).saveMeasure(Mockito.any(Metric.class), Mockito.anyDouble()); diff --git a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/CxxXunitSensorTest.java b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/CxxXunitSensorTest.java similarity index 99% rename from sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/CxxXunitSensorTest.java rename to sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/CxxXunitSensorTest.java index 64110cd992..d27c6800c5 100644 --- a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/CxxXunitSensorTest.java +++ b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/CxxXunitSensorTest.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import static org.hamcrest.core.AnyOf.anyOf; import static org.hamcrest.core.Is.is; diff --git a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/TestCaseTest.java b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/TestCaseTest.java similarity index 97% rename from sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/TestCaseTest.java rename to sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/TestCaseTest.java index edfd78e2c0..c88b143ea1 100644 --- a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/TestCaseTest.java +++ b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/TestCaseTest.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import static org.junit.Assert.assertEquals; diff --git a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/TestFileTest.java b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/TestFileTest.java similarity index 98% rename from sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/TestFileTest.java rename to sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/TestFileTest.java index 36ef3af97b..893aa75444 100644 --- a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/TestFileTest.java +++ b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/TestFileTest.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import org.sonar.api.batch.fs.InputFile; import org.sonar.api.batch.fs.internal.DefaultInputFile; diff --git a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/XunitReportParserTest.java b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/XunitReportParserTest.java similarity index 98% rename from sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/XunitReportParserTest.java rename to sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/XunitReportParserTest.java index 4c2a27b076..bee0689094 100644 --- a/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/xunit/XunitReportParserTest.java +++ b/sonar-cxx-plugin/src/test/java/org/sonar/plugins/cxx/tests/xunit/XunitReportParserTest.java @@ -17,7 +17,7 @@ * License along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02 */ -package org.sonar.plugins.cxx.xunit; +package org.sonar.plugins.cxx.tests.xunit; import static org.junit.Assert.assertEquals;