Merge 08fdb86 into 17bf5a8

diennea · Jan 2, 2019 · a6dc5dc · a6dc5dc
2 parents 17bf5a8 + 08fdb86
commit a6dc5dc
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ jobs:
   include:
   - stage: test
     jdk: openjdk11
-    script: mvn verify -Pjenkins -Dmaven.test.redirectTestOutputToFile=true
+    script: mvn verify -Dmaven.test.redirectTestOutputToFile=true jacoco:report coveralls:report
 
 branches:
   only:

diff --git a/blazingcache-core/src/test/java/blazingcache/client/ManagementStatusMXBeanTest.java b/blazingcache-core/src/test/java/blazingcache/client/ManagementStatusMXBeanTest.java
@@ -150,6 +150,8 @@ public void statusMBeanEnabled() throws Exception {
                 usedMemory = (Long) JMXUtils.getMBeanServer().getAttribute(statusBeanName, "CacheUsedMemory");
                 assertEquals(TEST_DATA.length * MAX_NO_OF_ENTRIES_BEFORE_EVICTION, usedMemory);
 
+                assertEquals(MAX_NO_OF_ENTRIES_BEFORE_EVICTION, cacheServer.getCacheStatus().getTotalEntryCount());
+
                 numberOfkeys = (Integer) JMXUtils.getMBeanServer().getAttribute(statusBeanName, "CacheSize");
                 assertEquals(MAX_NO_OF_ENTRIES_BEFORE_EVICTION, numberOfkeys);
 

diff --git a/pom.xml b/pom.xml
@@ -72,6 +72,7 @@
         <libs.jcipi-annotations>1.0</libs.jcipi-annotations> 
         <libs.spotbugsannotations>3.1.0</libs.spotbugsannotations>
         <libs.spotbugsmaven>3.1.8</libs.spotbugsmaven>   
+        <libs.jacoco>0.8.2</libs.jacoco>   
     </properties>  
     <dependencies>
         <dependency>
@@ -94,6 +95,11 @@
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <version>${libs.spotbugsmaven}</version>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${libs.jacoco}</version>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -118,21 +124,34 @@
             </distributionManagement>     
             <build>               
                 <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <version>${libs.jacoco}</version>
+                        <executions>
+                            <execution>
+                                <id>default-prepare-agent</id>                                
+                                <goals>
+                                    <goal>prepare-agent</goal>
+                                </goals>
+                            </execution>
+                        </executions>                       
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.18</version>
+                        <version>3.0.0-M3</version>
                         <configuration>                        
-                            <argLine>-Xmx1024m -Djava.net.preferIpv4Stack=true</argLine>
+                            <argLine>@{argLine} -Xmx1024m -Djava.net.preferIpv4Stack=true</argLine>                            
                             <forkCount>1</forkCount>
                             <reuseForks>false</reuseForks>
-                            <!--<redirectTestOutputToFile>true</redirectTestOutputToFile>-->
+                            <redirectTestOutputToFile>true</redirectTestOutputToFile>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.3</version>
+                        <version>3.8.0</version>
                         <configuration>
                             <encoding>${project.build.sourceEncoding}</encoding>
                         </configuration>
@@ -145,6 +164,18 @@
                             <encoding>${project.build.sourceEncoding}</encoding>
                         </configuration>
                     </plugin>
+                    <plugin>
+                        <groupId>org.eluder.coveralls</groupId>
+                        <artifactId>coveralls-maven-plugin</artifactId>
+                        <version>4.3.0</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>javax.xml.bind</groupId>
+                                <artifactId>jaxb-api</artifactId>
+                                <version>2.3.1</version>
+                            </dependency>
+                        </dependencies>
+                    </plugin>
                 </plugins>                
             </build>     
         </profile>
@@ -168,7 +199,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.18</version>
+                        <version>3.0.0-M3</version>
                         <configuration>                        
                             <argLine>-Xmx1024m -Djava.net.preferIpv4Stack=true</argLine>
                             <forkCount>1</forkCount>
@@ -178,23 +209,23 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.3</version>
+                        <version>3.8.0</version>
                         <configuration>
                             <encoding>${project.build.sourceEncoding}</encoding>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-resources-plugin</artifactId>
-                        <version>2.7</version>
+                        <version>3.1.0</version>
                         <configuration>
                             <encoding>${project.build.sourceEncoding}</encoding>
                         </configuration>
                     </plugin>
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.6</version>
+                        <version>1.6.8</version>
                         <extensions>true</extensions>
                         <configuration>
                             <serverId>ossrh</serverId>
@@ -205,7 +236,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.4</version>
+                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>
@@ -219,7 +250,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.3</version>
+                        <version>3.0.1</version>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>