equal
deleted
inserted
replaced
54 * function calls. |
54 * function calls. |
55 */ |
55 */ |
56 public PackageTest() { |
56 public PackageTest() { |
57 action = DEFAULT_ACTION; |
57 action = DEFAULT_ACTION; |
58 forTypes(); |
58 forTypes(); |
59 setJPackageExitCode(0); |
59 setExpectedExitCode(0); |
60 handlers = new HashMap<>(); |
60 handlers = new HashMap<>(); |
61 namedInitializers = new HashSet<>(); |
61 namedInitializers = new HashSet<>(); |
62 currentTypes.forEach(v -> handlers.put(v, new Handler(v))); |
62 currentTypes.forEach(v -> handlers.put(v, new Handler(v))); |
63 } |
63 } |
64 |
64 |
76 |
76 |
77 public PackageTest forTypes(Collection<PackageType> types) { |
77 public PackageTest forTypes(Collection<PackageType> types) { |
78 return forTypes(types.toArray(PackageType[]::new)); |
78 return forTypes(types.toArray(PackageType[]::new)); |
79 } |
79 } |
80 |
80 |
81 public PackageTest setJPackageExitCode(int v) { |
81 public PackageTest setExpectedExitCode(int v) { |
82 expectedJPackageExitCode = v; |
82 expectedJPackageExitCode = v; |
83 return this; |
83 return this; |
84 } |
84 } |
85 |
85 |
86 private PackageTest addInitializer(ThrowingConsumer<JPackageCommand> v, String id) { |
86 private PackageTest addInitializer(ThrowingConsumer<JPackageCommand> v, String id) { |
308 } |
308 } |
309 verifyPackageBundle(cmd.createImmutableCopy(), result); |
309 verifyPackageBundle(cmd.createImmutableCopy(), result); |
310 break; |
310 break; |
311 |
311 |
312 case VERIFY_INSTALL: |
312 case VERIFY_INSTALL: |
313 verifyPackageInstalled(cmd.createImmutableCopy()); |
313 if (expectedJPackageExitCode == 0) { |
|
314 verifyPackageInstalled(cmd.createImmutableCopy()); |
|
315 } |
314 break; |
316 break; |
315 |
317 |
316 case VERIFY_UNINSTALL: |
318 case VERIFY_UNINSTALL: |
317 verifyPackageUninstalled(cmd.createImmutableCopy()); |
319 if (expectedJPackageExitCode == 0) { |
|
320 verifyPackageUninstalled(cmd.createImmutableCopy()); |
|
321 } |
318 break; |
322 break; |
319 } |
323 } |
320 } |
324 } |
321 |
325 |
322 private void verifyPackageBundle(JPackageCommand cmd, |
326 private void verifyPackageBundle(JPackageCommand cmd, |
323 Executor.Result result) { |
327 Executor.Result result) { |
324 if (PackageType.LINUX.contains(cmd.packageType())) { |
328 if (expectedJPackageExitCode == 0) { |
325 LinuxHelper.verifyPackageBundleEssential(cmd); |
329 if (PackageType.LINUX.contains(cmd.packageType())) { |
|
330 LinuxHelper.verifyPackageBundleEssential(cmd); |
|
331 } |
326 } |
332 } |
327 bundleVerifiers.stream().forEach(v -> v.accept(cmd, result)); |
333 bundleVerifiers.stream().forEach(v -> v.accept(cmd, result)); |
328 } |
334 } |
329 |
335 |
330 private void verifyPackageInstalled(JPackageCommand cmd) { |
336 private void verifyPackageInstalled(JPackageCommand cmd) { |