add tests

ozguronsoy · ozguronsoy · commit 58d6f17004c6 · 2025-12-05T02:17:00.000+03:00
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -0,0 +1,55 @@
+name: Tests
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  Desktop:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    
+    runs-on: ${{ matrix.os }}
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Xvfb (Linux)
+        if: runner.os == 'Linux'
+        run: |
+          sudo apt install -y xvfb
+      
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v4
+        with:
+          version: 6.10.1
+          target: desktop
+          modules: 'qtpositioning'
+          cached: true
+          
+      - name: Configure CMake
+        shell: bash
+        run: |
+          mkdir build
+          cd build
+          cmake .. -DSIMPLE_MAP_VIEW_BUILD_TESTS=ON
+
+      - name: Build
+        shell: bash
+        working-directory: build
+        run: |
+          cmake --build .
+
+      - name: Run (Linux)
+        if: runner.os == 'Linux'
+        working-directory: build
+        run: xvfb-run ctest --output-on-failure
+
+      - name: Run (Windows / macOS)
+        if: runner.os != 'Linux'
+        shell: bash
+        working-directory: build
+        run: ctest -C Debug --output-on-failure
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,7 @@ project(SimpleMapView VERSION 1.2.0 LANGUAGES CXX)
 
 option(SIMPLE_MAP_VIEW_BUILD_QML "Build as QML component" OFF)
 option(SIMPLE_MAP_VIEW_BUILD_PYTHON_BINDINGS "Build python bindings" OFF)
+option(SIMPLE_MAP_VIEW_BUILD_TESTS "Build the tests" OFF)
 
 set(SIMPLE_MAP_VIEW_QML_URI "com.github.ozguronsoy.SimpleMapView")
 
