From 49de84742fefe868c17b5aa90f6f5158e32280e0 Mon Sep 17 00:00:00 2001
From: Tiberio Baptista <tiberio.baptista@ua.pt>
Date: Mon, 26 Jul 2021 17:48:35 +0100
Subject: [PATCH 1/2] Updated print functions to python3 syntax

---
 tests.py | 50 ++++++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/tests.py b/tests.py
index 8d0d993..383de87 100644
--- a/tests.py
+++ b/tests.py
@@ -7,47 +7,45 @@
 
 montra = Montra(url="http://127.0.0.1:8000")
 
-print " -- search_datasets --"
+print(" -- search_datasets --")
 listOfQuestionnaires = montra.search_datasets(user, password, questionnaire="Demo Observational")
 questionnaireSlug = listOfQuestionnaires[0]["slug"]
-print questionnaireSlug
-print " -- search_datasets done -- \n"
+print(questionnaireSlug)
+print(" -- search_datasets done -- \n")
 
 
-print " -- get_dataset --"
+print(" -- get_dataset --")
 questionnaire = montra.get_dataset(user, password, questionnaireSlug=questionnaireSlug)
-print questionnaire
-fingerprintHash = questionnaire["fingerprint_set"][0]
-print fingerprintHash
-print " -- search_datasets done -- \n"
+print(questionnaire)
+print(fingerprint)
+print(" -- search_datasets done -- \n")
 
 
-print " -- get_dataentry 1 param--"
-fingerprintOp1 = montra.get_dataentry(user, password, fingerprintHash=fingerprintHash)
-print fingerprintOp1
-print " -- get_dataentry 1 param done -- \n"
+print(" -- get_dataentry 1 param--")
+print(fingerprintOp1)
+print(" -- get_dataentry 1 param done -- \n")
 
 
-print " -- get_dataentry 2 param --"
+print(" -- get_dataentry 2 param --")
 fingerprintOp2 = montra.get_dataentry(user, password, acronym="ADC", questionnaireSlug="adcohort")
-print fingerprintOp2
+print(fingerprintOp2)
 fingerprintHash2 = fingerprintOp2["fingerprint_hash"]
-print fingerprintHash2
-print " -- get_dataentry 2 param done -- \n"
+print(fingerprintHash2)
+print(" -- get_dataentry 2 param done -- \n")
 
-print " -- list_answer --"
+print(" -- list_answer --")
 answers = montra.list_answer(user, password, fingerprintHash=fingerprintHash2)
-print answers
-print " -- list_answer done --"
+print(answers)
+print(" -- list_answer done --")
 
-print " -- get_answer --"
+print(" -- get_answer --")
 question = answers[0]["question"]
-print question
+print(question)
 answer = montra.get_answer(user, password, fingerprintHash=fingerprintHash2, question=question)
-print answer
-print " -- get_answer done--"
+print(answer)
+print(" -- get_answer done--")
 
-print " -- post_answer --"
+print(" -- post_answer --")
 newAnswer = montra.post_answer(user, password, fingerprintHash=fingerprintHash2, question=question, newAnswer="newAnswer")
-print newAnswer
-print " -- post_answer done--"
\ No newline at end of file
+print(newAnswer)
+print(" -- post_answer done--")
\ No newline at end of file

From 3736fb299370019e26c77845597c847f29d83b8c Mon Sep 17 00:00:00 2001
From: Tiberio Baptista <tiberio.baptista@ua.pt>
Date: Mon, 26 Jul 2021 17:51:27 +0100
Subject: [PATCH 2/2] Updated tests.py, montra.py

---
 montra.py | 2 +-
 tests.py  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/montra.py b/montra.py
index 2c3ced3..3d9a6b4 100644
--- a/montra.py
+++ b/montra.py
@@ -45,7 +45,7 @@ def get_dataset(self, user, password, questionnaireSlug=COMM):
 
     def get_dataentry(self, user, password, **args):
         if(len(args) == 1):
-            return self.__get_dataentry_by_hash(user, password, args["fingerprintHash"])
+            return self.__get_dataentry_by_hash(user, password, args["fingerprint"]["fingerprint_hash"])
         else:
             return self.__get_dataentry_by_acronym(user, password, args["acronym"], args["questionnaireSlug"])
 
diff --git a/tests.py b/tests.py
index 383de87..56b54da 100644
--- a/tests.py
+++ b/tests.py
@@ -17,11 +17,13 @@
 print(" -- get_dataset --")
 questionnaire = montra.get_dataset(user, password, questionnaireSlug=questionnaireSlug)
 print(questionnaire)
+fingerprint = questionnaire["fingerprint_set"][0]
 print(fingerprint)
 print(" -- search_datasets done -- \n")
 
 
 print(" -- get_dataentry 1 param--")
+fingerprintOp1 = montra.get_dataentry(user, password, fingerprint=fingerprint)
 print(fingerprintOp1)
 print(" -- get_dataentry 1 param done -- \n")