summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTomi Korpipaa <tomi.korpipaa@qt.io>2022-02-10 07:02:44 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-02-10 10:49:23 +0000
commit3ad36d9ca74fa7b440309ca12205122625b88862 (patch)
treebcdae5bf9554a59c4b6063427c1f198433757169 /tests
parent96abf29fa465199904f18ae55e276e86cb9796a7 (diff)
Fix API review finding
Rename wireFrameColor to wireframeColor to be consistent with other usage of wirfeframe in QtDataVisualization. Change-Id: I1ae6cd7372e46efa2a5d83856126d45355fcff60 Reviewed-by: Sami Varanka <sami.varanka@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from commit e82f53b35010dbeae6a5e7d87e007518a4eb0cbb) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/cpptest/q3dsurface-series/tst_series.cpp6
-rw-r--r--tests/auto/qmltest/surface3d/tst_surfaceseries.qml10
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/cpptest/q3dsurface-series/tst_series.cpp b/tests/auto/cpptest/q3dsurface-series/tst_series.cpp
index 9a097d6e..3e87db6e 100644
--- a/tests/auto/cpptest/q3dsurface-series/tst_series.cpp
+++ b/tests/auto/cpptest/q3dsurface-series/tst_series.cpp
@@ -92,7 +92,7 @@ void tst_series::initialProperties()
QCOMPARE(m_series->isFlatShadingEnabled(), true);
QCOMPARE(m_series->isFlatShadingSupported(), true);
QCOMPARE(m_series->selectedPoint(), m_series->invalidSelectionPosition());
- QCOMPARE(m_series->wireFrameColor(), QColor(Qt::black));
+ QCOMPARE(m_series->wireframeColor(), QColor(Qt::black));
// Common properties. The ones identical between different series are tested in QBar3DSeries tests
QCOMPARE(m_series->itemLabelFormat(), QString("@xLabel, @yLabel, @zLabel"));
QCOMPARE(m_series->mesh(), QAbstract3DSeries::MeshSphere);
@@ -107,12 +107,12 @@ void tst_series::initializeProperties()
m_series->setDrawMode(QSurface3DSeries::DrawWireframe);
m_series->setFlatShadingEnabled(false);
m_series->setSelectedPoint(QPoint(0, 0));
- m_series->setWireFrameColor(QColor(Qt::red));
+ m_series->setWireframeColor(QColor(Qt::red));
QCOMPARE(m_series->drawMode(), QSurface3DSeries::DrawWireframe);
QCOMPARE(m_series->isFlatShadingEnabled(), false);
QCOMPARE(m_series->selectedPoint(), QPoint(0, 0));
- QCOMPARE(m_series->wireFrameColor(), QColor(Qt::red));
+ QCOMPARE(m_series->wireframeColor(), QColor(Qt::red));
// Common properties. The ones identical between different series are tested in QBar3DSeries tests
m_series->setMesh(QAbstract3DSeries::MeshPyramid);
diff --git a/tests/auto/qmltest/surface3d/tst_surfaceseries.qml b/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
index e4707f60..f8e9ac7d 100644
--- a/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
+++ b/tests/auto/qmltest/surface3d/tst_surfaceseries.qml
@@ -79,7 +79,7 @@ Item {
flatShadingEnabled: false
selectedPoint: Qt.point(0, 0)
textureFile: ":\customtexture.jpg"
- wireFrameColor: "red"
+ wireframeColor: "red"
baseColor: "blue"
baseGradient: gradient1
@@ -124,7 +124,7 @@ Item {
compare(initial.flatShadingEnabled, true)
compare(initial.flatShadingSupported, true)
compare(initial.selectedPoint, Qt.point(-1, -1))
- compare(initial.wireFrameColor, "#000000")
+ compare(initial.wireframeColor, "#000000")
}
function test_2_initial_common() {
@@ -158,7 +158,7 @@ Item {
compare(initialized.flatShadingEnabled, false)
compare(initialized.selectedPoint, Qt.point(0, 0))
compare(initialized.textureFile, ":\customtexture.jpg")
- compare(initialized.wireFrameColor, "#ff0000")
+ compare(initialized.wireframeColor, "#ff0000")
}
function test_2_initialized_common() {
@@ -190,7 +190,7 @@ Item {
change.flatShadingEnabled = false
change.selectedPoint = Qt.point(0, 0)
change.textureFile = ":\customtexture.jpg"
- change.wireFrameColor = "green"
+ change.wireframeColor = "green"
}
function test_2_test_change() {
@@ -200,7 +200,7 @@ Item {
compare(change.flatShadingEnabled, false)
compare(change.selectedPoint, Qt.point(0, 0))
compare(change.textureFile, ":\customtexture.jpg")
- compare(change.wireFrameColor, "#008000")
+ compare(change.wireframeColor, "#008000")
}
function test_3_change_common() {