diff options
Diffstat (limited to 'sonar-batch/src/test')
8 files changed, 86 insertions, 61 deletions
diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/BucketTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/BucketTest.java index 62cbb1e5d04..2fc521a64d5 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/BucketTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/BucketTest.java @@ -23,26 +23,26 @@ import org.junit.Test; import org.sonar.api.measures.Measure; import org.sonar.api.measures.MeasuresFilters; import org.sonar.api.measures.Metric; -import org.sonar.api.resources.JavaFile; -import org.sonar.api.resources.JavaPackage; -import org.sonar.api.rules.Rule; -import org.sonar.api.rules.Violation; +import org.sonar.api.resources.Directory; +import org.sonar.api.resources.File; import org.sonar.api.utils.SonarException; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.core.IsNot.not; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThat; import static org.junit.internal.matchers.IsCollectionContaining.hasItem; public class BucketTest { - JavaPackage javaPackage = new JavaPackage("org.foo"); - JavaFile javaFile = new JavaFile("org.foo.Bar"); + Directory directory = new Directory("org/foo"); + File javaFile = new File("org/foo/Bar.java"); Metric ncloc = new Metric("ncloc"); @Test public void shouldManageRelationships() { - Bucket packageBucket = new Bucket(javaPackage); + Bucket packageBucket = new Bucket(directory); Bucket fileBucket = new Bucket(javaFile); fileBucket.setParent(packageBucket); @@ -89,13 +89,13 @@ public class BucketTest { @Test public void shouldBeEquals() { - assertEquals(new Bucket(javaPackage), new Bucket(javaPackage)); - assertEquals(new Bucket(javaPackage).hashCode(), new Bucket(javaPackage).hashCode()); + assertEquals(new Bucket(directory), new Bucket(directory)); + assertEquals(new Bucket(directory).hashCode(), new Bucket(directory).hashCode()); } @Test public void shouldNotBeEquals() { - assertFalse(new Bucket(javaPackage).equals(new Bucket(javaFile))); - assertThat(new Bucket(javaPackage).hashCode(), not(is(new Bucket(javaFile).hashCode()))); + assertFalse(new Bucket(directory).equals(new Bucket(javaFile))); + assertThat(new Bucket(directory).hashCode(), not(is(new Bucket(javaFile).hashCode()))); } } diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java index 7ce169a9dae..a89a72bdd87 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/DefaultResourcePersisterTest.java @@ -26,8 +26,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.sonar.api.database.model.ResourceModel; import org.sonar.api.resources.Directory; -import org.sonar.api.resources.JavaFile; -import org.sonar.api.resources.JavaPackage; +import org.sonar.api.resources.File; import org.sonar.api.resources.Library; import org.sonar.api.resources.Project; import org.sonar.api.security.ResourcePermissions; @@ -172,8 +171,8 @@ public class DefaultResourcePersisterTest extends AbstractDbUnitTestCase { DefaultResourcePersister persister = new DefaultResourcePersister(getSession(), mock(ResourcePermissions.class), snapshotCache, resourceCache); persister.saveProject(multiModuleProject, null); persister.saveProject(moduleA, multiModuleProject); - persister.saveResource(moduleA, new JavaPackage("org.foo").setEffectiveKey("a:org.foo")); - persister.saveResource(moduleA, new JavaFile("org.foo.MyClass").setEffectiveKey("a:org.foo.MyClass")); + persister.saveResource(moduleA, new Directory("org/foo").setEffectiveKey("a:org/foo")); + persister.saveResource(moduleA, new File("org/foo/MyClass.java").setEffectiveKey("a:org/foo/MyClass.java")); persister.clear(); assertThat(persister.getSnapshotsByResource().size(), is(2)); diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java index f67844538c7..fc3a69628d2 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/MeasurePersisterTest.java @@ -26,9 +26,13 @@ import org.junit.rules.ExpectedException; import org.mockito.ArgumentCaptor; import org.sonar.api.database.model.MeasureModel; import org.sonar.api.database.model.Snapshot; -import org.sonar.api.measures.*; -import org.sonar.api.resources.JavaFile; -import org.sonar.api.resources.JavaPackage; +import org.sonar.api.measures.CoreMetrics; +import org.sonar.api.measures.Measure; +import org.sonar.api.measures.Metric; +import org.sonar.api.measures.PersistenceMode; +import org.sonar.api.measures.RuleMeasure; +import org.sonar.api.resources.Directory; +import org.sonar.api.resources.File; import org.sonar.api.resources.Project; import org.sonar.api.rules.Rule; import org.sonar.api.rules.RuleFinder; @@ -39,7 +43,9 @@ import org.sonar.core.persistence.AbstractDaoTestCase; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; public class MeasurePersisterTest extends AbstractDaoTestCase { @@ -60,17 +66,17 @@ public class MeasurePersisterTest extends AbstractDaoTestCase { ResourcePersister resourcePersister = mock(ResourcePersister.class); MemoryOptimizer memoryOptimizer = mock(MemoryOptimizer.class); Project project = new Project("foo"); - JavaPackage aPackage = new JavaPackage("org.foo"); - JavaFile aFile = new JavaFile("org.foo.Bar"); + Directory aDirectory = new Directory("org/foo"); + File aFile = new File("org/foo/Bar.java"); Snapshot projectSnapshot = snapshot(PROJECT_SNAPSHOT_ID); Snapshot packageSnapshot = snapshot(PACKAGE_SNAPSHOT_ID); @Before public void mockResourcePersister() { when(resourcePersister.getSnapshotOrFail(project)).thenReturn(projectSnapshot); - when(resourcePersister.getSnapshotOrFail(aPackage)).thenReturn(packageSnapshot); + when(resourcePersister.getSnapshotOrFail(aDirectory)).thenReturn(packageSnapshot); when(resourcePersister.getSnapshot(project)).thenReturn(projectSnapshot); - when(resourcePersister.getSnapshot(aPackage)).thenReturn(packageSnapshot); + when(resourcePersister.getSnapshot(aDirectory)).thenReturn(packageSnapshot); measurePersister = new MeasurePersister(getMyBatis(), resourcePersister, ruleFinder, memoryOptimizer); } @@ -160,7 +166,7 @@ public class MeasurePersisterTest extends AbstractDaoTestCase { setupData("empty"); measurePersister.saveMeasure(project, new Measure(ncloc()).setValue(200.0)); - measurePersister.saveMeasure(aPackage, new Measure(ncloc()).setValue(300.0)); + measurePersister.saveMeasure(aDirectory, new Measure(ncloc()).setValue(300.0)); checkTables("shouldAlwaysPersistNonFileMeasures", "project_measures"); } @@ -171,7 +177,7 @@ public class MeasurePersisterTest extends AbstractDaoTestCase { measurePersister.saveMeasure(project, new Measure(coverage()).setValue(12.5).setId(1L)); measurePersister.saveMeasure(project, new Measure(coverage()).setData(SHORT).setId(2L)); - measurePersister.saveMeasure(aPackage, new Measure(coverage()).setData(LONG).setId(3L)); + measurePersister.saveMeasure(aDirectory, new Measure(coverage()).setData(LONG).setId(3L)); checkTables("shouldUpdateMeasure", "project_measures", "measure_data"); } @@ -196,7 +202,7 @@ public class MeasurePersisterTest extends AbstractDaoTestCase { measurePersister.setDelayedMode(true); measurePersister.saveMeasure(project, new Measure(ncloc()).setValue(1234.0).setData(SHORT)); - measurePersister.saveMeasure(aPackage, new Measure(ncloc()).setValue(50.0).setData(LONG)); + measurePersister.saveMeasure(aDirectory, new Measure(ncloc()).setValue(50.0).setData(LONG)); assertEmptyTables("project_measures"); @@ -224,7 +230,7 @@ public class MeasurePersisterTest extends AbstractDaoTestCase { measurePersister.setDelayedMode(true); measurePersister.saveMeasure(project, new Measure(ncloc()).setValue(1234.0).setPersistenceMode(PersistenceMode.DATABASE)); - measurePersister.saveMeasure(aPackage, new Measure(ncloc()).setValue(50.0)); + measurePersister.saveMeasure(aDirectory, new Measure(ncloc()).setValue(50.0)); checkTables("shouldInsertMeasure", "project_measures"); } diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/ResourceCacheTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/ResourceCacheTest.java index 7a6014c22cc..20e04957309 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/ResourceCacheTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/ResourceCacheTest.java @@ -20,7 +20,7 @@ package org.sonar.batch.index; import org.junit.Test; -import org.sonar.api.resources.JavaFile; +import org.sonar.api.resources.File; import org.sonar.api.resources.Resource; import static org.fest.assertions.Assertions.assertThat; @@ -30,8 +30,8 @@ public class ResourceCacheTest { @Test public void should_cache_resource() throws Exception { ResourceCache cache = new ResourceCache(); - String componentKey = "struts:org.struts.Action"; - Resource resource = new JavaFile("org.struts.Action").setEffectiveKey(componentKey); + String componentKey = "struts:src/org/struts/Action.java"; + Resource resource = new File("org/struts/Action.java").setEffectiveKey(componentKey); cache.add(resource); assertThat(cache.get(componentKey)).isSameAs(resource); @@ -41,7 +41,7 @@ public class ResourceCacheTest { @Test public void should_fail_if_missing_component_key() throws Exception { ResourceCache cache = new ResourceCache(); - Resource resource = new JavaFile("org.struts.Action").setEffectiveKey(null); + Resource resource = new File("org/struts/Action.java").setEffectiveKey(null); try { cache.add(resource); fail(); diff --git a/sonar-batch/src/test/java/org/sonar/batch/index/SourcePersisterTest.java b/sonar-batch/src/test/java/org/sonar/batch/index/SourcePersisterTest.java index c30991832d9..39f4095ccd2 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/index/SourcePersisterTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/index/SourcePersisterTest.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.sonar.api.database.model.Snapshot; import org.sonar.api.resources.DuplicatedSourceException; -import org.sonar.api.resources.JavaFile; +import org.sonar.api.resources.File; import org.sonar.api.resources.Resource; import org.sonar.jpa.test.AbstractDbUnitTestCase; @@ -46,13 +46,13 @@ public class SourcePersisterTest extends AbstractDbUnitTestCase { @Test public void shouldSaveSource() { - sourcePersister.saveSource(new JavaFile("org.foo.Bar"), "this is the file content"); + sourcePersister.saveSource(new File("org/foo/Bar.java"), "this is the file content"); checkTables("shouldSaveSource", "snapshot_sources"); } @Test(expected = DuplicatedSourceException.class) public void shouldFailIfSourceSavedSeveralTimes() { - JavaFile file = new JavaFile("org.foo.Bar"); + File file = new File("org/foo/Bar.java"); sourcePersister.saveSource(file, "this is the file content"); sourcePersister.saveSource(file, "new content"); // fail } diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java index 48f3315445c..d11d0a72111 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/issue/IssuableFactoryTest.java @@ -24,10 +24,8 @@ import org.mockito.Mockito; import org.sonar.api.component.Component; import org.sonar.api.issue.Issuable; import org.sonar.api.resources.File; -import org.sonar.api.resources.JavaFile; import org.sonar.api.resources.Project; import org.sonar.core.component.ResourceComponent; -import org.sonar.java.api.JavaClass; import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Mockito.mock; @@ -58,24 +56,4 @@ public class IssuableFactoryTest { assertThat(issuable.component()).isSameAs(component); assertThat(issuable.issues()).isEmpty(); } - - @Test - public void java_file_should_be_issuable() throws Exception { - IssuableFactory factory = new IssuableFactory(moduleIssues, cache); - Component component = new ResourceComponent(new JavaFile("org.apache.Action").setEffectiveKey("struts:org.apache.Action")); - Issuable issuable = factory.loadPerspective(Issuable.class, component); - - assertThat(issuable).isNotNull(); - assertThat(issuable.component()).isSameAs(component); - assertThat(issuable.issues()).isEmpty(); - } - - @Test - public void java_class_should_not_be_issuable() throws Exception { - IssuableFactory factory = new IssuableFactory(moduleIssues, cache); - Component component = new ResourceComponent(JavaClass.create("org.apache.Action").setEffectiveKey("struts:org.apache.Action")); - Issuable issuable = factory.loadPerspective(Issuable.class, component); - - assertThat(issuable).isNull(); - } } diff --git a/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java b/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java index f5b920c3b3c..5a5f8ef282d 100644 --- a/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java +++ b/sonar-batch/src/test/java/org/sonar/batch/issue/ModuleIssuesTest.java @@ -30,7 +30,7 @@ import org.sonar.api.batch.rule.DebtRemediationFunction; import org.sonar.api.batch.rule.internal.ActiveRulesBuilder; import org.sonar.api.batch.rule.internal.RulesBuilder; import org.sonar.api.issue.internal.DefaultIssue; -import org.sonar.api.resources.JavaFile; +import org.sonar.api.resources.File; import org.sonar.api.resources.Project; import org.sonar.api.resources.Resource; import org.sonar.api.rule.RuleKey; @@ -47,7 +47,9 @@ import static org.fest.assertions.Assertions.assertThat; import static org.fest.assertions.Fail.fail; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.verifyZeroInteractions; +import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) public class ModuleIssuesTest { @@ -205,7 +207,7 @@ public class ModuleIssuesTest { initModuleIssues(); org.sonar.api.rules.Rule rule = org.sonar.api.rules.Rule.create("squid", "AvoidCycle", "Avoid Cycle"); - Resource resource = new JavaFile("org.struts.Action").setEffectiveKey("struts:org.struts.Action"); + Resource resource = new File("org/struts/Action.java").setEffectiveKey("struts:src/org/struts/Action.java"); Violation violation = new Violation(rule, resource); violation.setLineId(42); violation.setSeverity(RulePriority.CRITICAL); @@ -224,7 +226,7 @@ public class ModuleIssuesTest { assertThat(issue.message()).isEqualTo("the message"); assertThat(issue.key()).isNotEmpty(); assertThat(issue.ruleKey().toString()).isEqualTo("squid:AvoidCycle"); - assertThat(issue.componentKey()).isEqualTo("struts:org.struts.Action"); + assertThat(issue.componentKey()).isEqualTo("struts:src/org/struts/Action.java"); } @Test diff --git a/sonar-batch/src/test/java/org/sonar/batch/util/DeprecatedKeyUtilsTest.java b/sonar-batch/src/test/java/org/sonar/batch/util/DeprecatedKeyUtilsTest.java new file mode 100644 index 00000000000..989bcd27ceb --- /dev/null +++ b/sonar-batch/src/test/java/org/sonar/batch/util/DeprecatedKeyUtilsTest.java @@ -0,0 +1,40 @@ +/* + * SonarQube, open source software quality management tool. + * Copyright (C) 2008-2014 SonarSource + * mailto:contact AT sonarsource DOT com + * + * SonarQube is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * SonarQube is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.sonar.batch.util; + +import org.junit.Test; + +import static org.fest.assertions.Assertions.assertThat; + +public class DeprecatedKeyUtilsTest { + + @Test + public void testGetJavaFileParentDeprecatedKey() { + assertThat(DeprecatedKeyUtils.getJavaFileParentDeprecatedKey("org.foo.bar.Hello")).isEqualTo("org/foo/bar"); + assertThat(DeprecatedKeyUtils.getJavaFileParentDeprecatedKey("[default].Hello")).isEqualTo("[root]"); + assertThat(DeprecatedKeyUtils.getJavaFileParentDeprecatedKey("Hello")).isEqualTo("[root]"); + } + + @Test + public void testGetJavaFileDeprecatedKey() { + assertThat(DeprecatedKeyUtils.getJavaFileDeprecatedKey("org/foo/bar/Hello.java")).isEqualTo("org.foo.bar.Hello"); + assertThat(DeprecatedKeyUtils.getJavaFileDeprecatedKey("Hello.java")).isEqualTo("[default].Hello"); + } +} |