Andreas Specovius / gammalib

Commit 653734550dc39f678e096abdbd2a5fa415decccc

Authored by Jürgen Knödlseder
1 parent e0ff62a7

Exclude SWIG .py files from Sonar analysis and remove unnecessary semi-colons in… 

… Python unit test scripts
Inline Side-by-side
Showing 4 changed files with 73 additions and 73 deletions
sonar-project.properties
  View file @6537345
... ... @@ -20,7 +20,7 @@ sonar.cxx.includeDirectories=include,inst/com/include,inst/cta/include,inst/mwl/
20 20 sonar.cxx.missingIncludeWarnings=False
21 21  
22 22 # Exclusions
23   -sonar.exclusions=pyext/gammalib/*_wrap.cpp,pyext/build/**,doc/**,test/dev/**,inst/*/test/dev/**
  23 +sonar.exclusions=pyext/gammalib/*_wrap.cpp,pyext/gammalib/*.py,pyext/build/**,doc/**,test/dev/**,inst/*/test/dev/**
24 24 sonar.coverage.exclusions=pyext/gammalib/*_wrap.cpp,pyext/build/**,doc/**,test/dev/**,inst/*/test/dev/**
25 25 #sonar.test.exclusions=
26 26  
... ...
test/test_GLinalg.py
  View file @6537345
1 1 # ==========================================================================
2 2 # This module performs unit tests for the GammaLib linalg module.
3 3 #
4   -# Copyright (C) 2012-2015 Juergen Knoedlseder
  4 +# Copyright (C) 2012-2016 Juergen Knoedlseder
5 5 #
6 6 # This program is free software: you can redistribute it and/or modify
7 7 # it under the terms of the GNU General Public License as published by
... ... @@ -69,86 +69,86 @@ class Test(gammalib.GPythonTestSuite):
69 69  
70 70 # Unary addition operator
71 71 vector += vector_b
72   - self.test_value(vector[0], 2.0);
73   - self.test_value(vector[1], 4.0);
74   - self.test_value(vector[2], 6.0);
  72 + self.test_value(vector[0], 2.0)
  73 + self.test_value(vector[1], 4.0)
  74 + self.test_value(vector[2], 6.0)
75 75  
76 76 # Unary multiplication operator
77 77 vector *= 2.0
78   - self.test_value(vector[0], 4.0);
79   - self.test_value(vector[1], 8.0);
80   - self.test_value(vector[2], 12.0);
  78 + self.test_value(vector[0], 4.0)
  79 + self.test_value(vector[1], 8.0)
  80 + self.test_value(vector[2], 12.0)
81 81  
82 82 # Unary subtraction operator
83 83 vector -= vector_b
84   - self.test_value(vector[0], 3.0);
85   - self.test_value(vector[1], 6.0);
86   - self.test_value(vector[2], 9.0);
  84 + self.test_value(vector[0], 3.0)
  85 + self.test_value(vector[1], 6.0)
  86 + self.test_value(vector[2], 9.0)
87 87  
88 88 # Unary division operator
89 89 vector /= 3.0
90   - self.test_value(vector[0], 1.0);
91   - self.test_value(vector[1], 2.0);
92   - self.test_value(vector[2], 3.0);
  90 + self.test_value(vector[0], 1.0)
  91 + self.test_value(vector[1], 2.0)
  92 + self.test_value(vector[2], 3.0)
93 93  
94 94 # Unary scalar addition operator
95 95 vector += 1.0
96   - self.test_value(vector[0], 2.0);
97   - self.test_value(vector[1], 3.0);
98   - self.test_value(vector[2], 4.0);
  96 + self.test_value(vector[0], 2.0)
  97 + self.test_value(vector[1], 3.0)
  98 + self.test_value(vector[2], 4.0)
99 99  
100 100 # Unary scalar subtraction operator
101 101 vector -= 1.0
102   - self.test_value(vector[0], 1.0);
103   - self.test_value(vector[1], 2.0);
104   - self.test_value(vector[2], 3.0);
  102 + self.test_value(vector[0], 1.0)
  103 + self.test_value(vector[1], 2.0)
  104 + self.test_value(vector[2], 3.0)
105 105  
106 106 # Negation operator
107 107 vector = -vector
108   - self.test_value(vector[0], -1.0);
109   - self.test_value(vector[1], -2.0);
110   - self.test_value(vector[2], -3.0);
  108 + self.test_value(vector[0], -1.0)
  109 + self.test_value(vector[1], -2.0)
  110 + self.test_value(vector[2], -3.0)
111 111 vector = -vector
112 112  
113 113 # Binary addition operator
114 114 vector = vector + vector_b
115   - self.test_value(vector[0], 2.0);
116   - self.test_value(vector[1], 4.0);
117   - self.test_value(vector[2], 6.0);
  115 + self.test_value(vector[0], 2.0)
  116 + self.test_value(vector[1], 4.0)
  117 + self.test_value(vector[2], 6.0)
118 118  
119 119 # Binary multiplication operator
120 120 vector = vector * 2.0
121   - self.test_value(vector[0], 4.0);
122   - self.test_value(vector[1], 8.0);
123   - self.test_value(vector[2], 12.0);
  121 + self.test_value(vector[0], 4.0)
  122 + self.test_value(vector[1], 8.0)
  123 + self.test_value(vector[2], 12.0)
124 124  
125 125 # Binary subtraction operator
126 126 vector = vector - vector_b
127   - self.test_value(vector[0], 3.0);
128   - self.test_value(vector[1], 6.0);
129   - self.test_value(vector[2], 9.0);
  127 + self.test_value(vector[0], 3.0)
  128 + self.test_value(vector[1], 6.0)
  129 + self.test_value(vector[2], 9.0)
130 130  
131 131 # Binary division operator
132 132 vector = vector / 3.0
133   - self.test_value(vector[0], 1.0);
134   - self.test_value(vector[1], 2.0);
135   - self.test_value(vector[2], 3.0);
  133 + self.test_value(vector[0], 1.0)
  134 + self.test_value(vector[1], 2.0)
  135 + self.test_value(vector[2], 3.0)
136 136  
137 137 # Binary scalar addition operator
138 138 vector = vector + 1.0
139   - self.test_value(vector[0], 2.0);
140   - self.test_value(vector[1], 3.0);
141   - self.test_value(vector[2], 4.0);
  139 + self.test_value(vector[0], 2.0)
  140 + self.test_value(vector[1], 3.0)
  141 + self.test_value(vector[2], 4.0)
142 142  
143 143 # Binary scalar subtraction operator
144 144 vector = vector - 1.0
145   - self.test_value(vector[0], 1.0);
146   - self.test_value(vector[1], 2.0);
147   - self.test_value(vector[2], 3.0);
  145 + self.test_value(vector[0], 1.0)
  146 + self.test_value(vector[1], 2.0)
  147 + self.test_value(vector[2], 3.0)
148 148  
149 149 # Scalar product
150 150 product = vector * vector
151   - self.test_value(product, 14.0);
  151 + self.test_value(product, 14.0)
152 152  
153 153 # Return
154 154 return
... ...
test/test_GObservation.py
  View file @6537345
... ... @@ -65,35 +65,35 @@ class Test(gammalib.GPythonTestSuite):
65 65  
66 66 # Unary addition operator
67 67 energy += energy_b
68   - self.test_value(energy.TeV(), 6.0);
  68 + self.test_value(energy.TeV(), 6.0)
69 69  
70 70 # Unary subtraction operator
71 71 energy -= energy_b
72   - self.test_value(energy.TeV(), 3.0);
  72 + self.test_value(energy.TeV(), 3.0)
73 73  
74 74 # Unary multiplication operator
75 75 energy *= 2.0
76   - self.test_value(energy.TeV(), 6.0);
  76 + self.test_value(energy.TeV(), 6.0)
77 77  
78 78 # Unary division operator
79 79 energy /= 2.0
80   - self.test_value(energy.TeV(), 3.0);
  80 + self.test_value(energy.TeV(), 3.0)
81 81  
82 82 # Binary addition operator
83 83 energy = energy + energy_b
84   - self.test_value(energy.TeV(), 6.0);
  84 + self.test_value(energy.TeV(), 6.0)
85 85  
86 86 # Binary subtraction operator
87 87 energy = energy - energy_b
88   - self.test_value(energy.TeV(), 3.0);
  88 + self.test_value(energy.TeV(), 3.0)
89 89  
90 90 # Scalar multiplication operator
91 91 energy = energy * 2.0
92   - self.test_value(energy.TeV(), 6.0);
  92 + self.test_value(energy.TeV(), 6.0)
93 93  
94 94 # Scalar division operator
95 95 energy = energy / 2.0
96   - self.test_value(energy.TeV(), 3.0);
  96 + self.test_value(energy.TeV(), 3.0)
97 97  
98 98 # Return
99 99 return
... ... @@ -106,9 +106,9 @@ class Test(gammalib.GPythonTestSuite):
106 106 # Setup 3 logarithmic energies
107 107 energies = gammalib.GEnergies(3, gammalib.GEnergy(1.0, "MeV"),
108 108 gammalib.GEnergy(100.0, "MeV"))
109   - self.test_value(energies[0].MeV(), 1.0);
110   - self.test_value(energies[1].MeV(), 10.0);
111   - self.test_value(energies[2].MeV(), 100.0);
  109 + self.test_value(energies[0].MeV(), 1.0)
  110 + self.test_value(energies[1].MeV(), 10.0)
  111 + self.test_value(energies[2].MeV(), 100.0)
112 112  
113 113 # Return
114 114 return
... ... @@ -126,28 +126,28 @@ class Test(gammalib.GPythonTestSuite):
126 126 # Unary addition operator
127 127 time = time_a.copy()
128 128 time += secs_b
129   - self.test_value(time.secs(), 11.0);
  129 + self.test_value(time.secs(), 11.0)
130 130  
131 131 # Unary subtraction operator
132 132 time = time_a.copy()
133 133 time -= secs_b
134   - self.test_value(time.secs(), 7.0);
  134 + self.test_value(time.secs(), 7.0)
135 135  
136 136 # Binary left addition operator
137 137 time = time_a + secs_b
138   - self.test_value(time.secs(), 11.0);
  138 + self.test_value(time.secs(), 11.0)
139 139  
140 140 # Binary right addition operator
141 141 time = secs_b + time_a
142   - self.test_value(time.secs(), 11.0);
  142 + self.test_value(time.secs(), 11.0)
143 143  
144 144 # Binary subtraction operator
145 145 time = time_a - secs_b
146   - self.test_value(time.secs(), 7.0);
  146 + self.test_value(time.secs(), 7.0)
147 147  
148 148 # Binary time subtraction operator
149 149 time = time_a - time_b
150   - self.test_value(time, 6.0);
  150 + self.test_value(time, 6.0)
151 151  
152 152 # Return
153 153 return
... ...
test/test_GSky.py
  View file @6537345
... ... @@ -99,25 +99,25 @@ class Test(gammalib.GPythonTestSuite):
99 99 map.shape(3,4)
100 100  
101 101 # Test map dimensions and shape
102   - self.test_value(map.npix(), 80, "Check that sky map has 80 pixels");
103   - self.test_value(map.nx(), 10, "Check that sky map has X dimension of 10");
104   - self.test_value(map.ny(), 8, "Check that sky map has Y dimension of 8");
105   - self.test_value(map.nmaps(), 12, "Check that sky map contains 12 maps");
106   - self.test_value(map.ndim(), 2, "Check that sky map has two dimensions");
107   - self.test_value(len(map.shape()), 2, "Check that sky map has a shape size of 2");
108   - self.test_value(map.shape()[0], 3, "Check that sky map has 3 maps in first dimension");
109   - self.test_value(map.shape()[1], 4, "Check that sky map has 4 maps in second dimension");
  102 + self.test_value(map.npix(), 80, "Check that sky map has 80 pixels")
  103 + self.test_value(map.nx(), 10, "Check that sky map has X dimension of 10")
  104 + self.test_value(map.ny(), 8, "Check that sky map has Y dimension of 8")
  105 + self.test_value(map.nmaps(), 12, "Check that sky map contains 12 maps")
  106 + self.test_value(map.ndim(), 2, "Check that sky map has two dimensions")
  107 + self.test_value(len(map.shape()), 2, "Check that sky map has a shape size of 2")
  108 + self.test_value(map.shape()[0], 3, "Check that sky map has 3 maps in first dimension")
  109 + self.test_value(map.shape()[1], 4, "Check that sky map has 4 maps in second dimension")
110 110  
111 111 # Set new map shape
112 112 map.shape(2,3,2);
113 113  
114 114 # Test map dimensions and shape
115   - self.test_value(map.nmaps(), 12, "Check that sky map contains 12 maps");
116   - self.test_value(map.ndim(), 3, "Check that sky map has three dimensions");
117   - self.test_value(len(map.shape()), 3, "Check that sky map has a shape size of 3");
118   - self.test_value(map.shape()[0], 2, "Check that sky map has 2 maps in first dimension");
119   - self.test_value(map.shape()[1], 3, "Check that sky map has 3 maps in second dimension");
120   - self.test_value(map.shape()[2], 2, "Check that sky map has 2 maps in third dimension");
  115 + self.test_value(map.nmaps(), 12, "Check that sky map contains 12 maps")
  116 + self.test_value(map.ndim(), 3, "Check that sky map has three dimensions")
  117 + self.test_value(len(map.shape()), 3, "Check that sky map has a shape size of 3")
  118 + self.test_value(map.shape()[0], 2, "Check that sky map has 2 maps in first dimension")
  119 + self.test_value(map.shape()[1], 3, "Check that sky map has 3 maps in second dimension")
  120 + self.test_value(map.shape()[2], 2, "Check that sky map has 2 maps in third dimension")
121 121  
122 122 # Return
123 123 return
... ...