@@ -158,7 +158,8 @@ func TestCollectorJSON(t *testing.T) {
158
158
t .Fatalf ("Expected nil error, got %s" , err .Error ())
159
159
}
160
160
expectedJSON = `["Jars",[["package_a","1.2.3",{}],["package_b","1.2.3",{}]]]`
161
- if expectedJSON != string (json ) {
161
+ expectedJSONB := `["Jars",[["package_b","1.2.3",{}],["package_a","1.2.3",{}]]]`
162
+ if expectedJSON != string (json ) && expectedJSONB != string (json ) {
162
163
t .Fatalf ("Expected '%s', got '%s'" , expectedJSON , string (json ))
163
164
}
164
165
@@ -204,15 +205,18 @@ func TestPackagesEmpty(t *testing.T) {
204
205
}
205
206
}
206
207
207
- func comparePkgs (expect , actual * PhpPackagesKey ) bool {
208
- if expect == nil || actual == nil {
208
+ func comparePkgs (expect * PhpPackagesKey , actual [] PhpPackagesKey ) bool {
209
+ if expect == nil || len ( actual ) == 0 {
209
210
return false
210
211
}
211
212
212
- if expect .Name != actual .Name || expect .Version != actual .Version {
213
- return false
213
+ for _ , key := range actual {
214
+ if expect .Name == key .Name && expect .Version == key .Version {
215
+ return true
216
+ }
217
+
214
218
}
215
- return true
219
+ return false
216
220
}
217
221
218
222
func TestFilterPackageData (t * testing.T ) {
@@ -275,15 +279,15 @@ func TestFilterPackageData(t *testing.T) {
275
279
// Test single valid package
276
280
pkg .AddPhpPackagesFromData ([]byte (`[["package_a", "1.2.3",{}]]` ))
277
281
pkg .Filter (app .PhpPackages )
278
- if ! comparePkgs (& expectA , & pkg .filteredPkgs [ 0 ] ) || len (pkg .filteredPkgs ) != 1 {
282
+ if ! comparePkgs (& expectA , pkg .filteredPkgs ) || len (pkg .filteredPkgs ) != 1 {
279
283
t .Fatalf ("Expected '%+v', got '%+v'" , expectA , pkg .filteredPkgs [0 ])
280
284
}
281
285
282
286
// Test multiple valid packages
283
287
pkg .AddPhpPackagesFromData ([]byte (`[["package_b", "1.2.3",{}]]` ))
284
288
pkg .AddPhpPackagesFromData ([]byte (`[["package_c", "1.2.3",{}]]` ))
285
289
pkg .Filter (app .PhpPackages )
286
- if ! comparePkgs (& expectB , & pkg .filteredPkgs [ 1 ] ) || ! comparePkgs (& expectC , & pkg .filteredPkgs [ 2 ]) || len ( pkg . filteredPkgs ) != 3 {
290
+ if ! comparePkgs (& expectB , pkg .filteredPkgs ) || ! comparePkgs (& expectC , pkg .filteredPkgs ) {
287
291
t .Fatalf ("Expected '%+v', '%+v', got '%+v', '%+v'" , expectB , expectC , pkg .filteredPkgs [1 ], pkg .filteredPkgs [2 ])
288
292
}
289
293
0 commit comments