added datasync and more qml tests

.gitignore

@@ -79,3 +79,4 @@ qpmx.user.json
 .qpmx-dev-cache
 qpmx.json.user
 *.pro.dummy
+*.qmlc

src/imports/mvvmdatasyncquick/ChangeRemoteView11.qml

@@ -69,6 +69,7 @@ Page {
 				id: _urlEdit
 				Layout.fillWidth: true
 
+				placeholderText: "wss://example.org/qdsapp/"
 				validator: UrlValidator {
 					allowedSchemes: ["ws", "wss"]
 				}
@@ -92,6 +93,7 @@ Page {
 				id: _accessKeyEdit
 				Layout.fillWidth: true
 				echoMode: TextInput.Password
+				placeholderText: "Optional access secret"
 
 				MvvmBinding {
 					viewModel: _changeRemoteView.viewModel

src/mvvmcore/binding.cpp

@@ -108,6 +108,10 @@ Binding::operator bool() const
 void Binding::unbind()
 {
 	if(d) {
+		if(d->modelToViewConnection)
+			QObject::disconnect(d->modelToViewConnection);
+		if(d->viewToModelConnection)
+			QObject::disconnect(d->viewToModelConnection);
 		d->deleteLater();
 		d.clear();
 	}
@@ -165,7 +169,7 @@ void BindingPrivate::bindFrom(QMetaMethod changeSignal)
 		changeSignal = viewModelProperty.notifySignal();
 	}
 	auto trigger = metaObject()->method(metaObject()->indexOfSlot("viewModelTrigger()"));
-	connect(viewModel, changeSignal, this, trigger);
+	modelToViewConnection = connect(viewModel, changeSignal, this, trigger);
 }
 
 void BindingPrivate::bindTo(QMetaMethod changeSignal)
@@ -177,7 +181,7 @@ void BindingPrivate::bindTo(QMetaMethod changeSignal)
 		changeSignal = viewProperty.notifySignal();
 	}
 	auto trigger = metaObject()->method(metaObject()->indexOfSlot("viewTrigger()"));
-	connect(view, changeSignal, this, trigger);
+	viewToModelConnection = connect(view, changeSignal, this, trigger);
 }
 
 void BindingPrivate::testReadable(const QMetaProperty &property, bool asView) const

src/mvvmcore/binding.h

@@ -39,7 +39,7 @@ public:
 	Q_INVOKABLE void unbind();
 
 private:
-	QPointer<QObject> d;
+	QPointer<BindingPrivate> d;
 };
 
 //! Create a multidirectional binding between properties

src/mvvmcore/binding_p.h

@@ -38,6 +38,9 @@ private:
 	QMetaProperty viewModelProperty;
 	QMetaProperty viewProperty;
 
+	QMetaObject::Connection modelToViewConnection;
+	QMetaObject::Connection viewToModelConnection;
+
 	void testReadable(const QMetaProperty &property, bool asView) const;
 	void testWritable(const QMetaProperty &property, bool asView) const;
 	void testNotifier(const QMetaProperty &property, bool asView) const;

src/mvvmdatasynccore/datasyncsettingsaccessor.cpp

@@ -29,7 +29,10 @@ DataSyncSettingsAccessor::DataSyncSettingsAccessor(QtDataSync::DataStore *store,
 DataSyncSettingsAccessor::DataSyncSettingsAccessor(QtDataSync::DataTypeStore<DataSyncSettingsEntry> *store, QObject *parent) :
 	ISettingsAccessor{parent},
 	d{new DataSyncSettingsAccessorPrivate{store}}
-{}
+{
+	connect(d->store, &QtDataSync::DataTypeStoreBase::dataChanged,
+			this, &DataSyncSettingsAccessor::dataChanged);
+}
 
 DataSyncSettingsAccessor::~DataSyncSettingsAccessor() = default;
 
@@ -89,6 +92,14 @@ void DataSyncSettingsAccessor::sync()
 	// nothing needs to be done
 }
 
+void DataSyncSettingsAccessor::dataChanged(const QString &key, const QVariant &value)
+{
+	if(value.isValid())
+		emit entryChanged(key, value.value<DataSyncSettingsEntry>().value());
+	else
+		emit entryRemoved(key);
+}
+
 // ------------- Private Implementation -------------
 
 DataSyncSettingsAccessorPrivate::DataSyncSettingsAccessorPrivate(QtDataSync::DataTypeStore<DataSyncSettingsEntry> *store) :

src/mvvmdatasynccore/datasyncsettingsaccessor.h

@@ -31,6 +31,9 @@ public:
 public Q_SLOTS:
 	void sync() override;
 
+private Q_SLOTS:
+	void dataChanged(const QString &key, const QVariant &value);
+
 private:
 	QScopedPointer<DataSyncSettingsAccessorPrivate> d;
 };

