equal
deleted
inserted
replaced
35 public static String INSTALLER_CERT |
35 public static String INSTALLER_CERT |
36 = "Developer ID Installer: " + DEV_NAME; |
36 = "Developer ID Installer: " + DEV_NAME; |
37 public static String KEYCHAIN = "jpackagerTest.keychain"; |
37 public static String KEYCHAIN = "jpackagerTest.keychain"; |
38 |
38 |
39 private static void checkString(List<String> result, String lookupString) { |
39 private static void checkString(List<String> result, String lookupString) { |
40 result.stream() |
40 TKit.assertTextStream(lookupString).predicate( |
41 .filter(line -> line.trim().equals(lookupString)).findFirst().or( |
41 (line, what) -> line.trim().equals(what)).apply(result.stream()); |
42 () -> { |
|
43 TKit.assertUnexpected(String.format( |
|
44 "Failed to find [%s] string in the output", |
|
45 lookupString)); |
|
46 return null; |
|
47 }); |
|
48 } |
42 } |
49 |
43 |
50 private static List<String> codesignResult(Path target, boolean signed) { |
44 private static List<String> codesignResult(Path target, boolean signed) { |
51 int exitCode = signed ? 0 : 1; |
45 int exitCode = signed ? 0 : 1; |
52 List<String> result = new Executor() |
46 List<String> result = new Executor() |
60 return result; |
54 return result; |
61 } |
55 } |
62 |
56 |
63 private static void verifyCodesignResult(List<String> result, Path target, |
57 private static void verifyCodesignResult(List<String> result, Path target, |
64 boolean signed) { |
58 boolean signed) { |
65 result.stream().peek(TKit::trace); |
59 result.stream().forEachOrdered(TKit::trace); |
66 if (signed) { |
60 if (signed) { |
67 String lookupString = target.toString() + ": valid on disk"; |
61 String lookupString = target.toString() + ": valid on disk"; |
68 checkString(result, lookupString); |
62 checkString(result, lookupString); |
69 lookupString = target.toString() + ": satisfies its Designated Requirement"; |
63 lookupString = target.toString() + ": satisfies its Designated Requirement"; |
70 checkString(result, lookupString); |
64 checkString(result, lookupString); |
84 |
78 |
85 return result; |
79 return result; |
86 } |
80 } |
87 |
81 |
88 private static void verifySpctlResult(List<String> result, Path target, String type) { |
82 private static void verifySpctlResult(List<String> result, Path target, String type) { |
89 result.stream().peek(TKit::trace); |
83 result.stream().forEachOrdered(TKit::trace); |
90 String lookupString = target.toString() + ": accepted"; |
84 String lookupString = target.toString() + ": accepted"; |
91 checkString(result, lookupString); |
85 checkString(result, lookupString); |
92 lookupString = "source=" + DEV_NAME; |
86 lookupString = "source=" + DEV_NAME; |
93 checkString(result, lookupString); |
87 checkString(result, lookupString); |
94 if (type.equals("install")) { |
88 if (type.equals("install")) { |
108 |
102 |
109 return result; |
103 return result; |
110 } |
104 } |
111 |
105 |
112 private static void verifyPkgutilResult(List<String> result) { |
106 private static void verifyPkgutilResult(List<String> result) { |
113 result.stream().peek(line -> TKit.trace(line)); |
107 result.stream().forEachOrdered(TKit::trace); |
114 String lookupString = "Status: signed by a certificate trusted for current user"; |
108 String lookupString = "Status: signed by a certificate trusted for current user"; |
115 checkString(result, lookupString); |
109 checkString(result, lookupString); |
116 lookupString = "1. " + INSTALLER_CERT; |
110 lookupString = "1. " + INSTALLER_CERT; |
117 checkString(result, lookupString); |
111 checkString(result, lookupString); |
118 } |
112 } |