From 653734550dc39f678e096abdbd2a5fa415decccc Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Sun, 26 Jun 2016 23:28:51 +0200 Subject: [PATCH] Exclude SWIG .py files from Sonar analysis and remove unnecessary semi-colons in Python unit test scripts --- sonar-project.properties | 2 +- test/test_GLinalg.py | 82 +++++++++++++++++++++++++++++++++++++++++----------------------------------------- test/test_GObservation.py | 34 +++++++++++++++++----------------- test/test_GSky.py | 28 ++++++++++++++-------------- 4 files changed, 73 insertions(+), 73 deletions(-) diff --git a/sonar-project.properties b/sonar-project.properties index e36d9ba..b1d06c3 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -20,7 +20,7 @@ sonar.cxx.includeDirectories=include,inst/com/include,inst/cta/include,inst/mwl/ sonar.cxx.missingIncludeWarnings=False # Exclusions -sonar.exclusions=pyext/gammalib/*_wrap.cpp,pyext/build/**,doc/**,test/dev/**,inst/*/test/dev/** +sonar.exclusions=pyext/gammalib/*_wrap.cpp,pyext/gammalib/*.py,pyext/build/**,doc/**,test/dev/**,inst/*/test/dev/** sonar.coverage.exclusions=pyext/gammalib/*_wrap.cpp,pyext/build/**,doc/**,test/dev/**,inst/*/test/dev/** #sonar.test.exclusions= diff --git a/test/test_GLinalg.py b/test/test_GLinalg.py index e037ef5..fc2a2be 100755 --- a/test/test_GLinalg.py +++ b/test/test_GLinalg.py @@ -1,7 +1,7 @@ # ========================================================================== # This module performs unit tests for the GammaLib linalg module. # -# Copyright (C) 2012-2015 Juergen Knoedlseder +# Copyright (C) 2012-2016 Juergen Knoedlseder # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -69,86 +69,86 @@ class Test(gammalib.GPythonTestSuite): # Unary addition operator vector += vector_b - self.test_value(vector[0], 2.0); - self.test_value(vector[1], 4.0); - self.test_value(vector[2], 6.0); + self.test_value(vector[0], 2.0) + self.test_value(vector[1], 4.0) + self.test_value(vector[2], 6.0) # Unary multiplication operator vector *= 2.0 - self.test_value(vector[0], 4.0); - self.test_value(vector[1], 8.0); - self.test_value(vector[2], 12.0); + self.test_value(vector[0], 4.0) + self.test_value(vector[1], 8.0) + self.test_value(vector[2], 12.0) # Unary subtraction operator vector -= vector_b - self.test_value(vector[0], 3.0); - self.test_value(vector[1], 6.0); - self.test_value(vector[2], 9.0); + self.test_value(vector[0], 3.0) + self.test_value(vector[1], 6.0) + self.test_value(vector[2], 9.0) # Unary division operator vector /= 3.0 - self.test_value(vector[0], 1.0); - self.test_value(vector[1], 2.0); - self.test_value(vector[2], 3.0); + self.test_value(vector[0], 1.0) + self.test_value(vector[1], 2.0) + self.test_value(vector[2], 3.0) # Unary scalar addition operator vector += 1.0 - self.test_value(vector[0], 2.0); - self.test_value(vector[1], 3.0); - self.test_value(vector[2], 4.0); + self.test_value(vector[0], 2.0) + self.test_value(vector[1], 3.0) + self.test_value(vector[2], 4.0) # Unary scalar subtraction operator vector -= 1.0 - self.test_value(vector[0], 1.0); - self.test_value(vector[1], 2.0); - self.test_value(vector[2], 3.0); + self.test_value(vector[0], 1.0) + self.test_value(vector[1], 2.0) + self.test_value(vector[2], 3.0) # Negation operator vector = -vector - self.test_value(vector[0], -1.0); - self.test_value(vector[1], -2.0); - self.test_value(vector[2], -3.0); + self.test_value(vector[0], -1.0) + self.test_value(vector[1], -2.0) + self.test_value(vector[2], -3.0) vector = -vector # Binary addition operator vector = vector + vector_b - self.test_value(vector[0], 2.0); - self.test_value(vector[1], 4.0); - self.test_value(vector[2], 6.0); + self.test_value(vector[0], 2.0) + self.test_value(vector[1], 4.0) + self.test_value(vector[2], 6.0) # Binary multiplication operator vector = vector * 2.0 - self.test_value(vector[0], 4.0); - self.test_value(vector[1], 8.0); - self.test_value(vector[2], 12.0); + self.test_value(vector[0], 4.0) + self.test_value(vector[1], 8.0) + self.test_value(vector[2], 12.0) # Binary subtraction operator vector = vector - vector_b - self.test_value(vector[0], 3.0); - self.test_value(vector[1], 6.0); - self.test_value(vector[2], 9.0); + self.test_value(vector[0], 3.0) + self.test_value(vector[1], 6.0) + self.test_value(vector[2], 9.0) # Binary division operator vector = vector / 3.0 - self.test_value(vector[0], 1.0); - self.test_value(vector[1], 2.0); - self.test_value(vector[2], 3.0); + self.test_value(vector[0], 1.0) + self.test_value(vector[1], 2.0) + self.test_value(vector[2], 3.0) # Binary scalar addition operator vector = vector + 1.0 - self.test_value(vector[0], 2.0); - self.test_value(vector[1], 3.0); - self.test_value(vector[2], 4.0); + self.test_value(vector[0], 2.0) + self.test_value(vector[1], 3.0) + self.test_value(vector[2], 4.0) # Binary scalar subtraction operator vector = vector - 1.0 - self.test_value(vector[0], 1.0); - self.test_value(vector[1], 2.0); - self.test_value(vector[2], 3.0); + self.test_value(vector[0], 1.0) + self.test_value(vector[1], 2.0) + self.test_value(vector[2], 3.0) # Scalar product product = vector * vector - self.test_value(product, 14.0); + self.test_value(product, 14.0) # Return return diff --git a/test/test_GObservation.py b/test/test_GObservation.py index cee90c4..e824bf6 100755 --- a/test/test_GObservation.py +++ b/test/test_GObservation.py @@ -65,35 +65,35 @@ class Test(gammalib.GPythonTestSuite): # Unary addition operator energy += energy_b - self.test_value(energy.TeV(), 6.0); + self.test_value(energy.TeV(), 6.0) # Unary subtraction operator energy -= energy_b - self.test_value(energy.TeV(), 3.0); + self.test_value(energy.TeV(), 3.0) # Unary multiplication operator energy *= 2.0 - self.test_value(energy.TeV(), 6.0); + self.test_value(energy.TeV(), 6.0) # Unary division operator energy /= 2.0 - self.test_value(energy.TeV(), 3.0); + self.test_value(energy.TeV(), 3.0) # Binary addition operator energy = energy + energy_b - self.test_value(energy.TeV(), 6.0); + self.test_value(energy.TeV(), 6.0) # Binary subtraction operator energy = energy - energy_b - self.test_value(energy.TeV(), 3.0); + self.test_value(energy.TeV(), 3.0) # Scalar multiplication operator energy = energy * 2.0 - self.test_value(energy.TeV(), 6.0); + self.test_value(energy.TeV(), 6.0) # Scalar division operator energy = energy / 2.0 - self.test_value(energy.TeV(), 3.0); + self.test_value(energy.TeV(), 3.0) # Return return @@ -106,9 +106,9 @@ class Test(gammalib.GPythonTestSuite): # Setup 3 logarithmic energies energies = gammalib.GEnergies(3, gammalib.GEnergy(1.0, "MeV"), gammalib.GEnergy(100.0, "MeV")) - self.test_value(energies[0].MeV(), 1.0); - self.test_value(energies[1].MeV(), 10.0); - self.test_value(energies[2].MeV(), 100.0); + self.test_value(energies[0].MeV(), 1.0) + self.test_value(energies[1].MeV(), 10.0) + self.test_value(energies[2].MeV(), 100.0) # Return return @@ -126,28 +126,28 @@ class Test(gammalib.GPythonTestSuite): # Unary addition operator time = time_a.copy() time += secs_b - self.test_value(time.secs(), 11.0); + self.test_value(time.secs(), 11.0) # Unary subtraction operator time = time_a.copy() time -= secs_b - self.test_value(time.secs(), 7.0); + self.test_value(time.secs(), 7.0) # Binary left addition operator time = time_a + secs_b - self.test_value(time.secs(), 11.0); + self.test_value(time.secs(), 11.0) # Binary right addition operator time = secs_b + time_a - self.test_value(time.secs(), 11.0); + self.test_value(time.secs(), 11.0) # Binary subtraction operator time = time_a - secs_b - self.test_value(time.secs(), 7.0); + self.test_value(time.secs(), 7.0) # Binary time subtraction operator time = time_a - time_b - self.test_value(time, 6.0); + self.test_value(time, 6.0) # Return return diff --git a/test/test_GSky.py b/test/test_GSky.py index e781ccb..cf7742d 100755 --- a/test/test_GSky.py +++ b/test/test_GSky.py @@ -99,25 +99,25 @@ class Test(gammalib.GPythonTestSuite): map.shape(3,4) # Test map dimensions and shape - self.test_value(map.npix(), 80, "Check that sky map has 80 pixels"); - self.test_value(map.nx(), 10, "Check that sky map has X dimension of 10"); - self.test_value(map.ny(), 8, "Check that sky map has Y dimension of 8"); - self.test_value(map.nmaps(), 12, "Check that sky map contains 12 maps"); - self.test_value(map.ndim(), 2, "Check that sky map has two dimensions"); - self.test_value(len(map.shape()), 2, "Check that sky map has a shape size of 2"); - self.test_value(map.shape()[0], 3, "Check that sky map has 3 maps in first dimension"); - self.test_value(map.shape()[1], 4, "Check that sky map has 4 maps in second dimension"); + self.test_value(map.npix(), 80, "Check that sky map has 80 pixels") + self.test_value(map.nx(), 10, "Check that sky map has X dimension of 10") + self.test_value(map.ny(), 8, "Check that sky map has Y dimension of 8") + self.test_value(map.nmaps(), 12, "Check that sky map contains 12 maps") + self.test_value(map.ndim(), 2, "Check that sky map has two dimensions") + self.test_value(len(map.shape()), 2, "Check that sky map has a shape size of 2") + self.test_value(map.shape()[0], 3, "Check that sky map has 3 maps in first dimension") + self.test_value(map.shape()[1], 4, "Check that sky map has 4 maps in second dimension") # Set new map shape map.shape(2,3,2); # Test map dimensions and shape - self.test_value(map.nmaps(), 12, "Check that sky map contains 12 maps"); - self.test_value(map.ndim(), 3, "Check that sky map has three dimensions"); - self.test_value(len(map.shape()), 3, "Check that sky map has a shape size of 3"); - self.test_value(map.shape()[0], 2, "Check that sky map has 2 maps in first dimension"); - self.test_value(map.shape()[1], 3, "Check that sky map has 3 maps in second dimension"); - self.test_value(map.shape()[2], 2, "Check that sky map has 2 maps in third dimension"); + self.test_value(map.nmaps(), 12, "Check that sky map contains 12 maps") + self.test_value(map.ndim(), 3, "Check that sky map has three dimensions") + self.test_value(len(map.shape()), 3, "Check that sky map has a shape size of 3") + self.test_value(map.shape()[0], 2, "Check that sky map has 2 maps in first dimension") + self.test_value(map.shape()[1], 3, "Check that sky map has 3 maps in second dimension") + self.test_value(map.shape()[2], 2, "Check that sky map has 2 maps in third dimension") # Return return -- libgit2 0.21.4