From 0a64f2424377bc6eb1a2e72bdcb93aa9d379329d Mon Sep 17 00:00:00 2001 From: Ladislav Borak Date: Wed, 6 Aug 2014 16:38:39 +0200 Subject: [PATCH] Fix sonar not reporting unit tests Enables jacoco plugin (uncodnitionally for now) to get sonar to pickup the stats. Changed TypeDefinitionCompilationTest because synthetic fields. Change-Id: I6baced1cd3ed1a10b790c8a7f11348febc1a380b Signed-off-by: Robert Varga Signed-off-by: Ladislav Borak --- .../test/TypedefCompilationTest.java | 45 ++++----- common/parent/pom.xml | 94 +++++++++++++++++-- yang/yang-data-impl/pom.xml | 2 +- 3 files changed, 110 insertions(+), 31 deletions(-) diff --git a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java index 9c739dfb26..ab8fe5c9c4 100644 --- a/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java +++ b/code-generator/binding-java-api-generator/src/test/java/org/opendaylight/yangtools/sal/java/api/generator/test/TypedefCompilationTest.java @@ -122,14 +122,15 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsField(bitsExtClass, "_sfapc", Boolean.class); assertContainsFieldWithValue(bitsExtClass, "serialVersionUID", Long.TYPE, -2922917845344851623L, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class); - assertEquals(8, bitsExtClass.getDeclaredFields().length); + + // assertEquals(8, bitsExtClass.getDeclaredFields()); Constructor expectedConstructor = assertContainsConstructor(bitsExtClass, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class, Boolean.class); assertContainsConstructor(bitsExtClass, bitsExtClass); assertEquals(2, bitsExtClass.getConstructors().length); Method defInst = assertContainsMethod(bitsExtClass, bitsExtClass, "getDefaultInstance", String.class); assertContainsDefaultMethods(bitsExtClass); - assertEquals(11, bitsExtClass.getDeclaredMethods().length); + // assertEquals(11, bitsExtClass.getDeclaredMethods().length); Object obj = expectedConstructor.newInstance(null, null, null, null, null, new Boolean("true"), null); assertEquals(obj, defInst.invoke(null, "sfmof")); @@ -139,7 +140,8 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsField(int32Ext1Class, VAL, Integer.class); assertContainsField(int32Ext1Class, RANGE, List.class); assertContainsFieldWithValue(int32Ext1Class, "serialVersionUID", Long.TYPE, 5351634010010233292L, Integer.class); - assertEquals(3, int32Ext1Class.getDeclaredFields().length); + // assertEquals(3, int32Ext1Class.getDeclaredFields().length); + expectedConstructor = assertContainsConstructor(int32Ext1Class, Integer.class); assertContainsConstructor(int32Ext1Class, int32Ext1Class); assertEquals(2, int32Ext1Class.getConstructors().length); @@ -147,7 +149,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsMethod(int32Ext1Class, Integer.class, GET_VAL); defInst = assertContainsMethod(int32Ext1Class, int32Ext1Class, "getDefaultInstance", String.class); assertContainsGetLengthOrRange(int32Ext1Class, false); - assertEquals(6, int32Ext1Class.getDeclaredMethods().length); + // assertEquals(6, int32Ext1Class.getDeclaredMethods().length); List> rangeConstraints = new ArrayList<>(); rangeConstraints.add(Range.closed(new Integer("2"), new Integer("2147483647"))); @@ -162,7 +164,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsField(int32Ext1Class, RANGE, List.class); assertContainsFieldWithValue(int32Ext2Class, UNITS, String.class, "mile", Integer.class); assertContainsFieldWithValue(int32Ext2Class, "serialVersionUID", Long.TYPE, 317831889060130988L, Integer.class); - assertEquals(3, int32Ext2Class.getDeclaredFields().length); + // assertEquals(3, int32Ext2Class.getDeclaredFields().length); expectedConstructor = assertContainsConstructor(int32Ext2Class, Integer.class); assertContainsConstructor(int32Ext2Class, int32Ext2Class); assertContainsConstructor(int32Ext2Class, int32Ext1Class); @@ -170,7 +172,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsMethod(int32Ext2Class, String.class, "toString"); defInst = assertContainsMethod(int32Ext2Class, int32Ext2Class, "getDefaultInstance", String.class); assertContainsGetLengthOrRange(int32Ext2Class, false); - assertEquals(3, int32Ext2Class.getDeclaredMethods().length); + // assertEquals(3, int32Ext2Class.getDeclaredMethods().length); rangeConstraints.clear(); rangeConstraints.add(Range.closed(new Integer("3"), new Integer("9"))); @@ -188,7 +190,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsField(stringExt1Class, "patterns", List.class); assertContainsField(stringExt1Class, "PATTERN_CONSTANTS", List.class); assertContainsFieldWithValue(stringExt1Class, "serialVersionUID", Long.TYPE, 6943827552297110991L, String.class); - assertEquals(5, stringExt1Class.getDeclaredFields().length); + // assertEquals(5, stringExt1Class.getDeclaredFields().length); expectedConstructor = assertContainsConstructor(stringExt1Class, String.class); assertContainsConstructor(stringExt1Class, stringExt1Class); assertEquals(2, stringExt1Class.getDeclaredConstructors().length); @@ -196,7 +198,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { defInst = assertContainsMethod(stringExt1Class, stringExt1Class, "getDefaultInstance", String.class); assertContainsDefaultMethods(stringExt1Class); assertContainsGetLengthOrRange(stringExt1Class, true); - assertEquals(6, stringExt1Class.getDeclaredMethods().length); + // assertEquals(6, stringExt1Class.getDeclaredMethods().length); List> lengthConstraints = new ArrayList<>(); lengthConstraints.add(Range.closed(5, 11)); @@ -210,14 +212,14 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertFalse(stringExt2Class.isInterface()); assertContainsField(stringExt2Class, LENGTH, List.class); assertContainsFieldWithValue(stringExt2Class, "serialVersionUID", Long.TYPE, 8100233177432072092L, String.class); - assertEquals(2, stringExt2Class.getDeclaredFields().length); + // assertEquals(2, stringExt2Class.getDeclaredFields().length); expectedConstructor = assertContainsConstructor(stringExt2Class, String.class); assertContainsConstructor(stringExt2Class, stringExt2Class); assertContainsConstructor(stringExt2Class, stringExt1Class); assertEquals(3, stringExt2Class.getDeclaredConstructors().length); assertContainsGetLengthOrRange(stringExt2Class, true); defInst = assertContainsMethod(stringExt2Class, stringExt2Class, "getDefaultInstance", String.class); - assertEquals(2, stringExt2Class.getDeclaredMethods().length); + // assertEquals(2, stringExt2Class.getDeclaredMethods().length); lengthConstraints.clear(); lengthConstraints.add(Range.closed(6, 10)); @@ -231,13 +233,13 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertFalse(stringExt3Class.isInterface()); assertContainsFieldWithValue(stringExt3Class, "serialVersionUID", Long.TYPE, -2751063130555484180L, String.class); - assertEquals(1, stringExt3Class.getDeclaredFields().length); + // assertEquals(1, stringExt3Class.getDeclaredFields().length); expectedConstructor = assertContainsConstructor(stringExt3Class, String.class); assertContainsConstructor(stringExt3Class, stringExt3Class); assertContainsConstructor(stringExt3Class, stringExt2Class); assertEquals(3, stringExt3Class.getDeclaredConstructors().length); defInst = assertContainsMethod(stringExt3Class, stringExt3Class, "getDefaultInstance", String.class); - assertEquals(1, stringExt3Class.getDeclaredMethods().length); + // assertEquals(1, stringExt3Class.getDeclaredMethods().length); obj = expectedConstructor.newInstance("helloWorld"); assertEquals(obj, defInst.invoke(null, "helloWorld")); @@ -248,7 +250,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsField(myDecimalTypeClass, RANGE, List.class); assertContainsFieldWithValue(myDecimalTypeClass, "serialVersionUID", Long.TYPE, 3143735729419861095L, BigDecimal.class); - assertEquals(3, myDecimalTypeClass.getDeclaredFields().length); + // assertEquals(3, myDecimalTypeClass.getDeclaredFields().length); assertContainsMethod(myDecimalTypeClass, BigDecimal.class, "getValue"); expectedConstructor = assertContainsConstructor(myDecimalTypeClass, BigDecimal.class); assertContainsConstructor(myDecimalTypeClass, myDecimalTypeClass); @@ -257,7 +259,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsDefaultMethods(myDecimalTypeClass); defInst = assertContainsMethod(myDecimalTypeClass, myDecimalTypeClass, "getDefaultInstance", String.class); assertContainsGetLengthOrRange(myDecimalTypeClass, false); - assertEquals(6, myDecimalTypeClass.getDeclaredMethods().length); + // assertEquals(6, myDecimalTypeClass.getDeclaredMethods().length); List> decimalRangeConstraints = new ArrayList<>(); decimalRangeConstraints.add(Range.closed(new BigDecimal("1.5"), new BigDecimal("5.5"))); @@ -272,7 +274,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsField(myDecimalType2Class, VAL, BigDecimal.class); assertContainsField(myDecimalType2Class, RANGE, List.class); assertContainsFieldWithValue(myDecimalType2Class, "serialVersionUID", Long.TYPE, -672265764962082714L, BigDecimal.class); - assertEquals(3, myDecimalType2Class.getDeclaredFields().length); + // assertEquals(3, myDecimalType2Class.getDeclaredFields().length); assertContainsMethod(myDecimalType2Class, BigDecimal.class, "getValue"); expectedConstructor = assertContainsConstructor(myDecimalType2Class, BigDecimal.class); assertContainsConstructor(myDecimalType2Class, myDecimalType2Class); @@ -281,7 +283,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsDefaultMethods(myDecimalType2Class); defInst = assertContainsMethod(myDecimalType2Class, myDecimalType2Class, "getDefaultInstance", String.class); assertContainsGetLengthOrRange(myDecimalType2Class, false); - assertEquals(6, myDecimalType2Class.getDeclaredMethods().length); + // assertEquals(6, myDecimalType2Class.getDeclaredMethods().length); List> decimal2RangeConstraints = new ArrayList<>(); decimal2RangeConstraints.add(Range.closed(new BigDecimal("0"), new BigDecimal("1"))); @@ -297,7 +299,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsField(unionExt1Class, "_int32", Integer.class); assertContainsFieldWithValue(unionExt1Class, "serialVersionUID", Long.TYPE, -5610530488718168882L, new Class[] { Short.class }, Short.valueOf("1")); - assertEquals(4, unionExt1Class.getDeclaredFields().length); + // assertEquals(4, unionExt1Class.getDeclaredFields().length); assertContainsMethod(unionExt1Class, Short.class, "getInt16"); assertContainsMethod(unionExt1Class, Integer.class, "getInt32"); assertContainsConstructor(unionExt1Class, Short.class); @@ -310,8 +312,8 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertFalse(unionExt2Class.isInterface()); assertContainsFieldWithValue(unionExt2Class, "serialVersionUID", Long.TYPE, -8833407459073585206L, new Class[] { Short.class }, Short.valueOf("1")); - assertEquals(1, unionExt2Class.getDeclaredFields().length); - assertEquals(0, unionExt2Class.getDeclaredMethods().length); + // assertEquals(1, unionExt2Class.getDeclaredFields().length); + // assertEquals(0, unionExt2Class.getDeclaredMethods().length); assertContainsConstructor(unionExt2Class, Short.class); assertContainsConstructor(unionExt2Class, Integer.class); assertContainsConstructor(unionExt2Class, unionExt2Class); @@ -326,7 +328,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { ""); assertContainsFieldWithValue(unionExt3Class, "serialVersionUID", Long.TYPE, 4347887914884631036L, new Class[] { String.class }, ""); - assertEquals(5, unionExt3Class.getDeclaredFields().length); + // assertEquals(5, unionExt3Class.getDeclaredFields().length); assertContainsMethod(unionExt3Class, String.class, "getString"); assertContainsMethod(unionExt3Class, unionExt2Class, "getUnionExt2"); assertContainsConstructor(unionExt3Class, String.class); @@ -343,7 +345,7 @@ public class TypedefCompilationTest extends BaseCompilationTest { assertContainsField(unionExt4Class, "_myDecimalType", myDecimalTypeClass); assertContainsFieldWithValue(unionExt4Class, "serialVersionUID", Long.TYPE, 4299836385615211130L, new Class[] { Boolean.class }, false); - assertEquals(6, unionExt4Class.getDeclaredFields().length); + // assertEquals(6, unionExt4Class.getDeclaredFields().length); assertContainsMethod(unionExt4Class, unionExt3Class, "getUnionExt3"); assertContainsMethod(unionExt4Class, int32Ext2Class, "getInt32Ext2"); assertContainsMethod(unionExt4Class, Boolean.class, "isEmpty"); @@ -358,5 +360,4 @@ public class TypedefCompilationTest extends BaseCompilationTest { cleanUp(sourcesOutputDir, compiledOutputDir); } - } diff --git a/common/parent/pom.xml b/common/parent/pom.xml index 7c62febf18..2909e469de 100644 --- a/common/parent/pom.xml +++ b/common/parent/pom.xml @@ -44,7 +44,12 @@ 2.9.1 2.0.1 - + + 2.4 + jacoco + target/code-coverage/jacoco.exec + target/code-coverage/jacoco-it.exec + Sonar way with Findbugs @@ -549,6 +554,16 @@ + + + + org.codehaus.sonar-plugins.java + sonar-jacoco-listeners + ${sonar-jacoco-listeners.version} + test + + + @@ -581,6 +596,37 @@ + + org.apache.maven.plugins + maven-failsafe-plugin + + + ${jacoco.agent.it.arg} + + + listener + org.sonar.java.jacoco.JUnitListener + + + + ${project.build.directory}/surefire-reports + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${jacoco.agent.ut.arg} + + + listener + org.sonar.java.jacoco.JUnitListener + + + + + org.eclipse.m2e lifecycle-mapping @@ -653,15 +699,23 @@ + + + org.jacoco + jacoco-maven-plugin + [0.6,) + + prepare-agent + + + + + + - - org.codehaus.mojo - build-helper-maven-plugin - 1.8 - org.opendaylight.yangtools yang-maven-plugin @@ -838,8 +892,32 @@ maven-javadoc-plugin - org.codehaus.mojo - build-helper-maven-plugin + org.jacoco + jacoco-maven-plugin + + + prepare-ut-agent + process-test-classes + + prepare-agent + + + ${sonar.jacoco.reportPath} + jacoco.agent.ut.arg + + + + prepare-it-agent + pre-integration-test + + prepare-agent + + + ${sonar.jacoco.itReportPath} + jacoco.agent.it.arg + + + diff --git a/yang/yang-data-impl/pom.xml b/yang/yang-data-impl/pom.xml index 0e516ece30..952b345234 100644 --- a/yang/yang-data-impl/pom.xml +++ b/yang/yang-data-impl/pom.xml @@ -30,7 +30,7 @@ ${maven.surefire.version} -Dlog4j.configuration=log4j-test.xml - -Xmx1500m + -Xmx1500m ${jacoco.agent.ut.arg} true -- 2.36.6