From 881eb886005528e70cecda82e1255459dc4e8f4a Mon Sep 17 00:00:00 2001
From: Pami Ketolainen <pami.ketolainen@jolla.com>
Date: Tue, 12 Mar 2024 13:04:34 +0200
Subject: [PATCH] Include major/minor release in unit tests

---
 tests/ut_urlresolver/testdata/repos.ini  | 2 ++
 tests/ut_urlresolver/urlresolvertest.cpp | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/tests/ut_urlresolver/testdata/repos.ini b/tests/ut_urlresolver/testdata/repos.ini
index ac4a7e4..faf9235 100644
--- a/tests/ut_urlresolver/testdata/repos.ini
+++ b/tests/ut_urlresolver/testdata/repos.ini
@@ -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)/
diff --git a/tests/ut_urlresolver/urlresolvertest.cpp b/tests/ut_urlresolver/urlresolvertest.cpp
index e615853..58d8500 100644
--- a/tests/ut_urlresolver/urlresolvertest.cpp
+++ b/tests/ut_urlresolver/urlresolvertest.cpp
@@ -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()
@@ -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;