@@ -38,12 +39,17 @@ find_package(Qt6 REQUIRED COMPONENTS ${SIMPLE_MAP_VIEW_QT_COMPONENTS})
 file(GLOB_RECURSE SIMPLE_MAP_VIEW_HEADERS include/*.h)
 file(GLOB_RECURSE SIMPLE_MAP_VIEW_SOURCES src/*.cpp)
 
-if(SIMPLE_MAP_VIEW_BUILD_PYTHON_BINDINGS)
+if(SIMPLE_MAP_VIEW_BUILD_TESTS OR SIMPLE_MAP_VIEW_BUILD_PYTHON_BINDINGS)
+    
     set(CMAKE_AUTOMOC ON)
     set(CMAKE_AUTORCC ON)
     set(CMAKE_AUTOUIC ON)
     list(APPEND SIMPLE_MAP_VIEW_SOURCES Resources.qrc)
-    list(APPEND SIMPLE_MAP_VIEW_DEFINITIONS SIMPLE_MAP_VIEW_BUILD_PYTHON_BINDINGS)
+    
+    if(SIMPLE_MAP_VIEW_BUILD_PYTHON_BINDINGS)
+        list(APPEND SIMPLE_MAP_VIEW_DEFINITIONS SIMPLE_MAP_VIEW_BUILD_PYTHON_BINDINGS)
+    endif()
+
 endif()
 
 add_library(SimpleMapView STATIC ${SIMPLE_MAP_VIEW_HEADERS} ${SIMPLE_MAP_VIEW_SOURCES})
@@ -58,4 +64,9 @@ target_link_libraries(SimpleMapView PUBLIC ${SIMPLE_MAP_VIEW_QT_LIBRARIES})
 if(SIMPLE_MAP_VIEW_BUILD_PYTHON_BINDINGS)
     set_property(TARGET SimpleMapView PROPERTY POSITION_INDEPENDENT_CODE ON)
     add_subdirectory(python_bindings)
+endif()
+
+if(SIMPLE_MAP_VIEW_BUILD_TESTS)
+    enable_testing()
+    add_subdirectory(tests)
 endif()
diff --git a/include/SimpleMapView.h b/include/SimpleMapView.h
@@ -212,11 +212,11 @@ public slots:
 	QGeoCoordinate screenPositionToGeoCoordinate(const QPointF& screenPosition) const;
 
 signals:
-	/** A signal that's triggered when the zoom level changes. */
+	/** Triggered when the zoom level changes. */
 	void zoomLevelChanged();
-	/** A signal that's triggered when the center coordinate changes. */
+	/** Triggered when the center coordinate changes. */
 	void centerChanged();
-	/** A signal that's triggered when the tile server changes. */
+	/** Triggered when the tile server changes. */
 	void tileServerChanged();
 
 protected:
diff --git a/src/SimpleMapView.cpp b/src/SimpleMapView.cpp
@@ -31,8 +31,6 @@
 
 #endif
 
-#define GET_IN_RANGE(v, minv, maxv) (std::min(std::max((v), (minv)), (maxv)))
-
 SimpleMapView::SimpleMapView(SimpleMapViewBase* parent)
 	: SimpleMapViewBase(parent),
 	m_zoomLevel(17),
@@ -104,7 +102,7 @@ int SimpleMapView::minZoomLevel() const
 
 void SimpleMapView::setMinZoomLevel(int minZoomLevel)
 {
-	m_minZoomLevel = GET_IN_RANGE(minZoomLevel, 0, m_maxZoomLevel);
+	m_minZoomLevel = std::clamp(minZoomLevel, 0, m_maxZoomLevel);
 	this->setZoomLevel(m_zoomLevel);
 }
 
@@ -115,7 +113,7 @@ int SimpleMapView::maxZoomLevel() const
 
 void SimpleMapView::setMaxZoomLevel(int maxZoomLevel)
 {
-	m_maxZoomLevel = GET_IN_RANGE(maxZoomLevel, m_minZoomLevel, INT_MAX);
+	m_maxZoomLevel = std::clamp(maxZoomLevel, m_minZoomLevel, INT_MAX);
 	this->setZoomLevel(m_zoomLevel);
 }
 
@@ -129,7 +127,7 @@ void SimpleMapView::setZoomLevel(int zoomLevel)
 	if (!this->isEnabled() || m_lockZoom) return;
 
 	const int oldZoomLevel = m_zoomLevel;
-	m_zoomLevel = GET_IN_RANGE(zoomLevel, m_minZoomLevel, m_maxZoomLevel);
+	m_zoomLevel = std::clamp(zoomLevel, m_minZoomLevel, m_maxZoomLevel);
 
 	if (oldZoomLevel != m_zoomLevel)
 	{
@@ -180,8 +178,8 @@ void SimpleMapView::setCenter(qreal latitude, qreal longitude)
 
 	bool isChanged = false;
 
-	latitude = GET_IN_RANGE(latitude, -90.0, 90.0);
-	longitude = GET_IN_RANGE(longitude, -180.0, 180.0);
+	latitude = std::clamp(latitude, -90.0, 90.0);
+	longitude = std::clamp(longitude, -180.0, 180.0);
 
 	if (latitude != this->latitude())
 	{
@@ -262,13 +260,13 @@ void SimpleMapView::setTileServer(const QString& tileServer, bool wait)
 		if (wait)
 		{
 			QEventLoop eventLoop;
-			(void)this->connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit);
+			(void)reply->connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit);
 			(void)eventLoop.exec();
 			handleResponse();
 		}
 		else
 		{
-			(void)this->connect(reply, &QNetworkReply::finished, this, handleResponse);
+			(void)reply->connect(reply, &QNetworkReply::finished, this, handleResponse);
 		}
 	}
 	else
