Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add tests to checkstyle #6006

Merged
merged 24 commits into from
Jun 16, 2024
Merged

Add tests to checkstyle #6006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
7e25515
Add tests to checkstyle
tadgh Jun 13, 2024
bcf4638
Add includede test dirs in execution
tadgh Jun 13, 2024
f61dbb4
wip
tadgh Jun 13, 2024
2bfb47b
wip
tadgh Jun 13, 2024
57ad90c
bump checkstyle deps
tadgh Jun 14, 2024
c429977
bump checkstyle deps
tadgh Jun 14, 2024
22b0715
wip50
tadgh Jun 14, 2024
2748b6a
wip
tadgh Jun 14, 2024
c00a9d3
Handle upgrade
tadgh Jun 14, 2024
e00346b
triple-wip
tadgh Jun 14, 2024
f7e544c
wip
tadgh Jun 14, 2024
b1fbb52
Wip replacement of prints
tadgh Jun 14, 2024
c8007cb
All checkstyle now passing
tadgh Jun 14, 2024
5e84c6b
wip
tadgh Jun 14, 2024
d4eea2f
Reset checkstyle
tadgh Jun 14, 2024
1df12b0
spotless
tadgh Jun 14, 2024
d9bb46a
reset checkstyle
tadgh Jun 14, 2024
7f552f6
Add checkstyle to pipeline
tadgh Jun 14, 2024
f68e129
Tidy
tadgh Jun 14, 2024
d130bf1
Tidy
tadgh Jun 14, 2024
3acaf7f
wip
tadgh Jun 15, 2024
8a43c3f
Cut over to not empty for correct behaviour
tadgh Jun 15, 2024
f979424
imports
tadgh Jun 15, 2024
c0626bb
Merge branch 'master' into checkstyle-tests
tadgh Jun 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hapi-fhir-android/src/test/java/android/util/Log.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package android.util;

