Skip to content

Commit 5ce2a90

Browse files
okorachokorach
committed
Improve IT
1 parent b0a23a1 commit 5ce2a90

File tree

2 files changed

+37
-31
lines changed

2 files changed

+37
-31
lines changed

‎test/it.sh‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -105,22 +105,22 @@ do
105105
export SONAR_HOST_URL="http://localhost:$sqport"
106106
fi
107107

108-
f="measures-$env-unrel.csv"; run_test "$f" sonar-measures-export -b -f "$f" -m _main --withURL
108+
f="measures-$env-unrel.csv"; run_test "$f" sonar-measures-export -b -m _main --withURL
109109
f="measures-$env-2.csv"; run_test_stdout "$f" sonar-measures-export -b -m _main --withURL
110110
f="measures-$env-3.csv"; run_test_stdout "$f" sonar-measures-export -b -p -r -d -m _all
111111

112-
f="measures-$env-1.json"; run_test "$f" sonar-measures-export -b -f "$f" -m _all
112+
f="measures-$env-1.json"; run_test "$f" sonar-measures-export -b -m _all
113113
f="measures-$env-2.json"; run_test_stdout "$f" sonar-measures-export -b -p -r -d -m _all --format json
114-
f="measures-$env-3.csv"; run_test "$f" sonar-measures-export -b -f "$f" --csvSeparator '+' -m _main
114+
f="measures-$env-3.csv"; run_test "$f" sonar-measures-export -b --csvSeparator '+' -m _main
115115

116-
f="measures-history-$env-1.csv"; run_test "$f" sonar-measures-export -b -f "$f" --history
117-
f="measures-history-$env-2.csv"; run_test "$f" sonar-measures-export -b -f "$f" -k okorach_sonar-tools --history --asTable
118-
f="measures-history-$env-3.json"; run_test "$f" sonar-measures-export -b -f "$f" --history
116+
f="measures-history-$env-1.csv"; run_test "$f" sonar-measures-export -b --history
117+
f="measures-history-$env-2.csv"; run_test "$f" sonar-measures-export -b -k okorach_sonar-tools --history --asTable
118+
f="measures-history-$env-3.json"; run_test "$f" sonar-measures-export -b --history
119119

120120
logmsg "IT $env sonar-findings-export"
121121

122-
f="findings-$env-unrel.csv"; run_test "$f" sonar-findings-export -v DEBUG -f "$f"
123-
f="findings-$env-1.json"; run_test "$f" sonar-findings-export -f "$f"
122+
f="findings-$env-unrel.csv"; run_test "$f" sonar-findings-export -v DEBUG
123+
f="findings-$env-1.json"; run_test "$f" sonar-findings-export
124124
f="findings-$env-2.json"; run_test_stdout "$f" sonar-findings-export -v DEBUG --format json -k okorach_audio-video-tools,okorach_sonar-tools
125125
f="findings-$env-3.json"; run_test_stdout "$f" sonar-findings-export -v DEBUG --format json -k okorach_audio-video-tools,okorach_sonar-tools --useFindings
126126
f="findings-$env-4.csv"; run_test_stdout "$f" sonar-findings-export --format csv -k okorach_audio-video-tools,okorach_sonar-tools --csvSeparator '+'
@@ -131,7 +131,7 @@ do
131131
else
132132
logmsg "IT $env sonar-audit"
133133
f="audit-$env-unrel.csv"; run_test_stdout "$f" sonar-audit
134-
f="audit-$env-1.json"; run_test "$f" sonar-audit -f "$f"
134+
f="audit-$env-1.json"; run_test "$f" sonar-audit
135135
f="audit-$env-2.json"; run_test_stdout "$f" sonar-audit --format json --what qualitygates,qualityprofiles,settings
136136
f="audit-$env-3.csv"; run_test_stdout "$f" sonar-audit --csvSeparator '+' --format csv
137137