src/mvvmdatasyncwidgets/changeremotedialog.ui

@@ -218,7 +218,10 @@
      <normaloff>:/de/skycoder42/qtmvvm/widgets/icons/remove.ico</normaloff>:/de/skycoder42/qtmvvm/widgets/icons/remove.ico</iconset>
    </property>
    <property name="text">
-    <string>&amp;Remove Selected Header</string>
+    <string>&amp;Remove Header</string>
+   </property>
+   <property name="toolTip">
+    <string>Remove selected Header</string>
    </property>
    <property name="shortcut">
     <string>Del</string>

tests/auto/auto.pro

@@ -3,3 +3,8 @@ TEMPLATE = subdirs
 SUBDIRS += cmake \
 	mvvmcore \
 	qml
+
+qtHaveModule(datasync) {
+	SUBDIRS += \
+		mvvmdatasynccore
+}

tests/auto/mvvmdatasynccore/datasyncsettingsaccessor/datasyncsettingsaccessor.pro

@@ -0,0 +1,14 @@
+TEMPLATE = app
+
+QT += testlib mvvmdatasynccore
+QT -= gui
+CONFIG += console
+CONFIG -= app_bundle
+
+TARGET = tst_datasyncsettingsaccessor
+
+HEADERS += \
+	../../../shared/tst_isettingsaccessor.h
+
+SOURCES += \
+	tst_datasyncsettingsaccessor.cpp

tests/auto/mvvmdatasynccore/datasyncsettingsaccessor/tst_datasyncsettingsaccessor.cpp

@@ -0,0 +1,57 @@
+#include <QtTest>
+#include <QtMvvmDataSyncCore/DataSyncSettingsAccessor>
+#include <QtDataSync/Setup>
+#include "../../../shared/tst_isettingsaccessor.h"
+using namespace QtDataSync;
+using namespace QtMvvm;
+
+class DataSyncSettingsAccessorTest : public ISettingsAccessorTest
+{
+	Q_OBJECT
+
+protected:
+	ISettingsAccessor *createFirst() override;
+	ISettingsAccessor *createSecond() override;
+	bool testSyncChangeSignals() override;
+
+private Q_SLOTS:
+	void initTestCase();
+	void cleanupTestCase();
+
+private:
+	QTemporaryDir tDir;
+};
+
+ISettingsAccessor *DataSyncSettingsAccessorTest::createFirst()
+{
+	return new DataSyncSettingsAccessor{this};
+}
+
+ISettingsAccessor *DataSyncSettingsAccessorTest::createSecond()
+{
+	return new DataSyncSettingsAccessor{this};
+}
+
+bool DataSyncSettingsAccessorTest::testSyncChangeSignals()
+{
+	return true;
+}
+
+void DataSyncSettingsAccessorTest::initTestCase()
+{
+	Setup{}.setLocalDir(tDir.path())
+			.setKeyStoreProvider(QStringLiteral("plain"))
+			.create();
+}
+
+void DataSyncSettingsAccessorTest::cleanupTestCase()
+{
+	delete first;
+	delete second;
+	Setup::removeSetup(DefaultSetup, true);
+	tDir.remove();
+}
+
+QTEST_MAIN(DataSyncSettingsAccessorTest)
+
+#include "tst_datasyncsettingsaccessor.moc"

tests/auto/mvvmdatasynccore/mvvmdatasynccore.pro

@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS += \
+	datasyncsettingsaccessor

tests/auto/qml/qml.pro

@@ -1,6 +1,7 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-	qmlsettingsgenerator
+	qmlsettingsgenerator \
+	qmlmvvmcore
 
 equals(MSVC_VER, 14.0): SUBDIRS -= qmlsettingsgenerator

tests/auto/qml/qmlmvvmcore/qmlmvvmcore.pro

@@ -0,0 +1,16 @@
+TEMPLATE = app
+
+QT += testlib mvvmcore qml
+CONFIG += qmltestcase console
+CONFIG -= app_bundle
+
+TARGET = tst_qmlmvvmcore
+
+SOURCES += \
+	tst_qmlmvvmcore.cpp
+
+DISTFILES += \
+	tst_qmlmvvmcore.qml
+
+importFiles.path = .
+DEPLOYMENT += importFiles

tests/auto/qml/qmlmvvmcore/tst_qmlmvvmcore.cpp

@@ -0,0 +1,4 @@
+#include <QtCore>
+#include <QtQuickTest/quicktest.h>
+
+QUICK_TEST_MAIN(qmlmvvmcore)

tests/auto/qml/qmlmvvmcore/tst_qmlmvvmcore.qml

