public final class Batch {
private LoggingConfiguration logging;
- private List components;
+ private List<Object> components;
private ProjectReactor projectReactor;
private Batch(Builder builder) {
*/
package org.sonar.colorizer;
+import org.apache.commons.io.FileUtils;
+import org.junit.Test;
+
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.StringReader;
import java.util.Arrays;
-import org.apache.commons.io.FileUtils;
-import org.junit.Test;
-import org.sonar.channel.Channel;
-
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
import static org.junit.internal.matchers.StringContains.containsString;
@Test
public void renderJavaSyntax() {
- String html = new HtmlRenderer(HtmlOptions.ONLY_SYNTAX).render(new StringReader("public class Hello {"), Arrays
- .<Channel<HtmlCodeBuilder>> asList(javaKeywordTokenizer));
+ HtmlRenderer htmlRenderer = new HtmlRenderer(HtmlOptions.ONLY_SYNTAX);
+
+ String html = htmlRenderer.render(new StringReader("public class Hello {"), Arrays.asList(javaKeywordTokenizer));
assertThat(html, is("<span class='k'>public</span> <span class='k'>class</span> Hello {"));
}
@Test
public void supportHtmlSpecialCharacters() {
- String html = new HtmlRenderer(HtmlOptions.ONLY_SYNTAX).render(new StringReader("foo(\"<html>\");"), Arrays
- .<Channel<HtmlCodeBuilder>> asList(new LiteralTokenizer("<s>", "</s>")));
+ HtmlRenderer htmlRenderer = new HtmlRenderer(HtmlOptions.ONLY_SYNTAX);
+
+ String html = htmlRenderer.render(new StringReader("foo(\"<html>\");"), Arrays.asList(new LiteralTokenizer("<s>", "</s>")));
assertThat(html, is("foo(<s>\"<html>\"</s>);"));
}
public void renderJavaFile() throws IOException {
File java = FileUtils.toFile(getClass().getResource("/org/sonar/colorizer/HtmlRendererTest/Sample.java"));
- String html = new HtmlRenderer().render(new FileReader(java), Arrays.<Channel<HtmlCodeBuilder>> asList(javaKeywordTokenizer));
+ String html = new HtmlRenderer().render(new FileReader(java), Arrays.asList(javaKeywordTokenizer));
assertThat(html, containsString("<html>"));
assertThat(html, containsString("<style"));
<artifactId>dbunit</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.easytesting</groupId>
+ <artifactId>fest-assert</artifactId>
+ <scope>test</scope>
+ </dependency>
<!--
JDBC drivers for MyBatis integration tests.
import org.sonar.api.rules.Rule;
import org.sonar.api.rules.RuleFinder;
import org.sonar.api.rules.RuleQuery;
-import org.sonar.core.rule.DefaultRuleFinder;
import org.sonar.jpa.test.AbstractDbUnitTestCase;
import java.util.Collection;
-import static org.hamcrest.CoreMatchers.anyOf;
+import static org.fest.assertions.Assertions.assertThat;
import static org.hamcrest.core.Is.is;
import static org.hamcrest.core.IsNull.nullValue;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
public class DefaultRuleFinderTest extends AbstractDbUnitTestCase {
setupData("shared");
RuleFinder finder = new DefaultRuleFinder(getSessionFactory());
Collection<Rule> rules = finder.findAll(RuleQuery.create().withRepositoryKey("checkstyle"));
- assertNotNull(rules);
- assertThat(rules.size(), is(2)); // only enabled checkstyle rules
+
+ assertThat(rules).hasSize(2);
}
@Test
setupData("shared");
RuleFinder finder = new DefaultRuleFinder(getSessionFactory());
Collection<Rule> rules = finder.findAll(RuleQuery.create());
- assertNotNull(rules);
- assertThat(rules.size(), is(3)); // only enabled checkstyle+pmd rules
- for (Rule rule : rules) {
- assertThat(rule.getId(), anyOf(is(1), is(3), is(4)));
- }
+
+ assertThat(rules).onProperty("id").containsOnly(1, 3, 4);
}
@Test
BatchExtensionDictionnary selector = newSelector();
BatchExtension wrong = new BatchExtension() {
@DependsUpon
- @SuppressWarnings("unused")
private Object foo() {
return "foo";
}
*/
package org.sonar.api.checks;
-import org.hamcrest.Matcher;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.sonar.api.profiles.RulesProfile;
import java.util.Arrays;
-import static org.hamcrest.Matchers.hasItems;
-import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.nullValue;
+import static org.fest.assertions.Assertions.assertThat;
import static org.hamcrest.core.Is.is;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
profile.activateRule(clonedRule, null);
AnnotationCheckFactory factory = AnnotationCheckFactory.create(profile, "repo", Arrays.<Class> asList(CheckWithKey.class));
- assertThat(factory.getChecks(), (Matcher) not(hasItems(nullValue())));
+ assertThat(factory.getChecks()).excludes(new Object[] {null});
}
/**
@Test
public void testWhenGetChildrenReturnsEmpty() {
when(context.getTargetMetric()).thenReturn(new Metric("foo"));
- when(data.getChildrenMeasures(new Metric("foo"))).thenReturn((List) Collections.emptyList());
+ when(data.getChildrenMeasures(new Metric("foo"))).thenReturn(Collections.<Measure> emptyList());
assertNull(formula.calculate(data, context));
}
public static final int SORTED_COLUMN_INDEX = 3;
public FilterResult(Filter filter, List rows) {
- this.rows = new ArrayList(rows);
+ this.rows = new ArrayList<Object[]>(rows);
this.filter = filter;
}
}
try {
- Class aClass = Class.forName(className);
+ Class<?> aClass = Class.forName(className);
return getContainer().getComponentByType(aClass);
} catch (ClassNotFoundException e) {
public Object getComponentByClassname(String pluginKey, String className) {
Object component = null;
ComponentContainer container = getContainer();
- Class componentClass = container.getComponentByType(DefaultServerPluginRepository.class).getClass(pluginKey, className);
+ Class<?> componentClass = container.getComponentByType(DefaultServerPluginRepository.class).getClass(pluginKey, className);
if (componentClass != null) {
component = container.getComponentByType(componentClass);
}
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
-import org.mockito.InOrder;
import org.sonar.api.web.ServletFilter;
import javax.servlet.*;
public class AbstractnessFormulaTest {
AbstractnessFormula abstractness = new AbstractnessFormula();
- Measurable measurable = new SourcePackage("pac1");
+ Measurable<Metric> measurable = new SourcePackage("pac1");
@Test
public void testCalculate() {
assertEquals(0.2, abstractness.calculate(measurable), 0);
}
-
+
@Test
public void testCalculateOnEmptyProject() {
measurable.setMeasure(Metric.CLASSES, 0);
import static org.junit.Assert.*;
-
public class CommentLinesDensityFormulaTest {
-
+
CommentLinesDensityFormula formula = new CommentLinesDensityFormula();
- Measurable measurable = new SourceClass("com.Toto");
+ Measurable<Metric> measurable = new SourceClass("com.Toto");
@Test
public void calculateDensityOnEmptyFile() {
measurable.setMeasure(Metric.COMMENT_LINES, 0);
assertEquals(0, measurable.getDouble(Metric.COMMENT_LINES_DENSITY), 0.01);
}
-
+
@Test
public void calculate() {
measurable.setMeasure(Metric.LINES_OF_CODE, 10);
public class CommentLinesWithoutHeaderFormulaTest {
- CommentLinesWithoutHeaderFormula formula = new CommentLinesWithoutHeaderFormula();
- Measurable measurable = new SourceClass("com.Toto");
+ CommentLinesWithoutHeaderFormula formula = new CommentLinesWithoutHeaderFormula();
+ Measurable<Metric> measurable = new SourceClass("com.Toto");
@Test
public void calculateDensityOnEmptyFile() {
public class DistanceFormulaTest {
- DistanceFormula distance = new DistanceFormula();
- Measurable measurable = new SourcePackage("pac1");
+ DistanceFormula distance = new DistanceFormula();
+ Measurable<Metric> measurable = new SourcePackage("pac1");
@Test
public void calculateBestDistance() {
measurable.setMeasure(Metric.CE, 10);
assertEquals(0.5, measurable.getDouble(Metric.DISTANCE), 0.01);
}
-
+
@Test
public void calculateWorstDistance() {
measurable.setMeasure(Metric.CLASSES, 5);
public class InstabilityFormulaTest {
- InstabilityFormula distance = new InstabilityFormula();
- Measurable measurable = new SourcePackage("pac1");
+ InstabilityFormula distance = new InstabilityFormula();
+ Measurable<Metric> measurable = new SourcePackage("pac1");
@Test
public void calculateBestStability() {
measurable.setMeasure(Metric.CE, 0);
assertEquals(0, measurable.getDouble(Metric.INSTABILITY), 0.01);
}
-
+
@Test
public void calculateWorstStability() {
measurable.setMeasure(Metric.CA, 0);
measurable.setMeasure(Metric.CE, 10);
assertEquals(1, measurable.getDouble(Metric.INSTABILITY), 0.01);
}
-
+
@Test
public void calculateOnIsolatedProject() {
measurable.setMeasure(Metric.CA, 0);
import org.sonar.squid.api.SourceClass;
-
public class MeanAggregationFormulaTest {
-
+
MeanAggregationFormula formula = new MeanAggregationFormula();
@Test
SourceClass class2 = new SourceClass("com.My");
class2.setMeasure(Metric.COMPLEXITY, 3);
measurables.add(class2);
-
+
assertEquals(2.5, formula.aggregate(Metric.COMPLEXITY, measurables), 0.01);
}
-
+
@Test
public void testAggregateEmptyCollections() {
List<Measurable> measurables = new ArrayList<Measurable>();
import static org.junit.Assert.*;
-
public class PublicDocumentedApiDensityFormulaTest {
-
+
PublicDocumentedApiDensityFormula formula = new PublicDocumentedApiDensityFormula();
- Measurable measurable = new SourceClass("com.Toto");
+ Measurable<Metric> measurable = new SourceClass("com.Toto");
@Test
public void calculateWhenNoPublicApi() {
measurable.setMeasure(Metric.PUBLIC_DOC_API, 0);
assertEquals(1, measurable.getDouble(Metric.PUBLIC_DOCUMENTED_API_DENSITY), 0.01);
}
-
+
@Test
public void calculate() {
measurable.setMeasure(Metric.PUBLIC_API, 10);
projects / sonarqube.git / commitdiff