mikecarper
27ff4b9063
Use measured text rows for companion and repeater layouts, retain the V4 6px footer, and add overlap and navigation regressions. Correct the MQTT logging sleep documentation contract test.
151 lines
7.1 KiB
Python
151 lines
7.1 KiB
Python
#!/usr/bin/env python3
|
|
"""Render production home-page branches; reject overlapping/clipped text boxes."""
|
|
from pathlib import Path
|
|
import subprocess
|
|
import tempfile
|
|
import unittest
|
|
|
|
ROOT = Path(__file__).resolve().parents[1]
|
|
|
|
PREAMBLE = r'''
|
|
#include <helpers/ui/CompanionHomeLayout.h>
|
|
#include <helpers/ui/BluetoothPairingUiPolicy.h>
|
|
#include <helpers/ui/ReaderNavigationHint.h>
|
|
#include <cassert>
|
|
#include <cstdio>
|
|
#include <string>
|
|
#include <vector>
|
|
ColorVal UIColor::window_bkg=0, UIColor::title_bkg=0, UIColor::title_txt=1;
|
|
ColorVal UIColor::primary_txt=1, UIColor::secondary_txt=1, UIColor::warning_txt=1;
|
|
ColorVal UIColor::popup_bkg=0, UIColor::popup_txt=1, UIColor::corp_blue=1;
|
|
#define PRESS_LABEL "Press"
|
|
struct Display : DisplayDriver {
|
|
struct Row { mesh::ui::DisplayRegion box; std::string text; };
|
|
std::vector<Row> rows;
|
|
int size=1,x=0,y=0,small,large;
|
|
Display(int w,int h,int a,int b):DisplayDriver(w,h),small(a),large(b) {}
|
|
bool isOn() override { return true; }
|
|
void turnOn() override {} void turnOff() override {}
|
|
void clear() override { rows.clear(); }
|
|
void startFrame(ColorVal=0) override { clear(); } void endFrame() override {}
|
|
void setTextSize(int s) override { size=s; }
|
|
int textLineHeight() override { return size==1?small:large; }
|
|
void setColor(ColorVal) override {}
|
|
void setCursor(int a,int b) override { x=a;y=b; }
|
|
uint16_t getTextWidth(const char* text) override {
|
|
int w=0; for(;*text;++text) w += small==8 ? 6*size : (*text=='i'?3:9)*size;
|
|
return w;
|
|
}
|
|
void print(const char* text) override {
|
|
if(!*text) return;
|
|
mesh::ui::DisplayRegion box{x,y,getTextWidth(text),textLineHeight()};
|
|
assert(x>=0 && y>=0 && box.right()<=width() && box.bottom()<=height());
|
|
for(const auto& row:rows) assert(!mesh::ui::displayRegionsOverlap(box,row.box));
|
|
rows.push_back({box,text});
|
|
}
|
|
void fillRect(int x,int y,int w,int h) override {
|
|
assert(x>=0 && y>=0 && w>=0 && h>=0 && x+w<=width() && y+h<=height());
|
|
}
|
|
void drawRect(int x,int y,int w,int h) override { fillRect(x,y,w,h); }
|
|
void drawXbm(int,int,const uint8_t*,int,int) override {}
|
|
const Row* find(const char* text) {
|
|
for(const auto& row:rows) if(row.text==text) return &row;
|
|
return nullptr;
|
|
}
|
|
};
|
|
struct Task {
|
|
bool enabled=true,connected=false,prompt=false;
|
|
int count=0;
|
|
bool isBluetoothEnabled(){return enabled;} bool hasBluetoothConnection(){return connected;}
|
|
bool isPairingPromptActive(){return prompt;} int getPreviewCount(){return count;}
|
|
};
|
|
struct Mesh { uint32_t pin=123456; uint32_t getBLEPin(){return pin;} } the_mesh;
|
|
struct HomePage { enum { FIRST=0 }; };
|
|
struct IPAddress { int operator[](int i){return 255-i;} };
|
|
struct Wifi { IPAddress localIP(){return {};} int status(){return 3;} } WiFi;
|
|
constexpr int WL_CONNECTED=3;
|
|
bool isCompanionWiFiEnabled(){return true;}
|
|
bool isCompanionWiFiConnected(){return true;}
|
|
bool hasCompanionWiFiCredentials(){return true;}
|
|
struct Prefs { const char* node_name="A very long repeater name that must be truncated safely";
|
|
float freq=910.525,bw=62.5; int sf=7,cr=5; bool powersaving_enabled=true;
|
|
};
|
|
struct Board { int getBattMilliVolts(){return 4100;} };
|
|
'''
|
|
|
|
SCENARIOS = r'''
|
|
int main() {
|
|
for(auto profile: {std::vector<int>{128,64,8,16}, {160,80,8,16},
|
|
{250,122,21,27}, {250,122,22,29}, {200,200,22,29}, {240,135,10,20}}) {
|
|
Display d(profile[0],profile[1],profile[2],profile[3]); Task task;
|
|
for(int state=0;state<5;++state) for(int count:{0,99,99999}) {
|
|
task.enabled=state!=2; task.connected=state==1; task.prompt=state==4;
|
|
task.count=count; the_mesh.pin=state==3?0:123456;
|
|
d.clear(); home(d,&task);
|
|
bool pin_expected=task.enabled && !task.connected && the_mesh.pin
|
|
&& (!task.prompt || d.height()>64);
|
|
assert((d.find("123456")!=nullptr)==pin_expected);
|
|
if(pin_expected) {
|
|
auto pin=d.find("123456");
|
|
assert(pin->box.y>=d.height()/2);
|
|
assert(pin->box.bottom()==d.height()-(d.height()>64?2:0));
|
|
assert(!d.find("Press: inbox"));
|
|
}
|
|
if(task.connected) assert(d.find("CONNECTED"));
|
|
}
|
|
Prefs prefs; Board board; d.clear(); repeater(&d,&prefs,&board);
|
|
assert(d.rows.size()==5); // Never solve overlap by losing a status row.
|
|
d.clear(); d.setTextSize(1);
|
|
const auto hint=mesh::ui::makeButtonReaderHintLayout(d,d.textLineHeight(),d.height());
|
|
const auto later=mesh::ui::makeButtonReaderHintLayout(d,d.textLineHeight(),d.height(),true);
|
|
for(int i=0;i<hint.line_count;++i) assert(std::string(hint.lines[i])==later.lines[i]);
|
|
mesh::ui::drawButtonReaderHint(d,hint);
|
|
if(d.width()==128) {
|
|
assert(hint.line_count==1);
|
|
assert(d.find("4<<2<tap>1>>3 hold:X"));
|
|
}
|
|
}
|
|
// Sweep font sizes and short viewports: retain complete digits, omit only
|
|
// a label that cannot fit, and never draw outside the reserved lower band.
|
|
for(int h=16;h<=160;++h) for(int line=8;line<=32;++line) {
|
|
Display d(160,h,line,2*line);
|
|
mesh::ui::drawBottomPairingBlock(d,h/3,"BLUETOOTH PIN","012345");
|
|
for(const auto& row:d.rows) assert(row.box.y>=h/3);
|
|
}
|
|
}
|
|
'''
|
|
|
|
|
|
class HomeTextSpacingTest(unittest.TestCase):
|
|
def test_actual_home_and_repeater_branches(self):
|
|
source = (ROOT / 'examples/companion_radio/ui-new/UITask.cpp').read_text()
|
|
start = source.index(' const int normal_line =')
|
|
metrics = source[start:source.index(' display.setColor', start)]
|
|
start = source.index(' if (_page == HomePage::FIRST) {', start)
|
|
home = source[start:source.index('#if UI_MESSAGES_HOME_PAGE == 1', start)]
|
|
repeater = (ROOT / 'examples/simple_repeater/UITask.cpp').read_text()
|
|
start = repeater.index(' // Reserve a full measured font-height')
|
|
repeater = repeater[start:repeater.index('\n }\n}', start)]
|
|
implementation = ('void home(DisplayDriver& display, Task* _task) {\n'
|
|
'display.setTextSize(1); char tmp[80]; int _page=0;\n'
|
|
+ metrics + 'display.drawTextEllipsized(0,2,display.width(),"Node name");\n'
|
|
+ home + '\n}}\n'
|
|
'void repeater(DisplayDriver* _display, Prefs* _node_prefs, Board* _board) {'
|
|
'char tmp[80];\n' + repeater + '\n}\n')
|
|
for wifi in (False, True):
|
|
with self.subTest(wifi=wifi), tempfile.TemporaryDirectory() as temp:
|
|
binary = str(Path(temp) / 'spacing')
|
|
flags = ['-DWIFI_SSID="test"', '-DWITH_MQTT_BRIDGE'] if wifi else []
|
|
result = subprocess.run(['c++', '-std=c++11', '-fsanitize=address,undefined',
|
|
'-fno-pie', '-no-pie', '-I'+str(ROOT/'src'),
|
|
*flags, '-x', 'c++', '-', '-o', binary],
|
|
input=PREAMBLE+implementation+SCENARIOS,
|
|
text=True, capture_output=True)
|
|
self.assertEqual(result.returncode, 0, result.stderr)
|
|
result = subprocess.run([binary], text=True, capture_output=True)
|
|
self.assertEqual(result.returncode, 0, result.stderr)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|