@@ -0,0 +1,61 @@
+import QtQuick 2.10
+import de.skycoder42.QtMvvm.Core 1.1
+import QtTest 1.1
+
+Item {
+	id: root
+
+	TestCase {
+		name: "Binding"
+
+		QtObject {
+			id: obj
+
+			property int prop1: 42
+			property int prop2: 0
+		}
+
+		MvvmBinding {
+			id: bind
+			viewModel: obj
+			view: obj
+			viewModelProperty: "prop1"
+			viewProperty: "prop2"
+			type: MvvmBinding.SingleInit
+		}
+
+		function test_1_SingleInit() {
+			verify(bind.isValid());
+			compare(obj.prop1, 42);
+			compare(obj.prop2, 42);
+			obj.prop1 = 24;
+			compare(obj.prop2, 42);
+			obj.prop2 = 44;
+			compare(obj.prop1, 24);
+		}
+
+		function test_2_OneWayToView() {
+			bind.type = MvvmBinding.OneWayToView
+			obj.prop1 = 33;
+			compare(obj.prop2, 33);
+			obj.prop2 = 44;
+			compare(obj.prop1, 33);
+		}
+
+		function test_3_OneWayToViewModel() {
+			bind.type = MvvmBinding.OneWayToViewModel
+			obj.prop2 = 45;
+			compare(obj.prop1, 45);
+			obj.prop1 = 22;
+			compare(obj.prop2, 45);
+		}
+
+		function test_4_TwoWay() {
+			bind.type = MvvmBinding.TwoWay
+			obj.prop1 = 78;
+			compare(obj.prop2, 78);
+			obj.prop2 = 87;
+			compare(obj.prop1, 87);
+		}
+	}
+}

tests/auto/settings.xml

@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<SettingsConfig allowSearch="true" allowRestore="true">
-	<Include optional="true">/absolute/include/path.xml</Include>
-	<Include optional="false">../relative/include/path.xml</Include>
-	<Category title="title"
-		   icon="file:///icon/path.svg"
-		   tooltip="useful tip"
-		   frontends="widgets|quick"
-		   selectors="ios|android&amp;xhdpi">
-		<Include optional="true">/absolute/include/path.xml</Include>
-		<Include>../relative/include/path.xml</Include>
-		<Section title="another title"
-			   icon="https://example.org/icon/path.svg"
-			   tooltip="another tip"
-			   frontends="widgets"
-			   selectors="android&amp;xhdpi">
-			<Include optional="true">/absolute/include/path.xml</Include>
-			<Include>../relative/include/path.xml</Include>
-			<Group title="group title"
-				  tooltip="hovering tool tip"
-				  frontends="quick"
-				  selectors="ios|android">
-				<Include optional="true">/absolute/include/path.xml</Include>
-				<Include>../relative/include/path.xml</Include>
-				<Entry key="property"
-					   type="bool"
-					   title="&amp;Check me"
-					   tooltip="I am a checkbox!"
-					   default="false"
-					   frontends="widgets|quick"
-					   selectors="ios|android&amp;xhdpi">
-					<SearchKey>prop</SearchKey>
-					<SearchKey>attrib</SearchKey>
-					<SearchKey>sample</SearchKey>
-					<Property key="text" type="string">Please do check me</Property>
-					<Property key="size" type="object">
-						<Property key="width" type="int">42</Property>
-						<Property key="height" type="int">42</Property>
-					</Property>
-					<Property key="things" type="list">
-						<Element type="int">42</Element>
-						<Element type="list">
-							<Element type="string">elem 1</Element>
-							<Element type="string">elem 2</Element>
-						</Element>
-						<Element type="object">
-							<Property key="name" type="string">baum</Property>
-							<Property key="number" type="int">42</Property>
-						</Element>
-					</Property>
-				</Entry>
-				<Entry key="req" type="req" title="req" />
-			</Group>
-			<Group/>
-		</Section>
-		<Section/>
-	</Category>
-	<Category/>
-</SettingsConfig>

tests/shared/tst_isettingsaccessor.h

@@ -10,7 +10,8 @@ class ISettingsAccessorTest : public QObject
 	Q_OBJECT
 
 protected:
-	QtMvvm::ISettingsAccessor *accessor = nullptr;
+	QtMvvm::ISettingsAccessor *first = nullptr;
+	QtMvvm::ISettingsAccessor *second = nullptr;
 
 	virtual QtMvvm::ISettingsAccessor *createFirst() = 0;
 	virtual QtMvvm::ISettingsAccessor *createSecond() = 0;
