github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-08-21 06:14:08 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/ultimatepp/ultimatepp

Browse source
This commit is contained in:
Mirek Fidler 2023-02-11 20:16:12 +01:00
commit 20a4e2f781
9 changed files with 73 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
autotest/CheckBak/CheckBak.cpp
View file

@ -52,7 +52,7 @@ CONSOLE_APP_MAIN
LOG("backup len (MB): " << len);
ASSERT(len > 1500 && len < 5800);
for(auto dir : Split("/net/nas1/bak;/net/nas/bak;/big/bak;/ssd/bak", ';')) {
for(auto dir : Split("/big/bak;/ssd/bak", ';')) { // /net/nas1/bak;/net/nas/bak;
FileIn in1(fn);
String p = dir + '/' + GetFileName(fn);

2
autotest/CheckDownloads/CheckDownloads.cpp
View file

@ -43,7 +43,7 @@ CONSOLE_APP_MAIN
Check("win");
Check("posix");
Check("macos");
// Check("macos");
LOG("============== OK");
}

3
autotest/CompareStream/CompareStream.cpp
View file

@ -6,6 +6,7 @@ CONSOLE_APP_MAIN
{
StdLogSetup(LOG_COUT|LOG_FILE);
Vector<int> a, b;
int tm0 = msecs();
for(int i = 0; i < 200000; i++) {
if(i % 10000 == 0)
LOG(i);
@ -20,5 +21,5 @@ CONSOLE_APP_MAIN
ASSERT(IsEqualBySerialize(a, b));
ASSERT(IsEqualBySerialize(b, a));
}
LOG("=========== OK");
DLOG("=========== OK in " << (tm0 - msecs()) / 1000.0 << " seconds");
}

2
autotest/CompareStream/CompareStream.upp
View file

@ -1,4 +1,4 @@
description "#WAIT: 10\377";
description "#WAIT:60\377";
uses
Core;

8
autotest/SetEnvVar/SetEnvVar.cpp
View file

@ -4,6 +4,8 @@ using namespace Upp;
CONSOLE_APP_MAIN
{
StdLogSetup(LOG_COUT|LOG_FILE);
String cmd, out;
#ifdef PLATFORM_WIN32
@ -12,11 +14,13 @@ CONSOLE_APP_MAIN
SetEnv("FOOBAR","BAZ");
ASSERT(Sys(cmd) == "1 BAZ 2\r\n");
#else
cmd = "echo \"1 $FOOBAR 2\"";
ASSERT(Sys(cmd) == "1 2\n");
cmd = "bash -c \"echo 1 $FOOBAR 2\"";
ASSERT(Sys(cmd) == "1 2\n");
SetEnv("FOOBAR","BAZ");
ASSERT(Sys(cmd) == "1 BAZ 2\n");
#endif
ASSERT(GetEnv("FOOBAR") == "BAZ");
LOG("================= OK");
}

101
autotest/StreamBigIssue/StreamBigIssue.cpp
View file

@ -6,62 +6,69 @@ CONSOLE_APP_MAIN
{
StdLogSetup(LOG_COUT|LOG_FILE);
String data;
for(int i = 0; i < 40000000; i++)
data.Cat(Random(255));
{
StringStream ss;
ss.Put(data);
ss.SetLoading();
ss.Seek(0);
String d2 = ss.GetAll(40000000);
ASSERT(d2 == data);
ss.Seek(0);
d2 = ss.GetAll(40000001);
ASSERT(d2.IsVoid());
}
for(int i = 0; i < 100; i++)
data.Cat(5);
for(int pass = 0; pass < 2; pass++)
{
int tm0 = msecs();
int n = 0;
for(;;) {
String data;
for(int i = 0; i < 40000000; i++)
data.Cat(Random(96) + 32);
{
StringStream ss;
ss % data;
WString hh = data.ToWString();
ss % hh;
ss.Put(data);
ss.SetLoading();
ss.Seek(0);
String h;
WString wh;
ss % h;
ss % wh;
String d2 = ss.GetAll(40000000);
ASSERT(d2 == data);
ASSERT(h == data && wh == data.ToWString());
}
{
StringStream ss;
ss / data;
ss.SetLoading();
ss.Seek(0);
String h;
ss / h;
ASSERT(h == data);
d2 = ss.GetAll(40000001);
ASSERT(d2.IsVoid());
}
data = "Something smaller";
for(int i = 0; i < 100; i++)
data.Cat(5);
for(int pass = 0; pass < 2; pass++)
{
{
StringStream ss;
ss % data;
WString hh = data.ToWString();
ss % hh;
ss.SetLoading();
ss.Seek(0);
String h;
WString wh;
ss % h;
ss % wh;
ASSERT(h == data);
ASSERT(wh == data.ToWString());
}
{
StringStream ss;
ss / data;
ss.SetLoading();
ss.Seek(0);
String h;
ss / h;
ASSERT(h == data);
}
data = "Something smaller";
}
DLOG(n++);
}
LOG("============= OK");
LOG("============= OK, " << (msecs() - tm0) / 1000.0 << " seconds");
}

2
autotest/StreamBigIssue/StreamBigIssue.upp
View file

@ -1,3 +1,5 @@
description "#WAIT:50\377";
uses
Core,
Draw;

7
autotest/WebSocket/WebSocket.cpp
View file

@ -8,7 +8,7 @@ CONSOLE_APP_MAIN
HttpRequest::Trace();
WebSocket::Trace();
#if 0
for(int ssl = 0; ssl < 2; ssl++)
for(int blocking = 0; blocking < 2; blocking++) {
DDUMP(ssl);
@ -16,7 +16,7 @@ CONSOLE_APP_MAIN
WebSocket ws;
ws.Connect((ssl ? "wss" : "ws") + String("://echo.websocket.org"));
ws.Connect((ssl ? "wss" : "ws") + String("://echo.websocket.events"));
ws.NonBlocking(!blocking);
@ -38,6 +38,7 @@ CONSOLE_APP_MAIN
DLOG("... ok");
}
DLOG("============= OK");
#endif
}

3
uppsrc/ide/FormatCode.cpp
View file

@ -499,7 +499,7 @@ ReformatDlg::~ReformatDlg()
void ReformatDlg::MouseWheel(Point, int zdelta, dword)
{
sb.Wheel(zdelta, EditField::GetStdHeight() + DPI(2));
sb.Wheel(zdelta);
}
void ReformatDlg::Set(Stream& in)
@ -577,6 +577,7 @@ String ReformatDlg::Get()
void ReformatDlg::Layout()
{
sb.SetPage(options.GetSize().cy);
sb.SetLine(EditField::GetStdHeight() + DPI(2));
}
void ReformatDlg::Sync()