@@ -142,37 +142,37 @@ do
142142
logmsg "IT $env sonar-loc"
143143
f="loc-$env-1.csv"; run_test_stdout "$f" sonar-loc
144144
f="loc-$env-unrel.csv"; run_test_stdout "$f" sonar-loc -n -a
145-
f="loc-$env-2.csv"; run_test "$f" sonar-loc -n -a -f "$f" --csvSeparator ';'
145+
f="loc-$env-2.csv"; run_test "$f" sonar-loc -n -a --csvSeparator ';'
146146

147147
logmsg "sonar-rules $env"
148148
f="rules-$env-1.csv"; run_test_stdout "$f" sonar-rules -e
149-
f="rules-$env-2.csv"; run_test "$f" sonar-rules -e -f "$f"
149+
f="rules-$env-2.csv"; run_test "$f" sonar-rules -e
150150
f="rules-$env-3.json"; run_test_stdout "$f" sonar-rules -e --format json
151-
f="rules-$env-4.json"; run_test "$f" sonar-rules -e -f "$f"
151+
f="rules-$env-4.json"; run_test "$f" sonar-rules -e
152152

153153
logmsg "sonar-config $env"
154154
f="config-$env-1.json"; run_test_stdout "$f" sonar-config -e -w "qualitygates, qualityprofiles, projects" -k okorach_audio-video-tools,okorach_sonar-tools
155155
f="config-$env-2.json"; run_test_stdout "$f" sonar-config --export
156-
f="config-$env-unrel.json"; run_test "$f" sonar-config --export -f "$f"
156+
f="config-$env-unrel.json"; run_test "$f" sonar-config --export
157157

158158
if [ $noExport -eq 1 ]; then
159159
logmsg "sonar-projects-export $env test skipped"
160160
elif [ "$env" = "sonarcloud" ]; then
161161
logmsg "sonar-projects-export $env SKIPPED"
162162
else
163163
logmsg "sonar-projects-export $env"
164-
f="proj-export-$env-2.json"; run_test "$f" sonar-projects-export -f "$f"
164+
f="proj-export-$env-2.json"; run_test "$f" sonar-projects-export
165165
fi
166166

167167
logmsg "sonar-findings-export $env ADMIN export"
168-
f1="findings-$env-admin.csv"; run_test "$f1" sonar-findings-export -v DEBUG -f "$f1" -k okorach_audio-video-tools,okorach_sonar-tools
168+
f1="findings-$env-admin.csv"; run_test "$f1" sonar-findings-export -v DEBUG -k okorach_audio-video-tools,okorach_sonar-tools
169169

170170
if [ "$env" = "sonarcloud" ]; then
171171
logmsg "sonar-projects-export $env SKIPPED"
172172
else
173173
logmsg "sonar-findings-export $env USER export"
174174
export SONAR_TOKEN=$SONAR_TOKEN_USER_USER
175-
f2="findings-$env-user.csv"; run_test "$f2" sonar-findings-export -v DEBUG -f "$f2" -k okorach_audio-video-tools,okorach_sonar-tools
175+
f2="findings-$env-user.csv"; run_test "$f2" sonar-findings-export -v DEBUG -k okorach_audio-video-tools,okorach_sonar-tools
176176
fi
177177

178178
# Restore admin token as long as previous version is 2.9 or less
@@ -181,26 +181,27 @@ do
181181

182182
export SONAR_TOKEN="$SONAR_TOKEN_ADMIN_USER"
183183
logmsg "IT released tools $env"
184-
f="measures-$env-rel.csv"; run_test "$f" sonar-measures-export -b -f "measures-$env-rel.csv" -m _main --withURL
185-
f="findings-$env-rel.csv"; run_test "$f" sonar-findings-export -f "findings-$env-rel.csv"
184+
f="measures-$env-rel.csv"; run_test "$f" sonar-measures-export -b -m _main --withURL
185+
# sonar-measures-export -b -f "$f"
186+
f="findings-$env-rel.csv"; run_test "$f" sonar-findings-export
186187
# f="audit-$env-rel.csv"; run_test "$f" sonar-audit -f "audit-$env-rel.csv"
187-
f="loc-$env-rel.csv"; run_test "$f" sonar-loc -n -a -f "loc-$env-rel.csv"
188-
f="config-$env-rel.json"; run_test "$f" sonar-config -e -f "config-$env-rel.json"
188+
f="loc-$env-rel.csv"; run_test "$f" sonar-loc -n -a
189+
f="config-$env-rel.json"; run_test "$f" sonar-config -e
189190