@@ -18,23 +19,23 @@ protected:
 
 private Q_SLOTS:
 	void testAccessorValid() {
-		accessor = createFirst();
+		first = createFirst();
-		QVERIFY(accessor);
+		QVERIFY(first);
 	}
 
 	void testSimpleOperations() {
-		QSignalSpy changedSpy{accessor, &QtMvvm::ISettingsAccessor::entryChanged};
+		QSignalSpy changedSpy{first, &QtMvvm::ISettingsAccessor::entryChanged};
-		QSignalSpy removedSpy{accessor, &QtMvvm::ISettingsAccessor::entryRemoved};
+		QSignalSpy removedSpy{first, &QtMvvm::ISettingsAccessor::entryRemoved};
 
 		auto key = QStringLiteral("test/key");
-		QVERIFY(!accessor->contains(key));
+		QVERIFY(!first->contains(key));
-		QCOMPARE(accessor->load(key, 24).toInt(), 24);
+		QCOMPARE(first->load(key, 24).toInt(), 24);
 		QVERIFY(changedSpy.isEmpty());
 		QVERIFY(removedSpy.isEmpty());
 
-		accessor->save(key, 42);
+		first->save(key, 42);
-		QVERIFY(accessor->contains(key));
+		QVERIFY(first->contains(key));
-		QCOMPARE(accessor->load(key, 24).toInt(), 42);
+		QCOMPARE(first->load(key, 24).toInt(), 42);
 		if(changedSpy.isEmpty())
 			QVERIFY(changedSpy.wait());
 		QCOMPARE(changedSpy.size(), 1);
@@ -43,9 +44,9 @@ private Q_SLOTS:
 		QCOMPARE(changeEvent[1].toInt(), 42);
 		QVERIFY(removedSpy.isEmpty());
 
-		accessor->remove(key);
+		first->remove(key);
-		QVERIFY(!accessor->contains(key));
+		QVERIFY(!first->contains(key));
-		QCOMPARE(accessor->load(key, 24).toInt(), 24);
+		QCOMPARE(first->load(key, 24).toInt(), 24);
 		if(removedSpy.isEmpty())
 			QVERIFY(removedSpy.wait());
 		QCOMPARE(removedSpy.size(), 1);
@@ -59,13 +60,13 @@ private Q_SLOTS:
 		auto key2 = QStringLiteral("group/key/subkey");
 		auto key3 = QStringLiteral("group/key/subgroup/subkey");
 
-		accessor->save(key0, true);
+		first->save(key0, true);
-		accessor->save(key1, true);
+		first->save(key1, true);
-		accessor->save(key2, true);
+		first->save(key2, true);
-		accessor->save(key3, true);
+		first->save(key3, true);
 
-		QSignalSpy removedSpy{accessor, &QtMvvm::ISettingsAccessor::entryRemoved};
+		QSignalSpy removedSpy{first, &QtMvvm::ISettingsAccessor::entryRemoved};
-		accessor->remove(key1);
+		first->remove(key1);
 		while(removedSpy.size() < 3)
 			QVERIFY(removedSpy.wait());
 
@@ -83,14 +84,14 @@ private Q_SLOTS:
 	}
 
 	void testSync() {
-		auto second = createSecond();
+		second = createSecond();
 		QVERIFY(second);
 		QSignalSpy changedSpy{second, &QtMvvm::ISettingsAccessor::entryChanged};
-		QSignalSpy removedSpy{accessor, &QtMvvm::ISettingsAccessor::entryRemoved};
+		QSignalSpy removedSpy{first, &QtMvvm::ISettingsAccessor::entryRemoved};
 
 		auto key = QStringLiteral("sync/key");
-		accessor->save(key, 13);
+		first->save(key, 13);
-		accessor->sync();
+		first->sync();
 		second->sync();
 		if(!testSyncChangeSignals())
 			QEXPECT_FAIL("", "The testes accessor does not support notifying changes over multiple instances", Continue);
@@ -100,13 +101,13 @@ private Q_SLOTS:
 			QCOMPARE(changedSpy.size(), 1);
 			auto changeEvent = changedSpy.takeFirst();
 			QCOMPARE(changeEvent[0].toString(), key);
-			QCOMPARE(changeEvent[1].toInt(), 42);
+			QCOMPARE(changeEvent[1].toInt(), 13);
 		}
 		QCOMPARE(second->load(key, 24).toInt(), 13);
 
 		second->remove(key);
 		second->sync();
-		accessor->sync();
+		first->sync();
 		if(!testSyncChangeSignals())
 			QEXPECT_FAIL("", "The testes accessor does not support notifying changes over multiple instances", Continue);
 		if(removedSpy.isEmpty())
@@ -115,7 +116,7 @@ private Q_SLOTS:
 			QCOMPARE(removedSpy.size(), 1);
 			QCOMPARE(removedSpy.takeFirst()[0].toString(), key);
 		}
-		QCOMPARE(accessor->load(key, 24).toInt(), 24);
+		QCOMPARE(first->load(key, 24).toInt(), 24);
 	}
 };