Merge hotfix branch into master

Riverside-Software · Nov 7, 2019 · b2bc401 · b2bc401
2 parents 28d6f6b + d5352f7
commit b2bc401
Show file tree

Hide file tree

Showing 11 changed files with 1,125 additions and 15 deletions.
diff --git a/database-parser/pom.xml b/database-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>database-parser</artifactId>
-  <version>2.6.3</version>
+  <version>2.6.4</version>
 
   <name>OpenEdge database definition lexer and parser</name>
   <description>OpenEdge dump files parser</description>

diff --git a/listing-parser/pom.xml b/listing-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>listing-parser</artifactId>
-  <version>2.6.3</version>
+  <version>2.6.4</version>
 
   <name>OpenEdge listing so-called parser</name>
   <description>OpenEdge listing files parser</description>

diff --git a/openedge-checks/pom.xml b/openedge-checks/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.checks</groupId>
   <artifactId>openedge-checks</artifactId>
-  <version>2.6.3</version>
+  <version>2.6.4</version>
 
   <name>OpenEdge checks</name>
   <description>OpenEdge checks</description>
@@ -54,12 +54,12 @@
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>database-parser</artifactId>
-      <version>2.6.3</version>
+      <version>2.6.4</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>proparse</artifactId>
-      <version>2.6.3</version>
+      <version>2.6.4</version>
     </dependency>
     <dependency>
       <groupId>org.testng</groupId>

diff --git a/openedge-plugin/pom.xml b/openedge-plugin/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.sonar.openedge</groupId>
   <artifactId>sonar-openedge-plugin</artifactId>
-  <version>2.6.3</version>
+  <version>2.6.4</version>
   <packaging>sonar-plugin</packaging>
 
   <name>OpenEdge plugin for SonarQube</name>
@@ -62,17 +62,17 @@
     <dependency>
       <groupId>eu.rssw.openedge.checks</groupId>
       <artifactId>openedge-checks</artifactId>
-      <version>2.6.3</version>
+      <version>2.6.4</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>listing-parser</artifactId>
-      <version>2.6.3</version>
+      <version>2.6.4</version>
     </dependency>
     <dependency>
       <groupId>eu.rssw.openedge.parsers</groupId>
       <artifactId>profiler-parser</artifactId>
-      <version>2.6.3</version>
+      <version>2.6.4</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>

diff --git a/profiler-parser/pom.xml b/profiler-parser/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>eu.rssw.openedge.parsers</groupId>
   <artifactId>profiler-parser</artifactId>
-  <version>2.6.3</version>
+  <version>2.6.4</version>
 
   <name>OpenEdge profiler output lexer and parser</name>
   <description>OpenEdge profiler files parser</description>

diff --git a/profiler-parser/src/main/java/eu/rssw/antlr/profiler/Module.java b/profiler-parser/src/main/java/eu/rssw/antlr/profiler/Module.java
@@ -68,12 +68,18 @@ public Set<LineData> getLineData() {
    * sous-répertoire et extension
    */
   public String getModuleObject() {
+    // Up to 12.0 : name contains either file name or (internal procedure + file name)
+    // Starting from 12.1: third entry (optional), callee name when using super:xxx() or methods not overidden in child
+    // class
     if (name.indexOf(' ') > -1) {
-      return name.substring(name.indexOf(' ') + 1);
+      String tmp = name.substring(name.indexOf(' ') + 1);
+      if (tmp.indexOf(' ') > -1)
+        return tmp.substring(0, tmp.indexOf(' '));
+      else
+        return tmp;
     } else {
       return name;
     }
-
   }
 
   /**

diff --git a/profiler-parser/src/test/java/eu/rssw/antlr/profiler/TestProfiler.java b/profiler-parser/src/test/java/eu/rssw/antlr/profiler/TestProfiler.java
@@ -107,4 +107,23 @@ public void testProfiler10() throws IOException {
     Assert.assertTrue(session.getModuleById(1).getLinesToCover().contains(-2));
   }
 
+  @Test
+  public void testProfiler11() throws IOException {
+    // New file format in 12.1 - Module name includes callee name when using super:xxx() or methods not overidden in child class
+    ProfilerSession session = ProfilerUtils.getProfilerSession(new File("src/test/resources/profiler11.out"));
+    Assert.assertEquals(session.getVersionNumber(), 3);
+    Assert.assertEquals(session.getModules().size(), 7);
+    Assert.assertNotNull(session.getModuleByName("MyLogger"));
+    Assert.assertEquals(session.getModuleByName("MyLogger").getCoveredLines().size(), 3);
+    Assert.assertEquals(session.getModuleByName("MyLogger").getLinesToCover().size(), 3);
+
+    // Same test but using 11.7 profiler
+    ProfilerSession session2 = ProfilerUtils.getProfilerSession(new File("src/test/resources/profiler12.out"));
+    Assert.assertEquals(session2.getVersionNumber(), 1);
+    Assert.assertEquals(session2.getModules().size(), 7);
+    Assert.assertNotNull(session2.getModuleByName("MyLogger"));
+    Assert.assertEquals(session2.getModuleByName("MyLogger").getCoveredLines().size(), 3);
+    Assert.assertEquals(session2.getModuleByName("MyLogger").getLinesToCover().size(), 3);
+  }
+
 }