more tests

mix/CMakeLists.txt

@@ -29,7 +29,9 @@ else()
 	qt5_add_resources(UI_RESOURCES noweb.qrc)
 endif()
 
-add_definitions(-DQT_QML_DEBUG)
+if (CMAKE_BUILD_TYPE EQUAL "DEBUG")
+	add_definitions(-DQT_QML_DEBUG)
+endif()
 
 # eth_add_executable is defined in cmake/EthExecutableHelper.cmake
 eth_add_executable(${EXECUTABLE} 

mix/qml/CodeEditorView.qml

@@ -7,13 +7,14 @@ import QtQuick.Dialogs 1.1
 Item {
 	id: codeEditorView
 	property string currentDocumentId: ""
+	property int openDocCount: 0
 	signal documentEdit(string documentId)
 	signal breakpointsChanged(string documentId)
 	signal isCleanChanged(var isClean, string documentId)
 	signal loadComplete
 
 	function getDocumentText(documentId) {
-		for (var i = 0; i < editorListModel.count; i++)	{
+		for (var i = 0; i < openDocCount; i++)	{
 			if (editorListModel.get(i).documentId === documentId) {
 				return editors.itemAt(i).item.getText();
 			}
@@ -22,7 +23,7 @@ Item {
 	}
 
 	function isDocumentOpen(documentId) {
-		for (var i = 0; i < editorListModel.count; i++)
+		for (var i = 0; i < openDocCount; i++)
 			if (editorListModel.get(i).documentId === documentId &&
 					editors.itemAt(i).item)
 				return true;
@@ -35,11 +36,20 @@ Item {
 	}
 
 	function loadDocument(document) {
-		for (var i = 0; i < editorListModel.count; i++)
+		for (var i = 0; i < openDocCount; i++)
 			if (editorListModel.get(i).documentId === document.documentId)
 				return; //already open
 
-		editorListModel.append(document);
+		if (editorListModel.count <= openDocCount)
+			editorListModel.append(document);
+		else
+		{
+			editorListModel.set(openDocCount, document);
+			editors.itemAt(openDocCount).visible = true;
+			doLoadDocument(editors.itemAt(openDocCount).item, editorListModel.get(openDocCount))
+		}
+		openDocCount++;
+
 	}
 
 	function doLoadDocument(editor, document) {
@@ -63,7 +73,7 @@ Item {
 	}
 
 	function getEditor(documentId) {
-		for (var i = 0; i < editorListModel.count; i++)
+		for (var i = 0; i < openDocCount; i++)
 		{
 			if (editorListModel.get(i).documentId === documentId)
 				return editors.itemAt(i).item;
@@ -94,7 +104,7 @@ Item {
 	}
 
 	function editingContract() {
-		for (var i = 0; i < editorListModel.count; i++)
+		for (var i = 0; i < openDocCount; i++)
 			if (editorListModel.get(i).documentId === currentDocumentId)
 				return editorListModel.get(i).isContract;
 		return false;
@@ -102,7 +112,7 @@ Item {
 
 	function getBreakpoints() {
 		var bpMap = {};
-		for (var i = 0; i < editorListModel.count; i++)  {
+		for (var i = 0; i < openDocCount; i++)  {
 			var documentId = editorListModel.get(i).documentId;
 			var editor = editors.itemAt(i).item;
 			if (editor) {
@@ -133,7 +143,7 @@ Item {
 		}
 
 		onProjectSaving: {
-			for (var i = 0; i < editorListModel.count; i++)
+			for (var i = 0; i < openDocCount; i++)
 			{
 				var doc = editorListModel.get(i);
 				var editor = editors.itemAt(i).item;
@@ -145,7 +155,7 @@ Item {
 		onProjectSaved: {
 			if (projectModel.appIsClosing || projectModel.projectIsClosing)
 				return;
-			for (var i = 0; i < editorListModel.count; i++)
+			for (var i = 0; i < openDocCount; i++)
 			{
 				var doc = editorListModel.get(i);
 				resetEditStatus(doc.documentId);
@@ -155,8 +165,9 @@ Item {
 		onProjectClosed: {
 			for (var i = 0; i < editorListModel.count; i++)
 				editors.itemAt(i).visible = false;
-			editorListModel.clear();
+			//editorListModel.clear();
 			currentDocumentId = "";
+			openDocCount = 0;
 		}
 
 		onDocumentSaved: {

mix/qml/ItemDelegateDataDump.qml

@@ -28,7 +28,7 @@ Rectangle {
 				font.bold: true
 				color: "#4a4a4a"
 				text: modelData[0]
-				font.pointSize: DebuggerPaneStyle.general.dataDumpFontSize;
+				font.pointSize: dbgStyle.general.dataDumpFontSize;
 			}
 		}
 
@@ -47,7 +47,7 @@ Rectangle {
 				anchors.leftMargin: 4
 				color: "#4a4a4a"
 				text: modelData[1]
-				font.pointSize: DebuggerPaneStyle.general.dataDumpFontSize
+				font.pointSize: dbgStyle.general.dataDumpFontSize
 			}
 		}
 	}

mix/qml/ProjectModel.qml

@@ -43,6 +43,7 @@ Item {
 	property string deploymentDir
 	property var listModel: projectListModel
 	property var stateListModel: projectStateListModel.model
+	property alias stateDialog: projectStateListModel.stateDialog
 	property CodeEditorView codeEditor: null
 	property var unsavedFiles: []
 	property alias newProjectDialog: newProjectDialog

mix/qml/StateDialog.qml

@@ -21,6 +21,8 @@ Window {
 
 	property alias stateTitle: titleField.text
 	property alias isDefault: defaultCheckBox.checked
+	property alias model: transactionsModel
+	property alias transactionDialog: transactionDialog
 	property int stateIndex
 	property var stateTransactions: []
 	property var stateAccounts: []

mix/qml/StateListModel.qml

@@ -12,6 +12,7 @@ Item {
 
 	property alias model: stateListModel
 	property var stateList: []
+	property alias stateDialog: stateDialog
 	property string defaultAccount: "cb73d9408c4720e230387d956eb0f829d8a4dd2c1055f96257167e14e7169074" //support for old project
 
 	function fromPlainStateItem(s) {

mix/test/qml/TestMain.qml

@@ -25,7 +25,6 @@ TestCase
 		waitForRendering(mainApplication.mainContent, 10000);
 		mainApplication.projectModel.createProject();
 		var projectDlg = mainApplication.projectModel.newProjectDialog;
-		//if (ts.waitForSignal(projectDlg, "visibleChanged", 1000))
 		projectDlg.projectTitle = "TestProject";
 		projectDlg.pathFieldText = "/tmp/MixTest"; //TODO: get platform temp path
 		projectDlg.acceptAndClose();
@@ -33,11 +32,23 @@ TestCase
 		wait(300);
 	}
 
+	function editContract(c)
+	{
+		mainApplication.mainContent.codeEditor.getEditor("contract.sol").setText(c);
+		ts.keyPressChar("S", Qt.ControlModifier, 200); //Ctrl+S
+		if (!ts.waitForSignal(mainApplication.codeModel, "compilationComplete()", 5000))
+			fail("not compiled");
+	}
+
+	function clickElemet(el)
+	{
+		mouseClick(el, 0, 0, Qt.LeftButton, Qt.NoModifier, 10)
+	}
+
 	function test_defaultTransactionSequence()
 	{
 		newProject();
-		mainApplication.mainContent.codeEditor.getEditor("contract.sol").setText(
-		//ts.typeString(
+		editContract(
 		"contract Contract {\r" +
 		"	function Contract() {\r" +
 		"		uint x = 69;\r" +
@@ -50,33 +61,49 @@ TestCase
 		"	uint z;\r" +
 		"}\r"
 		);
-		ts.keyPressChar("S", Qt.ControlModifier, 200); //Ctrl+S
-		if (!ts.waitForSignal(mainApplication.codeModel, "compilationComplete()", 5000))
-			fail("not compiled");
 		tryCompare(mainApplication.mainContent.rightPane.transactionLog.transactionModel, "count", 3);
 	}
 
-	function test_ConstructorParameters()
+	function test_transactionWithParameter()
 	{
 		newProject();
-		mainApplication.mainContent.codeEditor.getEditor("contract.sol").setText(
-		//ts.typeString(
+		editContract(
 		"contract Contract {\r" +
 		"	function Contract(uint256 x) {\r" +
 		"		z = x;\r" +
-		"		}\r" +
 		"	}\r" +
 		"	function getZ() returns(uint256) {\r" +
 		"		return z;\r" +
-		"		}\r" +
 		"	}\r" +
 		"	uint z;\r" +
 		"}\r"
 		);
-		ts.keyPressChar("S", Qt.ControlModifier, 200); //Ctrl+S
-		if (!ts.waitForSignal(mainApplication.codeModel, "compilationComplete()", 5000))
-			fail("not compiled");
-		tryCompare(mainApplication.mainContent.rightPane.transactionLog.transactionModel, "count", 3);
+		mainApplication.projectModel.stateListModel.editState(0);
+		mainApplication.projectModel.stateDialog.model.editTransaction(2);
+		//TODO: edit transaction params and check results
+	}
+
+	function test_constructorParameters()
+	{
+		newProject();
+		editContract(
+		"contract Contract {\r" +
+		"	function setZ(uint256 x) {\r" +
+		"		z = x;\r" +
+		"	}\r" +
+		"	function getZ() returns(uint256) {\r" +
+		"		return z;\r" +
+		"	}\r" +
+		"	uint z;\r" +
+		"}\r"
+		);
+		mainApplication.projectModel.stateListModel.editState(0);
+		mainApplication.projectModel.stateDialog.model.addTransaction();
+		var transactionDialog = mainApplication.projectModel.stateDialog.transactionDialog;
+		transactionDialog.functionId = "setZ";
+
+
+		//TODO: edit transaction params and check results
 	}
 
 	Application