Skip to content

Commit

Permalink
Include major/minor release in unit tests
Browse files Browse the repository at this point in the history
  • Loading branch information
keto committed Mar 12, 2024
1 parent 11104a5 commit 881eb88
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions tests/ut_urlresolver/testdata/repos.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ mer-core=https://%(packagesDomain)/%(release)/mer/%(arch)/%(debugSplit)/
adaptation-common-main=https://%(packagesDomain)/releases/%(release)/nemo/adaptation-%(deviceFamily)-common/%(arch)/
adaptation=https://%(packagesDomain)/releases/%(release)/nemo/adaptation-%(adaptation)/%(arch)/
nemo=https://%(packagesDomain)/releases/%(release)/nemo/platform/%(arch)/
major=https://%(packagesDomain)/releases/%(releaseMajor)/major/%(arch)/
minor=https://%(packagesDomain)/releases/%(releaseMinor)/minor/%(arch)/

[rnd]
mer-core=https://%(packagesDomain)/mer/%(release)/builds/%(arch)/%(debugSplit)/
Expand Down
9 changes: 6 additions & 3 deletions tests/ut_urlresolver/urlresolvertest.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@ void UrlResolverTest::initTestCase()
/*
rndRepos["non-oss"] = "";
*/
releaseRepos["nemo"] = QString("https://packages.example.com/releases/0.1/nemo/platform/%1/").arg(arch);
releaseRepos["mer-core"] = QString("https://packages.example.com/0.1/mer/%1/packages/").arg(arch);
releaseRepos["jolla"] = QString("https://packages.example.com/releases/0.1/jolla/%1/").arg(arch);
releaseRepos["nemo"] = QString("https://packages.example.com/releases/1.2.3/nemo/platform/%1/").arg(arch);
releaseRepos["mer-core"] = QString("https://packages.example.com/1.2.3/mer/%1/packages/").arg(arch);
releaseRepos["jolla"] = QString("https://packages.example.com/releases/1.2.3/jolla/%1/").arg(arch);
releaseRepos["major"] = QString("https://packages.example.com/releases/1/major/%1/").arg(arch);
releaseRepos["minor"] = QString("https://packages.example.com/releases/1.2/minor/%1/").arg(arch);
}

void UrlResolverTest::cleanupTestCase()
Expand Down Expand Up @@ -115,6 +117,7 @@ void UrlResolverTest::simpleRepoUrlLookup()

void UrlResolverTest::checkReleaseRepoUrls()
{
ssu.setRelease("1.2.3");
QHashIterator<QString, QString> i(releaseRepos);
while (i.hasNext()) {
QString url;
Expand Down

0 comments on commit 881eb88

Please sign in to comment.