From 3526feddc7be558fe141507f980c4ebe6af2b32e Mon Sep 17 00:00:00 2001
From: ericmenezesn@gmail.com <ericmenezesn@gmail.com>
Date: Mon, 18 Aug 2014 11:46:19 -0300
Subject: [PATCH] Novo teste de getValuesFromRegistry.

---
 cacic-teste/testcacic.cpp            | 28 +++++++---------------------
 cacic-teste/testcacic.h              |  2 +-
 install-cacic/install-cacic.pro.user |  4 ++--
 install-cacic/installcacic.cpp       | 15 +++++++++------
 src/ccacic.cpp                       |  6 ++++++
 src/ccacic.h                         |  1 +
 6 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp
index 190d343..4bacfc9 100644
--- a/cacic-teste/testcacic.cpp
+++ b/cacic-teste/testcacic.cpp
@@ -105,6 +105,7 @@ void CTestCacic::testConsole()
 #if defined(Q_OS_LINUX)
     QVERIFY(console("echo teste").toStdString() == "teste\n");
 #elif defined(Q_OS_WIN)
+    qDebug() << console("echo teste");
     QVERIFY(console("echo teste").toStdString() == "teste");
 #else
     QVERIFY(false);
@@ -154,26 +155,6 @@ void CTestCacic::testDeCrypt(){
 
 }
 
-void CTestCacic::testInstallCacicStart()
-{
-//    char *argva[] = {"program name", "-host=teste.cacic.cpp", "-user=asda", "-password=qwesd", NULL};
-//    int argca = sizeof(argva) / sizeof(char*) - 1;
-//    QCoreApplication a(argca, argva);
-
-//    InstallCacic *oInstallCacic = new InstallCacic(&a);
-
-//    QStringList args;
-//    for (int i = 0; i<argca; i++)
-//        args.append(argva[i]);
-//    // This will cause the application to exit when
-//    // the task signals finished.
-//    QObject::connect(oInstallCacic, SIGNAL(finished()), &a, SLOT(quit()));
-
-//    // This will run the task from the application event loop.
-//    QMetaObject::invokeMethod(oInstallCacic, "run", Qt::QueuedConnection, Q_ARG(QStringList, args), Q_ARG(int, argca));
-    QVERIFY(false);
-}
-
 void CTestCacic::testCacicCompToJsonObject()
 {
 //    qDebug() << OCacicComp.toJsonObject();
@@ -204,7 +185,7 @@ void CTestCacic::testStartService()
 #ifdef Q_OS_WIN
     exitStatus = OCacic.startProcess("../../install-cacic/debug/install-cacic.exe", true, &ok);
 #else
-    exitStatus = OCacic.startProcess("../../install-cacic/debug/install-cacic", &ok);
+    exitStatus = OCacic.startProcess("../../install-cacic/debug/install-cacic", true, &ok);
 #endif
     QVERIFY(ok);
 }
@@ -238,6 +219,11 @@ void CTestCacic::testSetRegistry()
     QVERIFY(confirmaTeste.value("teste1") == QVariant("Teste 1"));
 }
 
+void CTestCacic::testGetValueFromRegistry()
+{
+    QVERIFY(OCacic.getValueFromRegistry("Lightbase", "Teste", "teste1") == QVariant("Teste 1"));
+}
+
 void CTestCacic::testRemoveRegistry()
 {
     OCacic.removeRegistry("Lightbase", "Teste");
diff --git a/cacic-teste/testcacic.h b/cacic-teste/testcacic.h
index 8d95c00..3307a25 100644
--- a/cacic-teste/testcacic.h
+++ b/cacic-teste/testcacic.h
@@ -55,7 +55,6 @@ private slots:
   void testSslConnection();
   void testEnCrypt();
   void testDeCrypt();
-  void testInstallCacicStart();
   void testCacicCompToJsonObject();
   void testOperatingSystemToJsonObject();
   void testJsonToFile();
@@ -63,6 +62,7 @@ private slots:
   void testStartService();
   void testReadConfig();
   void testSetRegistry();
+  void testGetValueFromRegistry();
   void testRemoveRegistry();
   void cleanupTestCase();
 };
