Skip to content

Commit c1e88b4

Browse files
Janpopanderkoe
andauthored
add scala language (#352)
* add scala language * add small testcase * Fix switch statement --------- Co-authored-by: Christian Köberl <[email protected]>
1 parent c7422be commit c1e88b4

File tree

4 files changed

+22
-5
lines changed

4 files changed

+22
-5
lines changed

src/main/java/at/porscheinformatik/sonarqube/licensecheck/LicenseCheckRulesDefinition.java

+3
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ public final class LicenseCheckRulesDefinition implements RulesDefinition
1313
public static final String LANG_TS = "ts";
1414
public static final String LANG_GROOVY = "grvy";
1515
public static final String LANG_KOTLIN = "kotlin";
16+
public static final String LANG_SCALA = "scala";
1617

1718
public static final String RULE_REPO_KEY = "licensecheck";
1819
public static final String RULE_REPO_KEY_JS = "licensecheck-js";
1920
public static final String RULE_REPO_KEY_TS = "licensecheck-ts";
2021
public static final String RULE_REPO_KEY_GROOVY = "licensecheck-groovy";
2122
public static final String RULE_REPO_KEY_KOTLIN = "licensecheck-kotlin";
23+
public static final String RULE_REPO_KEY_SCALA = "licensecheck-scala";
2224

2325
public static final String RULE_UNLISTED_KEY = "licensecheck.unlisted";
2426
public static final String RULE_NOT_ALLOWED_LICENSE_KEY = "licensecheck.notallowedlicense";
@@ -32,6 +34,7 @@ public void define(Context context)
3234
context.createRepository(RULE_REPO_KEY_TS, LANG_TS),
3335
context.createRepository(RULE_REPO_KEY_GROOVY, LANG_GROOVY),
3436
context.createRepository(RULE_REPO_KEY_KOTLIN, LANG_KOTLIN),
37+
context.createRepository(RULE_REPO_KEY_SCALA, LANG_SCALA),
3538
};
3639

3740
for (NewRepository repo : repos)

src/main/java/at/porscheinformatik/sonarqube/licensecheck/ValidateLicenses.java

+2
Original file line numberDiff line numberDiff line change
@@ -241,6 +241,8 @@ private static String getRepoKey(Dependency dependency)
241241
return LicenseCheckRulesDefinition.RULE_REPO_KEY_TS;
242242
case LicenseCheckRulesDefinition.LANG_GROOVY:
243243
return LicenseCheckRulesDefinition.RULE_REPO_KEY_GROOVY;
244+
case LicenseCheckRulesDefinition.LANG_SCALA:
245+
return LicenseCheckRulesDefinition.RULE_REPO_KEY_SCALA;
244246
case LicenseCheckRulesDefinition.LANG_KOTLIN:
245247
return LicenseCheckRulesDefinition.RULE_REPO_KEY_KOTLIN;
246248
case LicenseCheckRulesDefinition.LANG_JAVA:

src/test/java/at/porscheinformatik/sonarqube/licensecheck/LicenseCheckRulesDefinitionTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package at.porscheinformatik.sonarqube.licensecheck;
22

3-
import static org.hamcrest.CoreMatchers.is;
4-
import static org.hamcrest.MatcherAssert.assertThat;
5-
63
import org.junit.Test;
74
import org.sonar.api.server.rule.RulesDefinition;
85

6+
import static org.hamcrest.CoreMatchers.is;
7+
import static org.hamcrest.MatcherAssert.assertThat;
8+
99
public class LicenseCheckRulesDefinitionTest
1010
{
1111
@Test
@@ -15,7 +15,7 @@ public void define()
1515

1616
new LicenseCheckRulesDefinition().define(context);
1717

18-
assertThat(context.repositories().size(), is(5));
18+
assertThat(context.repositories().size(), is(6));
1919
for (RulesDefinition.Repository repository : context.repositories())
2020
{
2121
assertThat(repository.rules().size(), is(2));

src/test/java/at/porscheinformatik/sonarqube/licensecheck/ValidateLicensesTest.java

+13-1
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,19 @@ public void licenseAllowed()
8282
verify(context, never()).newIssue();
8383
}
8484

85+
@Test
86+
public void licenseAllowed_scala()
87+
{
88+
SensorContext context = createContext();
89+
90+
validateLicenses.validateLicenses(
91+
deps(new Dependency("thing", "1.0", "Apache-2.0", LicenseCheckRulesDefinition.LANG_SCALA),
92+
new Dependency("another", "2.0", "Apache-2.0", LicenseCheckRulesDefinition.LANG_SCALA)),
93+
context);
94+
95+
verify(context, never()).newIssue();
96+
}
97+
8598
@Test
8699
public void licenseAllowed_kotlin()
87100
{
@@ -95,7 +108,6 @@ public void licenseAllowed_kotlin()
95108
verify(context, never()).newIssue();
96109
}
97110

98-
99111
// (LGPL OR Apache-2.0) AND (LGPL OR Apache-2.0)
100112
@Test
101113
public void checkSpdxOrCombination()

0 commit comments

Comments
 (0)