From 3dca4efaa39052349116c8b2ac9c1917e0e96450 Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Fri, 3 May 2013 23:56:36 +0200 Subject: [PATCH] Replace hamcrest by fest-assert --- .../plugins/core/UserManagedMetricsTest.java | 13 +++--- .../issue/IssueCountersDecoratorTest.java | 18 ++------ .../core/sensors/GenerateAlertEventsTest.java | 28 +++++------- .../core/sensors/ProfileEventsSensorTest.java | 34 +++++++------- .../sensors/ReviewWorkflowDecoratorTest.java | 45 +++++++++---------- .../sensors/ReviewsMeasuresDecoratorTest.java | 28 +++--------- .../core/sensors/SeverityUtilsTest.java | 8 ++-- .../core/sensors/UnitTestDecoratorTest.java | 21 +++++---- .../core/timemachine/SourceChecksumTest.java | 28 ++++++------ .../tracking/StringTextComparatorTest.java | 15 +++---- .../timemachine/tracking/StringTextTest.java | 7 ++- .../dbcleaner/DbCleanerPluginTest.java | 5 +-- .../org/sonar/wsclient/issue/NewIssue.java | 2 +- .../java/org/sonar/wsclient/issue/Paging.java | 1 + 14 files changed, 103 insertions(+), 150 deletions(-) diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/UserManagedMetricsTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/UserManagedMetricsTest.java index 94e8a73ff9b..dbe85919a3a 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/UserManagedMetricsTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/UserManagedMetricsTest.java @@ -19,26 +19,23 @@ */ package org.sonar.plugins.core; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; - import org.junit.Test; import org.sonar.api.measures.Metric; -import org.sonar.plugins.core.UserManagedMetrics; import java.util.List; +import static org.fest.assertions.Assertions.assertThat; + public class UserManagedMetricsTest { @Test public void checkDefinitions() { UserManagedMetrics userManagedMetrics = new UserManagedMetrics(); List metrics = userManagedMetrics.getMetrics(); - assertThat(metrics.size(), greaterThan(2)); + assertThat(metrics.size()).isGreaterThan(2); for (Metric metric : metrics) { - assertThat(metric.getUserManaged(), is(true)); - assertThat(metric.getDomain(), is("Management")); + assertThat(metric.getUserManaged()).isTrue(); + assertThat(metric.getDomain()).isEqualTo("Management"); } } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueCountersDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueCountersDecoratorTest.java index 396e17a2f4b..572f983298d 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueCountersDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/issue/IssueCountersDecoratorTest.java @@ -23,10 +23,9 @@ package org.sonar.plugins.core.issue; import com.google.common.collect.Lists; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.time.DateUtils; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatcher; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.component.ResourcePerspectives; import org.sonar.api.issue.Issuable; @@ -329,7 +328,7 @@ public class IssueCountersDecoratorTest { return issues; } - private class IsVariationRuleMeasure extends BaseMatcher { + private class IsVariationRuleMeasure extends ArgumentMatcher { private Metric metric = null; private Rule rule = null; private Double var1 = null; @@ -352,12 +351,9 @@ public class IssueCountersDecoratorTest { ObjectUtils.equals(var1, m.getVariation1()) && ObjectUtils.equals(var2, m.getVariation2()); } - - public void describeTo(Description arg0) { - } } - private class IsVariationMeasure extends BaseMatcher { + private class IsVariationMeasure extends ArgumentMatcher { private Metric metric = null; private Double var1 = null; private Double var2 = null; @@ -378,12 +374,9 @@ public class IssueCountersDecoratorTest { ObjectUtils.equals(var2, m.getVariation2()) && !(m instanceof RuleMeasure); } - - public void describeTo(Description o) { - } } - private class IsMetricMeasure extends BaseMatcher { + private class IsMetricMeasure extends ArgumentMatcher { private Metric metric = null; public IsMetricMeasure(Metric metric) { @@ -397,8 +390,5 @@ public class IssueCountersDecoratorTest { Measure m = (Measure) o; return ObjectUtils.equals(metric, m.getMetric()); } - - public void describeTo(Description o) { - } } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java index b4cf8c01998..07cd31d1642 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/GenerateAlertEventsTest.java @@ -40,17 +40,11 @@ import java.util.Arrays; import java.util.Date; import static org.fest.assertions.Assertions.assertThat; -import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.isNull; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class GenerateAlertEventsTest { private GenerateAlertEvents decorator; @@ -77,13 +71,13 @@ public class GenerateAlertEventsTest { @Test public void shouldNotDecorateIfNoThresholds() { - assertThat(decorator.shouldExecuteOnProject(project), is(false)); + assertThat(decorator.shouldExecuteOnProject(project)).isFalse(); } @Test public void shouldDecorateIfThresholds() { when(profile.getAlerts()).thenReturn(Arrays.asList(new Alert())); - assertThat(decorator.shouldExecuteOnProject(project), is(true)); + assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); } @Test @@ -195,14 +189,14 @@ public class GenerateAlertEventsTest { private void verifyNotificationSent(String alertName, String alertText, String alertLevel, String isNewAlert) { Notification notification = new Notification("alerts") - .setDefaultMessage("Alert on " + project.getLongName() + ": " + alertName) - .setFieldValue("projectName", project.getLongName()) - .setFieldValue("projectKey", project.getKey()) - .setFieldValue("projectId", String.valueOf(project.getId())) - .setFieldValue("alertName", alertName) - .setFieldValue("alertText", alertText) - .setFieldValue("alertLevel", alertLevel) - .setFieldValue("isNewAlert", isNewAlert); + .setDefaultMessage("Alert on " + project.getLongName() + ": " + alertName) + .setFieldValue("projectName", project.getLongName()) + .setFieldValue("projectKey", project.getKey()) + .setFieldValue("projectId", String.valueOf(project.getId())) + .setFieldValue("alertName", alertName) + .setFieldValue("alertText", alertText) + .setFieldValue("alertLevel", alertLevel) + .setFieldValue("isNewAlert", isNewAlert); verify(notificationManager, times(1)).scheduleForSending(eq(notification)); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ProfileEventsSensorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ProfileEventsSensorTest.java index 58855424c13..f7a44372623 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ProfileEventsSensorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ProfileEventsSensorTest.java @@ -34,15 +34,11 @@ import java.util.Arrays; import java.util.Collections; import java.util.Date; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; import static org.mockito.Matchers.same; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyZeroInteractions; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class ProfileEventsSensorTest { @@ -61,7 +57,7 @@ public class ProfileEventsSensorTest { when(profile.getId()).thenReturn(123); ProfileEventsSensor sensor = new ProfileEventsSensor(profile, null); - assertThat(sensor.shouldExecuteOnProject(project), is(true)); + assertThat(sensor.shouldExecuteOnProject(project)).isTrue(); verifyZeroInteractions(project); } @@ -71,7 +67,7 @@ public class ProfileEventsSensorTest { when(profile.getId()).thenReturn(null); ProfileEventsSensor sensor = new ProfileEventsSensor(profile, null); - assertThat(sensor.shouldExecuteOnProject(project), is(false)); + assertThat(sensor.shouldExecuteOnProject(project)).isFalse(); verifyZeroInteractions(project); } @@ -95,9 +91,9 @@ public class ProfileEventsSensorTest { sensor.analyse(project, context); verify(context).createEvent(same(project), - eq("Foo version 1"), - eq("Foo version 1 is used instead of Bar version 1"), - same(Event.CATEGORY_PROFILE), any(Date.class)); + eq("Foo version 1"), + eq("Foo version 1 is used instead of Bar version 1"), + same(Event.CATEGORY_PROFILE), any(Date.class)); } @Test @@ -109,9 +105,9 @@ public class ProfileEventsSensorTest { sensor.analyse(project, context); verify(context).createEvent(same(project), - eq("Foo version 2"), - eq("Foo version 2 is used instead of Foo version 1"), - same(Event.CATEGORY_PROFILE), any(Date.class)); + eq("Foo version 2"), + eq("Foo version 2 is used instead of Foo version 1"), + same(Event.CATEGORY_PROFILE), any(Date.class)); } @Test @@ -134,9 +130,9 @@ public class ProfileEventsSensorTest { sensor.analyse(project, context); verify(context).createEvent(same(project), - eq("Foo version 2"), - eq("Foo version 2 is used instead of Foo version 1"), - same(Event.CATEGORY_PROFILE), any(Date.class)); + eq("Foo version 2"), + eq("Foo version 2 is used instead of Foo version 1"), + same(Event.CATEGORY_PROFILE), any(Date.class)); } private RulesProfile mockProfileWithVersion(int version) { @@ -155,8 +151,8 @@ public class ProfileEventsSensorTest { TimeMachine timeMachine = mock(TimeMachine.class); when(timeMachine.getMeasures(any(TimeMachineQuery.class))) - .thenReturn(result1 == null ? Collections. emptyList() : Arrays.asList(result1)) - .thenReturn(result2 == null ? Collections. emptyList() : Arrays.asList(result2)); + .thenReturn(result1 == null ? Collections.emptyList() : Arrays.asList(result1)) + .thenReturn(result2 == null ? Collections.emptyList() : Arrays.asList(result2)); return timeMachine; } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest.java index 10703d372f9..ace43c929e5 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ReviewWorkflowDecoratorTest.java @@ -20,7 +20,6 @@ package org.sonar.plugins.core.sensors; import com.google.common.collect.Lists; -import org.hamcrest.core.Is; import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; @@ -38,15 +37,10 @@ import org.sonar.core.review.ReviewDto; import java.util.Collections; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class ReviewWorkflowDecoratorTest extends AbstractDaoTestCase { private ReviewWorkflowDecorator decorator; @@ -68,14 +62,14 @@ public class ReviewWorkflowDecoratorTest extends AbstractDaoTestCase { public void shouldExecuteOnProject() { Project project = mock(Project.class); when(project.isLatestAnalysis()).thenReturn(true); - assertTrue(decorator.shouldExecuteOnProject(project)); + assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); } @Test public void shouldExecuteOnProject_not_if_past_inspection() { Project project = mock(Project.class); when(project.isLatestAnalysis()).thenReturn(false); - assertFalse(decorator.shouldExecuteOnProject(project)); + assertThat(decorator.shouldExecuteOnProject(project)).isFalse(); } @Test @@ -88,7 +82,7 @@ public class ReviewWorkflowDecoratorTest extends AbstractDaoTestCase { decorator.decorate(resource, context); verify(notifications, times(2)).notifyClosed(any(ReviewDto.class), any(Project.class), eq(resource)); - checkTables("shouldCloseReviewsOnResolvedViolations", new String[] {"updated_at"}, "reviews"); + checkTables("shouldCloseReviewsOnResolvedViolations", new String[]{"updated_at"}, "reviews"); } @Test @@ -101,7 +95,7 @@ public class ReviewWorkflowDecoratorTest extends AbstractDaoTestCase { decorator.decorate(resource, context); verify(notifications).notifyClosed(any(ReviewDto.class), any(Project.class), eq(resource)); - checkTables("shouldCloseResolvedManualViolations", new String[] {"updated_at"}, "reviews"); + checkTables("shouldCloseResolvedManualViolations", new String[]{"updated_at"}, "reviews"); } @Test @@ -116,31 +110,32 @@ public class ReviewWorkflowDecoratorTest extends AbstractDaoTestCase { decorator.decorate(resource, context); verify(notifications).notifyReopened(any(ReviewDto.class), any(Project.class), eq(resource)); - checkTables("shouldReopenViolations", new String[] {"updated_at"}, "reviews"); + checkTables("shouldReopenViolations", new String[]{"updated_at"}, "reviews"); } @Test public void hasUpToDateInformation() { assertThat(ReviewWorkflowDecorator.hasUpToDateInformation( - new ReviewDto().setTitle("Design").setLine(30), - new Violation(new Rule()).setMessage("Design").setLineId(30)), - Is.is(true)); + new ReviewDto().setTitle("Design").setLine(30), + new Violation(new Rule()).setMessage("Design").setLineId(30))) + .isTrue(); + // different title assertThat(ReviewWorkflowDecorator.hasUpToDateInformation( - new ReviewDto().setTitle("Design").setLine(30), - new Violation(new Rule()).setMessage("Other").setLineId(30)), - Is.is(false)); + new ReviewDto().setTitle("Design").setLine(30), + new Violation(new Rule()).setMessage("Other").setLineId(30)) + ).isFalse(); // different line assertThat(ReviewWorkflowDecorator.hasUpToDateInformation( - new ReviewDto().setTitle("Design").setLine(300), - new Violation(new Rule()).setMessage("Design").setLineId(200)), - Is.is(false)); + new ReviewDto().setTitle("Design").setLine(300), + new Violation(new Rule()).setMessage("Design").setLineId(200))) + .isFalse(); assertThat(ReviewWorkflowDecorator.hasUpToDateInformation( - new ReviewDto().setTitle("Design").setLine(300), - new Violation(new Rule()).setMessage("Design").setLineId(null)), - Is.is(false)); + new ReviewDto().setTitle("Design").setLine(300), + new Violation(new Rule()).setMessage("Design").setLineId(null))) + .isFalse(); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ReviewsMeasuresDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ReviewsMeasuresDecoratorTest.java index bee88075504..e9881c066ee 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ReviewsMeasuresDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/ReviewsMeasuresDecoratorTest.java @@ -22,20 +22,15 @@ package org.sonar.plugins.core.sensors; import com.google.common.collect.Maps; import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.time.DateUtils; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatcher; import org.sonar.api.batch.DecoratorContext; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.measures.Measure; import org.sonar.api.measures.Metric; import org.sonar.api.measures.RuleMeasure; -import org.sonar.api.resources.File; -import org.sonar.api.resources.Method; -import org.sonar.api.resources.Project; -import org.sonar.api.resources.Qualifiers; -import org.sonar.api.resources.Resource; +import org.sonar.api.resources.*; import org.sonar.api.rules.Rule; import org.sonar.api.rules.Violation; import org.sonar.batch.components.PastSnapshot; @@ -47,20 +42,14 @@ import java.util.Arrays; import java.util.Date; import java.util.Map; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.fest.assertions.Assertions.assertThat; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyDouble; import static org.mockito.Matchers.argThat; -import static org.mockito.Mockito.atLeast; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import static org.mockito.Mockito.*; public class ReviewsMeasuresDecoratorTest { - private ReviewDao reviewDao; private ReviewsMeasuresDecorator decorator; private DecoratorContext context; @@ -70,7 +59,7 @@ public class ReviewsMeasuresDecoratorTest { @Before public void setUp() { - reviewDao = mock(ReviewDao.class); + ReviewDao reviewDao = mock(ReviewDao.class); rightNow = new Date(); tenDaysAgo = DateUtils.addDays(rightNow, -10); @@ -97,7 +86,7 @@ public class ReviewsMeasuresDecoratorTest { ReviewsMeasuresDecorator decorator = new ReviewsMeasuresDecorator(null, null); Project project = new Project("foo"); project.setLatestAnalysis(true); - assertThat(decorator.shouldExecuteOnProject(project), is(true)); + assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); } @Test @@ -141,7 +130,7 @@ public class ReviewsMeasuresDecoratorTest { verify(context).saveMeasure(argThat(new IsVariationMeasure(CoreMetrics.NEW_UNREVIEWED_VIOLATIONS, 1.0, 3.0))); } - private class IsVariationMeasure extends BaseMatcher { + private class IsVariationMeasure extends ArgumentMatcher { private Metric metric = null; private Double var1 = null; private Double var2 = null; @@ -162,8 +151,5 @@ public class ReviewsMeasuresDecoratorTest { ObjectUtils.equals(var2, m.getVariation2()) && !(m instanceof RuleMeasure); } - - public void describeTo(Description o) { - } } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/SeverityUtilsTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/SeverityUtilsTest.java index a7dffaef6db..a37b359cb00 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/SeverityUtilsTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/SeverityUtilsTest.java @@ -23,13 +23,13 @@ import org.junit.Test; import org.sonar.api.measures.CoreMetrics; import org.sonar.api.rules.RulePriority; -import static org.hamcrest.core.Is.is; -import static org.junit.Assert.assertThat; +import static org.fest.assertions.Assertions.assertThat; + public class SeverityUtilsTest { @Test public void shouldConvertToViolationMetric() { - assertThat(SeverityUtils.severityToViolationMetric(RulePriority.INFO), is(CoreMetrics.INFO_VIOLATIONS)); - assertThat(SeverityUtils.severityToViolationMetric(RulePriority.BLOCKER), is(CoreMetrics.BLOCKER_VIOLATIONS)); + assertThat(SeverityUtils.severityToViolationMetric(RulePriority.INFO)).isEqualTo(CoreMetrics.INFO_VIOLATIONS); + assertThat(SeverityUtils.severityToViolationMetric(RulePriority.BLOCKER)).isEqualTo(CoreMetrics.BLOCKER_VIOLATIONS); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java index 296e8679604..d137a2ccbc3 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/sensors/UnitTestDecoratorTest.java @@ -19,13 +19,6 @@ */ package org.sonar.plugins.core.sensors; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.Matchers.closeTo; -import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.doubleThat; -import static org.mockito.Matchers.eq; -import static org.mockito.Mockito.*; - import org.junit.Before; import org.junit.Test; import org.sonar.api.batch.DecoratorContext; @@ -36,6 +29,12 @@ import org.sonar.api.resources.Project; import java.util.Arrays; +import static org.fest.assertions.Assertions.assertThat; +import static org.hamcrest.Matchers.closeTo; +import static org.mockito.Matchers.doubleThat; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.*; + public class UnitTestDecoratorTest { private UnitTestDecorator decorator; @@ -49,17 +48,17 @@ public class UnitTestDecoratorTest { @Test public void generatesMetrics() { - assertThat(decorator.generatesMetrics().size(), is(5)); + assertThat(decorator.generatesMetrics()).hasSize(5); } @Test public void doNotDecorateStaticAnalysis() { Project project = mock(Project.class); when(project.getAnalysisType()).thenReturn(Project.AnalysisType.STATIC); - assertThat(decorator.shouldExecuteOnProject(project), is(false)); + assertThat(decorator.shouldExecuteOnProject(project)).isFalse(); when(project.getAnalysisType()).thenReturn(Project.AnalysisType.DYNAMIC); - assertThat(decorator.shouldExecuteOnProject(project), is(true)); + assertThat(decorator.shouldExecuteOnProject(project)).isTrue(); } @Test @@ -92,7 +91,7 @@ public class UnitTestDecoratorTest { decorator.decorate(project, context); - assertThat(decorator.shouldDecorateResource(project, context), is(false)); + assertThat(decorator.shouldDecorateResource(project, context)).isFalse(); verify(context, atLeastOnce()).getMeasure(CoreMetrics.TESTS); verifyNoMoreInteractions(context); } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/SourceChecksumTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/SourceChecksumTest.java index 82effdfabb9..2de003b8391 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/SourceChecksumTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/SourceChecksumTest.java @@ -19,21 +19,20 @@ */ package org.sonar.plugins.core.timemachine; -import static org.hamcrest.Matchers.*; -import static org.junit.Assert.assertThat; +import org.junit.Test; import java.util.List; -import org.junit.Test; +import static org.fest.assertions.Assertions.assertThat; public class SourceChecksumTest { @Test public void shouldGetChecksumForLine() { List checksums = SourceChecksum.lineChecksumsOfFile("line"); - assertThat(SourceChecksum.getChecksumForLine(checksums, null), nullValue()); - assertThat(SourceChecksum.getChecksumForLine(checksums, 0), nullValue()); - assertThat(SourceChecksum.getChecksumForLine(checksums, 1), notNullValue()); - assertThat(SourceChecksum.getChecksumForLine(checksums, 2), nullValue()); + assertThat(SourceChecksum.getChecksumForLine(checksums, null)).isNull(); + assertThat(SourceChecksum.getChecksumForLine(checksums, 0)).isNull(); + assertThat(SourceChecksum.getChecksumForLine(checksums, 1)).isNotNull(); + assertThat(SourceChecksum.getChecksumForLine(checksums, 2)).isNull(); } /** @@ -42,8 +41,8 @@ public class SourceChecksumTest { @Test public void shouldGenerateCorrectChecksums() { List encoding = SourceChecksum.lineChecksumsOfFile("Привет Мир"); - assertThat(encoding.size(), is(1)); - assertThat(encoding.get(0), is("5ba3a45e1299ede07f56e5531351be52")); + assertThat(encoding).hasSize(1); + assertThat(encoding.get(0)).isEqualTo("5ba3a45e1299ede07f56e5531351be52"); } @Test @@ -51,12 +50,11 @@ public class SourceChecksumTest { List crlf = SourceChecksum.lineChecksumsOfFile("Hello\r\nWorld"); List lf = SourceChecksum.lineChecksumsOfFile("Hello\nWorld"); List cr = SourceChecksum.lineChecksumsOfFile("Hello\rWorld"); - assertThat(crlf.size(), is(2)); - assertThat(crlf.get(0), not(equalTo(crlf.get(1)))); - assertThat(lf, equalTo(crlf)); - assertThat(cr, equalTo(crlf)); + assertThat(crlf).hasSize(2); + assertThat(crlf.get(0)).isNotEqualTo(crlf.get(1)); + assertThat(lf).isEqualTo(crlf); + assertThat(cr).isEqualTo(crlf); - assertThat(SourceChecksum.lineChecksum("\tvoid method() {\n"), - equalTo(SourceChecksum.lineChecksum(" void method() {"))); + assertThat(SourceChecksum.lineChecksum("\tvoid method() {\n")).isEqualTo(SourceChecksum.lineChecksum(" void method() {")); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/tracking/StringTextComparatorTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/tracking/StringTextComparatorTest.java index 6ea3fe41445..71871112d0b 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/tracking/StringTextComparatorTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/tracking/StringTextComparatorTest.java @@ -21,9 +21,8 @@ package org.sonar.plugins.core.timemachine.tracking; import org.junit.Test; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.fest.assertions.Assertions.assertThat; + public class StringTextComparatorTest { @@ -34,11 +33,11 @@ public class StringTextComparatorTest { StringText a = new StringText("abc\nabc\na bc"); StringText b = new StringText("abc\nabc d\nab c"); - assertThat("abc == abc", cmp.equals(a, 0, b, 0), is(true)); - assertThat("abc != abc d", cmp.equals(a, 1, b, 1), is(false)); - assertThat("a bc == ab c", cmp.equals(a, 2, b, 2), is(true)); - assertThat(cmp.hash(a, 0), equalTo(cmp.hash(b, 0))); - assertThat(cmp.hash(a, 2), equalTo(cmp.hash(b, 2))); + assertThat(cmp.equals(a, 0, b, 0)).as("abc == abc").isTrue(); + assertThat(cmp.equals(a, 1, b, 1)).as("abc != abc d").isFalse(); + assertThat(cmp.equals(a, 2, b, 2)).as("a bc == ab c").isTrue(); + assertThat(cmp.hash(a, 0)).isEqualTo(cmp.hash(b, 0)); + assertThat(cmp.hash(a, 2)).isEqualTo(cmp.hash(b, 2)); } } diff --git a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/tracking/StringTextTest.java b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/tracking/StringTextTest.java index 7cb95dad0e7..f7424af08c8 100644 --- a/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/tracking/StringTextTest.java +++ b/plugins/sonar-core-plugin/src/test/java/org/sonar/plugins/core/timemachine/tracking/StringTextTest.java @@ -21,21 +21,20 @@ package org.sonar.plugins.core.timemachine.tracking; import org.junit.Test; -import static org.hamcrest.Matchers.is; -import static org.junit.Assert.assertThat; +import static org.fest.assertions.Assertions.assertThat; public class StringTextTest { @Test public void testEmpty() { StringText r = new StringText(""); - assertThat(r.length(), is(0)); + assertThat(r.length()).isEqualTo(0); } @Test public void testTwoLines() { StringText r = new StringText("a\nb"); - assertThat(r.length(), is(2)); + assertThat(r.length()).isEqualTo(2); } } diff --git a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DbCleanerPluginTest.java b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DbCleanerPluginTest.java index ce0dd293050..651c7fb575f 100644 --- a/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DbCleanerPluginTest.java +++ b/plugins/sonar-dbcleaner-plugin/src/test/java/org/sonar/plugins/dbcleaner/DbCleanerPluginTest.java @@ -21,13 +21,12 @@ package org.sonar.plugins.dbcleaner; import org.junit.Test; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.is; +import static org.fest.assertions.Assertions.assertThat; public class DbCleanerPluginTest { @Test public void shouldGetExtensions() { - assertThat(new DbCleanerPlugin().getExtensions().size(), is(3)); + assertThat(new DbCleanerPlugin().getExtensions()).hasSize(3); } } diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/NewIssue.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/NewIssue.java index 24f18407ef2..f4b43a39385 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/NewIssue.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/NewIssue.java @@ -74,7 +74,7 @@ public class NewIssue { return this; } - public NewIssue effortToFix(Double d) { + public NewIssue effortToFix(double d) { params.put("effortToFix", d); return this; } diff --git a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Paging.java b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Paging.java index e9f701a76f1..cd24f2beaf4 100644 --- a/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Paging.java +++ b/sonar-ws-client/src/main/java/org/sonar/wsclient/issue/Paging.java @@ -26,6 +26,7 @@ import java.util.Map; /** * @since 3.6 + * TODO move outside this package */ public class Paging { -- 2.39.5