diff --git a/install-cacic/install-cacic.pro.user b/install-cacic/install-cacic.pro.user
index a826b08..eb4e3b1 100644
--- a/install-cacic/install-cacic.pro.user
+++ b/install-cacic/install-cacic.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.1.2, 2014-08-15T20:38:37. -->
+<!-- Written by QtCreator 3.1.2, 2014-08-18T11:08:49. -->
 <qtcreator>
  <data>
   <variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -224,7 +224,7 @@
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments">-uninstall</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.ProFile">install-cacic.pro</value>
     <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix">false</value>
-    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">true</value>
+    <value type="bool" key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal">false</value>
     <value type="QString" key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory"></value>
     <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
     <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
diff --git a/install-cacic/installcacic.cpp b/install-cacic/installcacic.cpp
index 00539de..0410b3d 100644
--- a/install-cacic/installcacic.cpp
+++ b/install-cacic/installcacic.cpp
@@ -19,24 +19,27 @@ void InstallCacic::run(QStringList argv, int argc) {
         if (ok){
             //conectado, grava a chave na classe;
             oCacic.setChaveCrypt(jsonLogin["reply"].toObject()["chavecrip"].toString());
+#ifdef Q_OS_WIN
             oCacic.setCacicMainFolder("c:/cacic");
+#elif Q_LINUX
+            oCacic.setCacicMainFolder("/home/cacic");
+#endif
             oCacic.createFolder(oCacic.getCacicMainFolder());
             //grava chave em registro;
 
             QVariantMap registro;
             registro["key"] = oCacic.getChaveCrypt();
+            registro["mainFolder"] = oCacic.getCacicMainFolder();
             oCacic.setValueToRegistry("Lightbase", "Cacic", registro);
             //starta o processo do cacic.
 #ifdef Q_OS_WIN
-            QString exitStatus = oCacic.startProcess("cacic.exe", true, &ok);
-            if (!ok)
-                std::cout << "Erro ao iniciar o processo: "
-                          << exitStatus.toStdString() << "\n";
+            QString exitStatus = oCacic.startProcess(oCacic.getCacicMainFolder() + "cacic.exe", true, &ok);
 #else
             oCacic.startProcess("cacic.exe", true, &ok);
-            if (!ok)
-                qDebug() << "Erro ao iniciar o processo.";
 #endif
+            if (!ok)
+                std::cout << "Erro ao iniciar o processo: "
+                          << exitStatus.toStdString() << "\n";
         } else
             std::cout << "Nao foi possivel realizar o login.\n  "
                       << jsonLogin["error"].toString().toStdString();
diff --git a/src/ccacic.cpp b/src/ccacic.cpp
index 069c150..34227b6 100644
--- a/src/ccacic.cpp
+++ b/src/ccacic.cpp
@@ -216,6 +216,12 @@ void CCacic::setValueToRegistry(QString organization, QString application, QVari
     registry.sync();
 }
 
+QVariant CCacic::getValueFromRegistry(QString organization, QString application, QString key)
+{
+    QSettings registry(organization, application);
+    return registry.value(key);
+}
+
 void CCacic::removeRegistry(QString organization, QString application)
 {
     QSettings registry(organization, application);
diff --git a/src/ccacic.h b/src/ccacic.h
index 8c7ee1c..c1bb61f 100644
--- a/src/ccacic.h
+++ b/src/ccacic.h
@@ -37,6 +37,7 @@ public:
     QJsonObject getJsonFromFile(QString filepath);
     QString startProcess(QString pathprogram, bool wait, bool *ok, QStringList arguments = QStringList());
     void setValueToRegistry(QString organization, QString application, QVariantMap values);
+    QVariant getValueFromRegistry(QString organization, QString application, QString key);
     void removeRegistry(QString organization, QString application);
 
 
--
libgit2 0.21.2