@SuppressWarnings("checkstyle:NoPrintln")
public class Log {

public static final int VERBOSE = 2;
Expand Down
37 changes: 2 additions & 35 deletions hapi-fhir-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
<version>1.8</version>
<configuration>
<target>
<!--suppress UnresolvedMavenProperty -->
<!-- suppress UnresolvedMavenProperty-->
<delete dir="${pom.basedir}/target/" includes="checkstyle*"/>
</target>
</configuration>
Expand All @@ -223,40 +223,7 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<!--suppress UnresolvedMavenProperty -->
<configLocation>${maven.multiModuleProjectDirectory}/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml</configLocation>
<!--suppress UnresolvedMavenProperty -->
<suppressionsLocation>${maven.multiModuleProjectDirectory}/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle-suppression.xml</suppressionsLocation>
<inputEncoding>UTF-8</inputEncoding>
<consoleOutput>true</consoleOutput>
</configuration>
<inherited>true</inherited>
<executions>
<execution>
<id>hapi-single-module-checkstyle</id>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>hapi-fhir-checkstyle</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${checkstyle_version}</version>
</dependency>
</dependencies>
</plugin>

</plugins>
<resources>
<resource>
Expand Down
2 changes: 1 addition & 1 deletion ...model/api/BaseBatchJobParametersTest.java → ...hir/model/api/BatchJobParametersTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;

public class BaseBatchJobParametersTest {
public class BatchJobParametersTest {

private static class TestParameters extends BaseBatchJobParameters {

Expand Down
3 changes: 1 addition & 2 deletions hapi-fhir-base/src/test/java/ca/uhn/fhir/rest/api/QualifiedParamListTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,10 @@ public void testSplit2() {
assertEquals("aaa", actual.get(0));
assertEquals("bbb", actual.get(1));
}

@Test
public void testSplit3() {
List<String> actual = QualifiedParamList.splitQueryStringByCommasIgnoreEscape(null,"aaa,b\\,bb");
System.out.println(actual);
assertThat(actual).hasSize(2);
assertEquals("aaa", actual.get(0));
assertEquals("b,bb", actual.get(1));
Expand Down
4 changes: 1 addition & 3 deletions hapi-fhir-base/src/test/java/ca/uhn/fhir/util/MessageSupplierTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,14 @@ public void before() {
}



@Test
public void testLog() {

ourLog.info("Hello: {}", msg(() -> "Goodbye"));

verify(myMockAppender, times(1)).doAppend(argThat((ArgumentMatcher<ILoggingEvent>) argument -> {
String formattedMessage = argument.getFormattedMessage();
System.out.flush();
System.out.println("** Got Message: " + formattedMessage);
System.out.flush();
return formattedMessage.equals("Hello: Goodbye");
}));

Expand Down
5 changes: 3 additions & 2 deletions hapi-fhir-checkstyle/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
</dependency>
</dependencies>


<build>
<pluginManagement>
<plugins>
Expand All @@ -59,7 +60,6 @@
</plugins>
</pluginManagement>
</build>

<profiles>
<!-- For releases, we need to generate javadoc and sources JAR -->
<profile>
Expand Down Expand Up @@ -102,7 +102,7 @@
</build>
</profile>
<profile>
<id>CI</id>
<id>CHECKSTYLE</id>
tadgh marked this conversation as resolved.
Show resolved Hide resolved
<build>
<plugins>
<plugin>
Expand All @@ -115,6 +115,7 @@
<!--suppress UnresolvedMavenProperty -->
<directory>${maven.multiModuleProjectDirectory}/</directory>
</sourceDirectories>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<!--suppress UnresolvedMavenProperty -->
<configLocation>${maven.multiModuleProjectDirectory}/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml</configLocation>
<!--suppress UnresolvedMavenProperty -->
Expand Down
10 changes: 8 additions & 2 deletions hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle-suppression.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
"https://checkstyle.org/dtds/suppressions_1_2.dtd">

<suppressions>
<suppress files="[/\\]test[/\\]" checks="[a-zA-Z0-9]*" />
<suppress files="[/\\]resources[/\\]" checks="[a-zA-Z0-9]*" />
<suppress files="[\\/]target[\\/]" checks="[a-zA-Z0-9]*" />
<suppress files="[\\/]hapi-fhir-docs[\\/]" checks="[a-zA-Z0-9]*" />
Expand All @@ -15,11 +14,18 @@
<suppress files="[\\/]osgi[\\/]" checks="[a-zA-Z0-9]*"/>

<!-- Name suppressions -->
<!-- We don't care if test files have `base` or abstract in the name` -->
<suppress files="[/\\]test[/\\]" checks="AbstractClassName" />
<suppress files="[/\\]test[/\\]" checks="ca.uhn.fhir.checks.HapiErrorCodeCheck" id="HapiErrorCodeUniqueness"/>

<suppress files="Base64BinaryDt\.java" checks="AbstractClassName"/>
<!-- TODO KHS cdr instantiates these. Remove them once cdr has been fixed. -->
<!-- TODO CHECKSTYLE KHS cdr instantiates these. Remove them once cdr has been fixed. -->
<suppress files="BaseMigrationTasks\.java" checks="AbstractClassName"/>
<suppress files="BaseLoincTop2000LabResultsHandler\.java" checks="AbstractClassName"/>

<!-- TODO GGG Checkstyle MDM tests can currently use hamcrest until we fix em -->
<suppress files=".*/mdm/.*" checks="RegexpSinglelineJava" id="NoHamcrestAssert"/>
tadgh marked this conversation as resolved.
Show resolved Hide resolved

<!-- Missing "Base" prefix suppressions -->
<suppress files="ResourceMetadataKeyEnum\.java" checks="AbstractClassName"/>
<suppress files="RequestDetails\.java" checks="AbstractClassName"/>
Expand Down
9 changes: 7 additions & 2 deletions hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<module name="Checker">

<module name="SuppressWarningsFilter" />
<property name="severity" value="error"/>
<property name="charset" value="UTF-8"/>
<property name="fileExtensions" value="java, properties, xml, js, json"/>

<module name="TreeWalker">
<module name="SuppressWarningsHolder" />
<!-- Run custom HapiErrorCodeCheck to find duplicate error codes -->
<module name="ca.uhn.fhir.checks.HapiErrorCodeCheck"/>
<module name="ca.uhn.fhir.checks.HapiErrorCodeCheck">
<property name="id" value="HapiErrorCodeUniqueness"/>
tadgh marked this conversation as resolved.
Show resolved Hide resolved
</module>
<!-- Throw error if any FIX ME is left in the code -->
<module name="TodoComment">
<!-- The (?i) below means Case Insensitive -->
Expand All @@ -26,10 +29,12 @@
-->

<module name="RegexpSinglelineJava">
<property name="id" value="NoPrintln"/>
<property name="format" value="System\.out\.println"/>
<property name="ignoreComments" value="true"/>
</module>
<module name="RegexpSinglelineJava">
<property name="id" value="NoHamcrestAssert"/>
<property name="format" value="org.hamcrest.MatcherAssert.assertThat"/>
<property name="message" value="Incorrect assertThat import used: The &quot;org.assertj.core.api.Assertions.assertThat&quot; import should be used for tests"/>
</module>
Expand Down
5 changes: 3 additions & 2 deletions hapi-fhir-checkstyle/src/test/java/ca/uhn/fhir/checks/HapiErrorCodeCheckTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package ca.uhn.fhir.checks;

import com.puppycrawl.tools.checkstyle.AbstractAutomaticBean;
import com.puppycrawl.tools.checkstyle.Checker;
import com.puppycrawl.tools.checkstyle.DefaultConfiguration;
import com.puppycrawl.tools.checkstyle.DefaultLogger;
Expand Down Expand Up @@ -31,8 +32,8 @@ public void testExpectedErrors() throws CheckstyleException {
files.add(getFile("BadClass.java"));

ByteArrayOutputStream errors = new ByteArrayOutputStream();
DefaultLogger listener = new DefaultLogger(NullOutputStream.NULL_OUTPUT_STREAM, AutomaticBean.OutputStreamOptions.CLOSE,
errors, AutomaticBean.OutputStreamOptions.CLOSE);
DefaultLogger listener = new DefaultLogger(NullOutputStream.NULL_OUTPUT_STREAM, AbstractAutomaticBean.OutputStreamOptions.CLOSE,
errors, AbstractAutomaticBean.OutputStreamOptions.CLOSE);
checker.addListener(listener);

// execute
Expand Down
14 changes: 8 additions & 6 deletions ...c/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProviderDstu2Hl7OrgTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import static org.mockito.Mockito.when;

public class AbstractJaxRsConformanceProviderDstu2Hl7OrgTest {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(AbstractJaxRsConformanceProviderDstu2Hl7OrgTest.class);


private static final String BASEURI = "http://basiuri";
private static final String REQUESTURI = BASEURI + "/metadata";
Expand Down Expand Up @@ -49,15 +51,15 @@ public void testConformance() throws Exception {
providers.put(AbstractJaxRsConformanceProvider.class, provider);
providers.put(TestJaxRsDummyPatientProviderDstu2Hl7Org.class, new TestJaxRsDummyPatientProviderDstu2Hl7Org());
Response response = createConformanceProvider(providers).conformance();
System.out.println(response);
ourLog.info(response.toString());
}

@Test
public void testConformanceUsingOptions() throws Exception {
providers.put(AbstractJaxRsConformanceProvider.class, provider);
providers.put(TestJaxRsDummyPatientProviderDstu2Hl7Org.class, new TestJaxRsDummyPatientProviderDstu2Hl7Org());
Response response = createConformanceProvider(providers).conformanceUsingOptions();
System.out.println(response);
ourLog.info(response.toString());
}

@Test
Expand All @@ -68,8 +70,8 @@ public void testConformanceWithMethods() throws Exception {
assertEquals(Constants.STATUS_HTTP_200_OK, response.getStatus());
assertThat(response.getEntity().toString()).contains("\"type\": \"Patient\"");
assertThat(response.getEntity().toString()).contains("someCustomOperation");
System.out.println(response);
System.out.println(response.getEntity());
ourLog.info(response.toString());
ourLog.info(response.getEntity().toString());
}

@Test
Expand All @@ -79,10 +81,10 @@ public void testConformanceInXml() throws Exception {
providers.put(TestJaxRsMockPatientRestProviderDstu2Hl7Org.class, new TestJaxRsMockPatientRestProviderDstu2Hl7Org());
Response response = createConformanceProvider(providers).conformance();
assertEquals(Constants.STATUS_HTTP_200_OK, response.getStatus());
System.out.println(response.getEntity());
ourLog.info(response.getEntity().toString());
assertThat(response.getEntity().toString()).contains(" <type value=\"Patient\"/>");
assertThat(response.getEntity().toString()).contains("someCustomOperation");
System.out.println(response.getEntity());
ourLog.info(response.getEntity().toString());
}

private AbstractJaxRsConformanceProvider createConformanceProvider(final ConcurrentHashMap<Class<? extends IResourceProvider>, IResourceProvider> providers)
Expand Down
14 changes: 8 additions & 6 deletions ...e/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProviderDstu2_1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import static org.mockito.Mockito.when;

public class AbstractJaxRsConformanceProviderDstu2_1Test {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(AbstractJaxRsConformanceProviderDstu2_1Test.class);


private static final String BASEURI = "http://basiuri";
private static final String REQUESTURI = BASEURI + "/metadata";
Expand Down Expand Up @@ -50,15 +52,15 @@ public void testConformance() throws Exception {
providers.put(AbstractJaxRsConformanceProvider.class, provider);
providers.put(TestJaxRsDummyPatientProviderDstu2_1.class, new TestJaxRsDummyPatientProviderDstu2_1());
Response response = createConformanceProvider(providers).conformance();
System.out.println(response);
ourLog.info(response.toString());
}

@Test
public void testConformanceUsingOptions() throws Exception {
providers.put(AbstractJaxRsConformanceProvider.class, provider);
providers.put(TestJaxRsDummyPatientProviderDstu2_1.class, new TestJaxRsDummyPatientProviderDstu2_1());
Response response = createConformanceProvider(providers).conformanceUsingOptions();
System.out.println(response);
ourLog.info(response.toString());
}

@Test
Expand All @@ -69,8 +71,8 @@ public void testConformanceWithMethods() throws Exception {
assertEquals(Constants.STATUS_HTTP_200_OK, response.getStatus());
assertThat(response.getEntity().toString()).contains("\"type\": \"Patient\"");
assertThat(response.getEntity().toString()).contains("\"someCustomOperation");
System.out.println(response);
System.out.println(response.getEntity());
ourLog.info(response.toString());
ourLog.info(response.getEntity().toString());
}

@Test
Expand All @@ -80,10 +82,10 @@ public void testConformanceInXml() throws Exception {
providers.put(TestJaxRsMockPatientRestProviderDstu2_1.class, new TestJaxRsMockPatientRestProviderDstu2_1());
Response response = createConformanceProvider(providers).conformance();
assertEquals(Constants.STATUS_HTTP_200_OK, response.getStatus());
System.out.println(response.getEntity());
ourLog.info(response.getEntity().toString());
assertThat(response.getEntity().toString()).contains(" <type value=\"Patient\"/>");
assertThat(response.getEntity().toString()).contains("\"someCustomOperation");
System.out.println(response.getEntity());
ourLog.info(response.getEntity().toString());
}

private AbstractJaxRsConformanceProvider createConformanceProvider(final ConcurrentHashMap<Class<? extends IResourceProvider>, IResourceProvider> providers)
Expand Down
14 changes: 8 additions & 6 deletions ...ase/src/test/java/ca/uhn/fhir/jaxrs/server/AbstractJaxRsConformanceProviderDstu3Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
import static org.mockito.Mockito.when;

public class AbstractJaxRsConformanceProviderDstu3Test {
private static final org.slf4j.Logger ourLog = org.slf4j.LoggerFactory.getLogger(AbstractJaxRsConformanceProviderDstu3Test.class);


private static final String BASEURI = "http://basiuri";
private static final String REQUESTURI = BASEURI + "/metadata";
Expand Down Expand Up @@ -49,15 +51,15 @@ public void testConformance() throws Exception {
providers.put(AbstractJaxRsConformanceProvider.class, provider);
providers.put(TestJaxRsDummyPatientProviderDstu3.class, new TestJaxRsDummyPatientProviderDstu3());
Response response = createConformanceProvider(providers).conformance();
System.out.println(response);
ourLog.info(response.toString());
}

@Test
public void testConformanceUsingOptions() throws Exception {
providers.put(AbstractJaxRsConformanceProvider.class, provider);
providers.put(TestJaxRsDummyPatientProviderDstu3.class, new TestJaxRsDummyPatientProviderDstu3());
Response response = createConformanceProvider(providers).conformanceUsingOptions();
System.out.println(response);
ourLog.info(response.toString());
}

@Test
Expand All @@ -68,8 +70,8 @@ public void testConformanceWithMethods() throws Exception {
assertEquals(Constants.STATUS_HTTP_200_OK, response.getStatus());
assertThat(response.getEntity().toString()).contains("\"type\": \"Patient\"");
assertThat(response.getEntity().toString()).contains("\"someCustomOperation");
System.out.println(response);
System.out.println(response.getEntity());
ourLog.info(response.toString());
ourLog.info(response.getEntity().toString());
}

@Test
Expand All @@ -79,10 +81,10 @@ public void testConformanceInXml() throws Exception {
providers.put(TestJaxRsMockPatientRestProviderDstu3.class, new TestJaxRsMockPatientRestProviderDstu3());
Response response = createConformanceProvider(providers).conformance();
assertEquals(Constants.STATUS_HTTP_200_OK, response.getStatus());
System.out.println(response.getEntity());
ourLog.info(response.getEntity().toString());
assertThat(response.getEntity().toString()).contains(" <type value=\"Patient\"/>");
assertThat(response.getEntity().toString()).contains("\"someCustomOperation");
System.out.println(response.getEntity());
ourLog.info(response.getEntity().toString());
}

private AbstractJaxRsConformanceProvider createConformanceProvider(final ConcurrentHashMap<Class<? extends IResourceProvider>, IResourceProvider> providers)
Expand Down
Loading
Loading