@@ -610,7 +608,7 @@ void SimpleMapView::downloadTiles(const QString& path, const QGeoCoordinate& p1,
 
 				QNetworkReply* reply = m_networkManager.get(request);
 
-				(void)this->connect(reply, &QNetworkReply::finished, this,
+				(void)reply->connect(reply, &QNetworkReply::finished, this,
 					[this, downloadNextTile, increaseTilePosition, qrcFile, qrcTextStream, x_next, y_next, z_next, p1, p2, x_start, y_start, x_end, y_end, z_end, currentRequestCount, originalZ, dir, progressBar, downloadedTileCount, reply, x, y, z, tilePath]()
 					{
 						if (reply->error() == QNetworkReply::NoError)
@@ -878,7 +876,7 @@ void SimpleMapView::fetchTileFromRemote(const QPoint& tilePosition)
 	QNetworkReply* reply = m_networkManager.get(request);
 	m_replyMap[tileKey] = reply;
 
-	(void)this->connect(reply, &QNetworkReply::finished, this,
+	(void)reply->connect(reply, &QNetworkReply::finished, this,
 		[this, reply, tileKey]()
 		{
 			if (reply->error() == QNetworkReply::NoError)
@@ -891,7 +889,6 @@ void SimpleMapView::fetchTileFromRemote(const QPoint& tilePosition)
 			}
 			else
 			{
-				qDebug() << "[SimpleMapView]" << reply->errorString();
 				if (!m_abortingReplies)
 				{
 					m_backupTileServerIndex = 0;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -0,0 +1,19 @@
+cmake_minimum_required(VERSION 3.16)
+project(SimpleMapViewTests LANGUAGES CXX)
+
+find_package(Qt6 REQUIRED COMPONENTS Test)
+
+add_executable(
+    SimpleMapViewTests
+    ../Resources.qrc
+    SimpleMapViewTest.cpp
+)
+
+target_link_libraries(
+    SimpleMapViewTests
+    SimpleMapView
+    Qt::Test
+)
+
+include(CTest)
+add_test(NAME SimpleMapViewTests COMMAND SimpleMapViewTests)
diff --git a/tests/SimpleMapViewTest.cpp b/tests/SimpleMapViewTest.cpp

Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@`
`31`	`31`
`32`	`32`	`#endif`
`33`	`33`
`34`		`-#define GET_IN_RANGE(v, minv, maxv) (std::min(std::max((v), (minv)), (maxv)))`
`35`		`-`
`36`	`34`	`SimpleMapView::SimpleMapView(SimpleMapViewBase* parent)`
`37`	`35`	`: SimpleMapViewBase(parent),`
`38`	`36`	`m_zoomLevel(17),`
`@@ -104,7 +102,7 @@ int SimpleMapView::minZoomLevel() const`
`104`	`102`
`105`	`103`	`void SimpleMapView::setMinZoomLevel(int minZoomLevel)`
`106`	`104`	`{`
`107`		`- m_minZoomLevel = GET_IN_RANGE(minZoomLevel, 0, m_maxZoomLevel);`
	`105`	`+ m_minZoomLevel = std::clamp(minZoomLevel, 0, m_maxZoomLevel);`
`108`	`106`	`this->setZoomLevel(m_zoomLevel);`
`109`	`107`	`}`
`110`	`108`
`@@ -115,7 +113,7 @@ int SimpleMapView::maxZoomLevel() const`
`115`	`113`
`116`	`114`	`void SimpleMapView::setMaxZoomLevel(int maxZoomLevel)`
`117`	`115`	`{`
`118`		`- m_maxZoomLevel = GET_IN_RANGE(maxZoomLevel, m_minZoomLevel, INT_MAX);`
	`116`	`+ m_maxZoomLevel = std::clamp(maxZoomLevel, m_minZoomLevel, INT_MAX);`
`119`	`117`	`this->setZoomLevel(m_zoomLevel);`
`120`	`118`	`}`
`121`	`119`
`@@ -129,7 +127,7 @@ void SimpleMapView::setZoomLevel(int zoomLevel)`
`129`	`127`	`if (!this->isEnabled() \|\| m_lockZoom) return;`
`130`	`128`
`131`	`129`	`const int oldZoomLevel = m_zoomLevel;`
`132`		`- m_zoomLevel = GET_IN_RANGE(zoomLevel, m_minZoomLevel, m_maxZoomLevel);`
	`130`	`+ m_zoomLevel = std::clamp(zoomLevel, m_minZoomLevel, m_maxZoomLevel);`
`133`	`131`
`134`	`132`	`if (oldZoomLevel != m_zoomLevel)`
`135`	`133`	`{`
`@@ -180,8 +178,8 @@ void SimpleMapView::setCenter(qreal latitude, qreal longitude)`
`180`	`178`
`181`	`179`	`bool isChanged = false;`
`182`	`180`
`183`		`- latitude = GET_IN_RANGE(latitude, -90.0, 90.0);`
`184`		`- longitude = GET_IN_RANGE(longitude, -180.0, 180.0);`
	`181`	`+ latitude = std::clamp(latitude, -90.0, 90.0);`
	`182`	`+ longitude = std::clamp(longitude, -180.0, 180.0);`
`185`	`183`
`186`	`184`	`if (latitude != this->latitude())`
`187`	`185`	`{`
`@@ -262,13 +260,13 @@ void SimpleMapView::setTileServer(const QString& tileServer, bool wait)`
`262`	`260`	`if (wait)`
`263`	`261`	`{`
`264`	`262`	`QEventLoop eventLoop;`
`265`		`- (void)this->connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit);`
	`263`	`+ (void)reply->connect(reply, &QNetworkReply::finished, &eventLoop, &QEventLoop::quit);`
`266`	`264`	`(void)eventLoop.exec();`
`267`	`265`	`handleResponse();`
`268`	`266`	`}`
`269`	`267`	`else`
`270`	`268`	`{`
`271`		`- (void)this->connect(reply, &QNetworkReply::finished, this, handleResponse);`
	`269`	`+ (void)reply->connect(reply, &QNetworkReply::finished, this, handleResponse);`
`272`	`270`	`}`
`273`	`271`	`}`
`274`	`272`	`else`
`@@ -610,7 +608,7 @@ void SimpleMapView::downloadTiles(const QString& path, const QGeoCoordinate& p1,`
`610`	`608`
`611`	`609`	`QNetworkReply* reply = m_networkManager.get(request);`
`612`	`610`
`613`		`- (void)this->connect(reply, &QNetworkReply::finished, this,`
	`611`	`+ (void)reply->connect(reply, &QNetworkReply::finished, this,`
`614`	`612`	`[this, downloadNextTile, increaseTilePosition, qrcFile, qrcTextStream, x_next, y_next, z_next, p1, p2, x_start, y_start, x_end, y_end, z_end, currentRequestCount, originalZ, dir, progressBar, downloadedTileCount, reply, x, y, z, tilePath]()`
`615`	`613`	`{`
`616`	`614`	`if (reply->error() == QNetworkReply::NoError)`
`@@ -878,7 +876,7 @@ void SimpleMapView::fetchTileFromRemote(const QPoint& tilePosition)`
`878`	`876`	`QNetworkReply* reply = m_networkManager.get(request);`
`879`	`877`	`m_replyMap[tileKey] = reply;`
`880`	`878`
`881`		`- (void)this->connect(reply, &QNetworkReply::finished, this,`
	`879`	`+ (void)reply->connect(reply, &QNetworkReply::finished, this,`
`882`	`880`	`[this, reply, tileKey]()`
`883`	`881`	`{`
`884`	`882`	`if (reply->error() == QNetworkReply::NoError)`
`@@ -891,7 +889,6 @@ void SimpleMapView::fetchTileFromRemote(const QPoint& tilePosition)`
`891`	`889`	`}`
`892`	`890`	`else`
`893`	`891`	`{`
`894`		`- qDebug() << "[SimpleMapView]" << reply->errorString();`
`895`	`892`	`if (!m_abortingReplies)`
`896`	`893`	`{`
`897`	`894`	`m_backupTileServerIndex = 0;`