190191
logmsg "IT compare released and unreleased $env"
191192
for f in measures findings loc
192193
do
193-
root="$f-$env"
194+
root="$TMP/$f-$env"
194195
announce_test "$f-$env diff"
195196
sort -o "$root-rel.csv" "$root-rel.csv"
196197
sort -o "$root-unrel.csv" "$root-unrel.csv"
197-
test_passed_if_identical "$TMP/$root-rel.csv" "$TMP/$root-unrel.csv"
198+
test_passed_if_identical "$root-rel.csv" "$root-unrel.csv"
198199
done
199200
for f in config
200201
do
201-
root="$f-$env"
202+
root="$TMP/$f-$env"
202203
announce_test "$f-$env diff"
203-
test_passed_if_identical "$TMP/$root-rel.json" "$TMP/$root-unrel.json"
204+
test_passed_if_identical "$root-rel.json" "$root-unrel.json"
204205
done
205206
announce_test "findings-$env admin vs user diff"
206207
test_passed_if_identical "$TMP/findings-$env-admin.csv" "$TMP/findings-$env-user.csv"

‎test/test-tools.sh‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,30 +36,35 @@ function logmsg {
3636

3737
function run_test {
3838
file=$1; shift
39-
announce_test "$@"
39+
announce_test "$@ -f $file"
40+
file="$REPO_ROOT/tmp/$file"
4041
# logmsg "========================================="
4142
# logmsg "$@"
4243
# logmsg "========================================="
4344
if [ "$SONAR_HOST_URL" == "$SONAR_HOST_URL_SONARCLOUD" ]; then
44-
"$@" -o okorach -l $IT_LOG_FILE 2>/dev/null
45+
"$@" -o okorach -l $IT_LOG_FILE -f "$file" >/dev/null
4546
else
46-
"$@" -l $IT_LOG_FILE 2>/dev/null
47+
# echo "$@" -o okorach -l $IT_LOG_FILE -f "$file"
48+
"$@" -l $IT_LOG_FILE -f "$file" 2>/dev/null
4749
fi
4850
test_passed_if_file_not_empty "$file"
4951
}
5052

5153
function run_test_stdout {
5254
file=$1; shift
5355
announce_test "$@ >$file"
56+
file="$REPO_ROOT/tmp/$file"
57+
5458
# logmsg "========================================="
5559
# logmsg "$@ >$file"
5660
# logmsg "========================================="
5761
if [ "$SONAR_HOST_URL" == "$SONAR_HOST_URL_SONARCLOUD" ]; then
58-
"$@" -o okorach -l $IT_LOG_FILE >"$REPO_ROOT/tmp/$file" 2>/dev/null
62+
"$@" -o okorach -l $IT_LOG_FILE >"$file" 2>/dev/null
5963
else
60-
"$@" -l $IT_LOG_FILE >"$REPO_ROOT/tmp/$file" 2>/dev/null
64+
# echo "$@" -o okorach -l $IT_LOG_FILE "> $file"
65+
"$@" -l $IT_LOG_FILE >"$file" 2>/dev/null
6166
fi
62-
test_passed_if_file_not_empty "$REPO_ROOT/tmp/$file"
67+
test_passed_if_file_not_empty "$file"
6368
}
6469

6570
check_file_not_empty() {
@@ -72,7 +77,7 @@ check_file_not_empty() {
7277
}
7378

7479
test_passed_if_identical() {
75-
diff $*
80+
diff $* >> $IT_LOG_FILE
7681
code=$?
7782
test_result $code
7883
return $code

0 commit comments

Comments
 (0)