summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Zongker <dougz@android.com>2011-10-31 22:51:52 +0100
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-31 22:51:52 +0100
commit5e12cc31f0674d7f42e5925784ada0b00a99a418 (patch)
tree71b64ebdd66540aca7a523c73a47626ca519d039
parentC++ class for device-specific code (diff)
parentverifier_test needs to provide a UI object (diff)
downloadandroid_bootable_recovery-5e12cc31f0674d7f42e5925784ada0b00a99a418.tar
android_bootable_recovery-5e12cc31f0674d7f42e5925784ada0b00a99a418.tar.gz
android_bootable_recovery-5e12cc31f0674d7f42e5925784ada0b00a99a418.tar.bz2
android_bootable_recovery-5e12cc31f0674d7f42e5925784ada0b00a99a418.tar.lz
android_bootable_recovery-5e12cc31f0674d7f42e5925784ada0b00a99a418.tar.xz
android_bootable_recovery-5e12cc31f0674d7f42e5925784ada0b00a99a418.tar.zst
android_bootable_recovery-5e12cc31f0674d7f42e5925784ada0b00a99a418.zip
Diffstat (limited to '')
-rw-r--r--verifier_test.cpp46
1 files changed, 36 insertions, 10 deletions
diff --git a/verifier_test.cpp b/verifier_test.cpp
index 5b6c1f451..2448d8d58 100644
--- a/verifier_test.cpp
+++ b/verifier_test.cpp
@@ -19,6 +19,7 @@
#include <stdarg.h>
#include "verifier.h"
+#include "ui.h"
// This is build/target/product/security/testkey.x509.pem after being
// dumped out by dumpkey.jar.
@@ -58,18 +59,41 @@ RSAPublicKey test_key =
367251975, 810756730, -1941182952, 1175080310 }
};
-void ui_print(const char* fmt, ...) {
- char buf[256];
- va_list ap;
- va_start(ap, fmt);
- vsnprintf(buf, 256, fmt, ap);
- va_end(ap);
+RecoveryUI* ui = NULL;
- fputs(buf, stderr);
-}
+// verifier expects to find a UI object; we provide one that does
+// nothing but print.
+class FakeUI : public RecoveryUI {
+ void Init() { }
+ void SetBackground(Icon icon) { }
-void ui_set_progress(float fraction) {
-}
+ void SetProgressType(ProgressType determinate) { }
+ void ShowProgress(float portion, float seconds) { }
+ void SetProgress(float fraction) { }
+
+ void ShowText(bool visible) { }
+ bool IsTextVisible() { return false; }
+ bool WasTextEverVisible() { return false; }
+ void Print(const char* fmt, ...) {
+ char buf[256];
+ va_list ap;
+ va_start(ap, fmt);
+ vsnprintf(buf, 256, fmt, ap);
+ va_end(ap);
+
+ fputs(buf, stderr);
+ }
+
+ int WaitKey() { return 0; }
+ bool IsKeyPressed(int key) { return false; }
+ void FlushKeys() { }
+ KeyAction CheckKey(int key) { return ENQUEUE; }
+
+ void StartMenu(const char* const * headers, const char* const * items,
+ int initial_selection) { }
+ int SelectMenu(int sel) { return 0; }
+ void EndMenu() { }
+};
int main(int argc, char **argv) {
if (argc != 2) {
@@ -77,6 +101,8 @@ int main(int argc, char **argv) {
return 2;
}
+ ui = new FakeUI();
+
int result = verify_file(argv[1], &test_key, 1);
if (result == VERIFY_SUCCESS) {
printf("SUCCESS\n");