@@ -219,9 +219,9 @@ func TestFilterPackageData(t *testing.T) {
219
219
info := AppInfo {}
220
220
app := NewApp (& info )
221
221
pkg := NewPhpPackages ()
222
- expect_a := PhpPackagesKey {"package_a" , "1.2.3" }
223
- expect_b := PhpPackagesKey {"package_b" , "1.2.3" }
224
- expect_c := PhpPackagesKey {"package_c" , "1.2.3" }
222
+ expectA := PhpPackagesKey {"package_a" , "1.2.3" }
223
+ expectB := PhpPackagesKey {"package_b" , "1.2.3" }
224
+ expectC := PhpPackagesKey {"package_c" , "1.2.3" }
225
225
226
226
// Test nil package data
227
227
pkg .Filter (app .PhpPackages )
@@ -275,16 +275,16 @@ func TestFilterPackageData(t *testing.T) {
275
275
// Test single valid package
276
276
pkg .AddPhpPackagesFromData ([]byte (`[["package_a", "1.2.3",{}]]` ))
277
277
pkg .Filter (app .PhpPackages )
278
- if ! comparePkgs (& expect_a , & pkg .filteredPkgs [0 ]) || len (pkg .filteredPkgs ) != 1 {
279
- t .Fatalf ("Expected '%+v', got '%+v'" , expect_a , pkg .filteredPkgs [0 ])
278
+ if ! comparePkgs (& expectA , & pkg .filteredPkgs [0 ]) || len (pkg .filteredPkgs ) != 1 {
279
+ t .Fatalf ("Expected '%+v', got '%+v'" , expectA , pkg .filteredPkgs [0 ])
280
280
}
281
281
282
282
// Test multiple valid packages
283
283
pkg .AddPhpPackagesFromData ([]byte (`[["package_b", "1.2.3",{}]]` ))
284
284
pkg .AddPhpPackagesFromData ([]byte (`[["package_c", "1.2.3",{}]]` ))
285
285
pkg .Filter (app .PhpPackages )
286
- if ! comparePkgs (& expect_b , & pkg .filteredPkgs [1 ]) || ! comparePkgs (& expect_c , & pkg .filteredPkgs [2 ]) || len (pkg .filteredPkgs ) != 3 {
287
- t .Fatalf ("Expected '%+v', '%+v', got '%+v', '%+v'" , expect_b , expect_c , pkg .filteredPkgs [1 ], pkg .filteredPkgs [2 ])
286
+ if ! comparePkgs (& expectB , & pkg .filteredPkgs [1 ]) || ! comparePkgs (& expectC , & pkg .filteredPkgs [2 ]) || len (pkg .filteredPkgs ) != 3 {
287
+ t .Fatalf ("Expected '%+v', '%+v', got '%+v', '%+v'" , expectB , expectC , pkg .filteredPkgs [1 ], pkg .filteredPkgs [2 ])
288
288
}
289
289
290
290
// Test duplicate package data in same harvest
0 commit comments