From d14aed5520c0263923b929feb28fd7f6e88dea28 Mon Sep 17 00:00:00 2001
From: ericmenezesn@gmail.com <ericmenezesn@gmail.com>
Date: Tue, 12 Aug 2014 13:06:13 -0300
Subject: [PATCH] usuario e senha do login com getter/setter, sendo setados no constructor do test

---
 cacic-teste/testcacic.cpp |  9 +++------
 src/cacic_comm.h          | 36 +++++++++++++++++++++++++++---------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/cacic-teste/testcacic.cpp b/cacic-teste/testcacic.cpp
index 02881aa..fcb18d4 100644
--- a/cacic-teste/testcacic.cpp
+++ b/cacic-teste/testcacic.cpp
@@ -25,6 +25,8 @@ void CTestCacic::initTestCase()
                                  "2.8.1.7",
                                  "2.8.1.6");
     OCacicComm.setUrlSsl("https://10.1.0.137/cacic/web/app_dev.php");
+    OCacicComm.setUsuario("cacic");
+    OCacicComm.setPassword("cacic123");
     this->testPath = QDir::currentPath() + "/teste";
     this->testIniPath = testPath + "/teste.ini";
     QVariantMap json;
@@ -106,12 +108,7 @@ void CTestCacic::testPegarUsu(){
 }
 
 void CTestCacic::testLogin(){
-
-    QVariantMap login;
-    login["user"] = "eric";
-    login["password"] = "612ef9b1";
-    OCacicComm.setUrlSsl("https://10.1.0.137/cacic/web/app_dev.php");
-    QJsonObject json = OCacicComm.comm("/ws/neo/login", QJsonObject::fromVariantMap(login), true);
+    QJsonObject json = OCacicComm.login();
     QJsonValue sessionvalue = OCacic.jsonValueFromJsonString(json["reply"].toString(), "session");
 //    qDebug() << sessionvalue.toString();
     QVERIFY(!sessionvalue.isNull());
diff --git a/src/cacic_comm.h b/src/cacic_comm.h
index 0fe1396..d034abd 100644
--- a/src/cacic_comm.h
+++ b/src/cacic_comm.h
@@ -20,8 +20,8 @@ private:
     QString urlGerente;
     QString urlSsl;
     // FIXME: Get from configuration
-    QString usuario = "user";
-    QString password = "123456";
+    QString usuario;
+    QString password;
     std::string session;
 
 public:
@@ -148,14 +148,12 @@ public:
 
     QJsonObject login() {
         // Cria dados de login
-        QVariantMap loginMap;
-        loginMap["user"] = this->usuario;
-        loginMap["password"] = this->password;
-        QJsonObject loginJson = QJsonObject::fromVariantMap(loginMap);
-
+        QVariantMap login;
+        login["user"] = this->usuario;
+        login["password"] = this->password;
+//        QJsonValue sessionvalue = OCacic.jsonValueFromJsonString(json["reply"].toString(), "session");
         // Cria conexão e retorna Json da sessão
-        QJsonObject retorno = this->comm("/ws/get/test", loginJson);
-
+        QJsonObject retorno = this->comm("/ws/neo/login", QJsonObject::fromVariantMap(login), true);
         return retorno;
 
     }
@@ -168,6 +166,26 @@ public:
         return this->urlSsl;
     }
 
+    QString getPassword()
+    {
+        return password;
+    }
+
+    void setPassword(QString value)
+    {
+        password = value;
+    }
+    QString getUsuario()
+    {
+        return usuario;
+    }
+
+    void setUsuario(QString value)
+    {
+        usuario = value;
+    }
+
+
 signals:
     void finished(QNetworkReply* reply);
 
--
libgit2 0.21.2