Skip to content
This repository was archived by the owner on Dec 4, 2023. It is now read-only.

Code coverage with Jacoco #1068

Merged
tracyboehrer merged 5 commits into from
Mar 22, 2021
Merged

Code coverage with Jacoco #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
212f30b
JaCoCo test coverage
tracyboehrer Mar 8, 2021
97d763c
JaCoCo build target setup
tracyboehrer Mar 8, 2021
8a64105
Merge branch 'main' into trboehre/jacoco
LeeParrishMSFT Mar 18, 2021
94eb80a
Updates to support Jacoco code coverage
LeeParrishMSFT Mar 22, 2021
d63d769
Merge branch 'main' into trboehre/jacoco
LeeParrishMSFT Mar 22, 2021
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
19 changes: 0 additions & 19 deletions libraries/bot-ai-luis-v3/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,25 +96,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-ai-luis-v3</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
19 changes: 0 additions & 19 deletions libraries/bot-ai-qna/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,25 +95,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-ai-qna</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
19 changes: 0 additions & 19 deletions libraries/bot-applicationinsights/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,25 +74,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-applicationinsights</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
19 changes: 0 additions & 19 deletions libraries/bot-azure/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,25 +90,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-azure</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
</plugins>
</build>

Expand Down
19 changes: 0 additions & 19 deletions libraries/bot-builder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,25 +114,6 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-builder</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</profile>
Expand Down
20 changes: 0 additions & 20 deletions libraries/bot-connector/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,26 +144,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-connector</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
Expand Down
8 changes: 5 additions & 3 deletions ...c/main/java/com/microsoft/bot/restclient/serializer/AdditionalPropertiesDeserializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,11 @@ public Object deserialize(JsonParser jp, DeserializationContext ctxt) throws IOE
Field[] fields = c.getDeclaredFields();
for (Field field : fields) {
JsonProperty property = field.getAnnotation(JsonProperty.class);
String key = property.value().split("((?<!\\\\))\\.")[0];
if (!key.isEmpty() && copy.has(key)) {
copy.remove(key);
if (property != null) {
String key = property.value().split("((?<!\\\\))\\.")[0];
if (!key.isEmpty() && copy.has(key)) {
copy.remove(key);
}
}
}
}
Expand Down
19 changes: 0 additions & 19 deletions libraries/bot-dialogs/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,25 +111,6 @@
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-dialogs</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion libraries/bot-dialogs/src/test/java/com/microsoft/bot/dialogs/prompts/ChoicePromptTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ public void ShouldRecognizeAChoice() {

// This is being left out for now due to it failing due to an issue in the Text Recognizers library.
// It should be worked out in the recognizers and then this test should be enabled again.
//@Test
@Test
public void ShouldNotRecognizeOtherText() {
ConversationState convoState = new ConversationState(new MemoryStorage());
StatePropertyAccessor<DialogState> dialogState = convoState.createProperty("dialogState");
Expand Down
21 changes: 0 additions & 21 deletions libraries/bot-integration-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,27 +74,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-integration-core</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
Expand Down
21 changes: 0 additions & 21 deletions libraries/bot-integration-spring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,27 +94,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-integration-spring</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check />
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
Expand Down
21 changes: 0 additions & 21 deletions libraries/bot-schema/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,27 +82,6 @@
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.eluder.coveralls</groupId>
<artifactId>coveralls-maven-plugin</artifactId>
<configuration>
<repoToken>yourcoverallsprojectrepositorytoken</repoToken>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<configuration>
<outputDirectory>../../cobertura-report/bot-schema</outputDirectory>
<format>xml</format>
<maxmem>256m</maxmem>
<!-- aggregated reports for multi-module projects -->
<aggregate>true</aggregate>
<check/>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
Expand Down
Loading