Merge pull request #1696 from dedis/work-simone-clean-up-karate

Clean up Karate

tests/karate/src/test/java/be/LAO/create.feature → tests/karate/src/test/java/be/features/LAO/create.feature

@@ -7,9 +7,9 @@ Feature: Create a pop LAO
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def validLao = organizer.createValidLao()
 

tests/karate/src/test/java/be/LAO/update.feature → tests/karate/src/test/java/be/features/LAO/update.feature

@@ -6,15 +6,15 @@ Feature: Update a LAO
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def lao = organizer.createValidLao()
 
     # This call executes all the steps to create a valid lao on the server before every scenario
     # (lao creation, subscribe, catchup)
-    * call read('classpath:be/utils/simpleScenarios.feature@name=valid_lao') { organizer: '#(organizer)', lao: '#(lao)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=valid_lao') { organizer: '#(organizer)', lao: '#(lao)' }
 
   Scenario: Update Lao should succeed with a valid update request with new lao name
     Given def updateLaoRequest =

tests/karate/src/test/java/be/decentralizedCom/getMessagesById.feature → tests/karate/src/test/java/be/features/decentralizedCom/getMessagesById.feature

@@ -6,9 +6,9 @@ Feature: Request messages by id from other servers
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def mockServer = call createMockClient
     * def lao = mockServer.createValidLao()
 
@@ -24,7 +24,7 @@ Feature: Request messages by id from other servers
 
     # This call executes all the steps to create a valid lao on the server before every scenario
     # (lao creation, subscribe, catchup)
-    * call read('classpath:be/utils/simpleScenarios.feature@name=valid_lao') { organizer: '#(mockServer)', lao: '#(lao)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=valid_lao') { organizer: '#(mockServer)', lao: '#(lao)' }
 
   # Check that after sending a heartbeat message with unknown message id, the server responds with a
   # getMessagesByID requesting this message

tests/karate/src/test/java/be/decentralizedCom/heartbeat.feature → tests/karate/src/test/java/be/features/decentralizedCom/heartbeat.feature

@@ -6,16 +6,16 @@ Feature: Send heartbeats to other servers
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def mockServer = call createMockClient
     * def lao = mockServer.createValidLao()
     * def validRollCall = mockServer.createValidRollCall(lao)
 
     # This call executes all the steps to create a valid lao on the server before every scenario
     # (lao creation, subscribe, catchup)
-    * call read('classpath:be/utils/simpleScenarios.feature@name=valid_lao') { organizer: '#(mockServer)', lao: '#(lao)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=valid_lao') { organizer: '#(mockServer)', lao: '#(lao)' }
 
   # After lao creation, wait and do nothing (30 seconds for now) and check that a heartbeat message was received
   Scenario: Server should send heartbeat messages automatically after a time interval

tests/karate/src/test/java/be/digitalCash/transaction.feature → tests/karate/src/test/java/be/features/digitalCash/transaction.feature

@@ -5,16 +5,16 @@ Feature: Simple Transactions for digital cash
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def recipient = call createMockClient
     * def lao = organizer.createValidLao()
     * def rollCall = organizer.createValidRollCall(lao)
 
     # This call executes all the steps to set up a lao, complete a roll call and subscribe to the coin channel
-    * call read('classpath:be/utils/simpleScenarios.feature@name=setup_coin_channel') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=setup_coin_channel') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)' }
 
   Scenario: Valid transaction: issue 32 mini-Laos to an attendee
     Given def transaction = organizer.issueCoins(recipient, 32);

tests/karate/src/test/java/be/election/castVote.feature → tests/karate/src/test/java/be/features/election/castVote.feature

@@ -5,17 +5,17 @@ Feature: Cast a vote
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def lao = organizer.createValidLao()
     * def rollCall = organizer.createValidRollCall(lao)
     * def election = organizer.createValidElection(lao)
     * def question = election.createQuestion()
 
     # This call executes all the steps to set up a lao, complete a roll call and open an election with one question
-    * call read('classpath:be/utils/simpleScenarios.feature@name=election_open') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)',  election: '#(election)', question: '#(question)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=election_open') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)',  election: '#(election)', question: '#(question)' }
     * def vote = question.createVote(0)
     * def castVote = election.castVote(vote)
 

tests/karate/src/test/java/be/election/electionEnd.feature → tests/karate/src/test/java/be/features/election/electionEnd.feature

@@ -5,17 +5,17 @@ Feature: Terminate an election
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def lao = organizer.createValidLao()
     * def rollCall = organizer.createValidRollCall(lao)
     * def election = organizer.createValidElection(lao)
     * def question = election.createQuestion()
 
     # This call executes all the steps to set up a lao, complete a roll call, open an election and cast a vote
-    * call read('classpath:be/utils/simpleScenarios.feature@name=cast_vote') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)',  election: '#(election)', question: '#(question)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=cast_vote') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)',  election: '#(election)', question: '#(question)' }
     * def electionEnd = election.close()
 
   # After a successful election setup and cast vote sending a valid election end

tests/karate/src/test/java/be/election/electionOpen.feature → tests/karate/src/test/java/be/features/election/electionOpen.feature

@@ -5,17 +5,17 @@ Feature: Open an Election
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def lao = organizer.createValidLao()
     * def rollCall = organizer.createValidRollCall(lao)
     * def election = organizer.createValidElection(lao)
     * def question = election.createQuestion()
 
     # This call executes all the steps to set up a lao, complete a roll call and create an election with one question
-    * call read('classpath:be/utils/simpleScenarios.feature@name=election_setup') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)',  election: '#(election)', question: '#(question)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=election_setup') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)',  election: '#(election)', question: '#(question)' }
     * def electionOpen = election.open()
 
   # Testing after creating an election, the backend returns an result

tests/karate/src/test/java/be/election/electionSetup.feature → tests/karate/src/test/java/be/features/election/electionSetup.feature

@@ -5,9 +5,9 @@ Feature: Setup an Election
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def lao = organizer.createValidLao()
     * def rollCall = organizer.createValidRollCall(lao)
@@ -16,7 +16,7 @@ Feature: Setup an Election
 
     # This call executes all the steps to set up a lao and complete a roll call, to get a valid pop token
     # (lao creation, subscribe, catchup, roll call creation, roll call open, roll call close)
-    * call read('classpath:be/utils/simpleScenarios.feature@name=close_roll_call') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=close_roll_call') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)' }
 
   # Testing if after a successful roll call, sending a valid election
   # setup results in a valid response from the backend

tests/karate/src/test/java/be/rollCall/closeRollCall.feature → tests/karate/src/test/java/be/features/rollCall/closeRollCall.feature

@@ -7,16 +7,16 @@ Feature: Close a Roll Call
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def lao = organizer.createValidLao()
     * def rollCall = organizer.createValidRollCall(lao)
 
     # This call executes all the steps to open a valid roll call on the server before every scenario
     # (lao creation, subscribe, catchup, roll call creation, roll call open)
-    * call read('classpath:be/utils/simpleScenarios.feature@name=open_roll_call') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=open_roll_call') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)' }
     * def closeRollCall = rollCall.close()
 
   # Testing if after setting up a valid lao, subscribing to it, sending a catchup

tests/karate/src/test/java/be/rollCall/createRollCall.feature → tests/karate/src/test/java/be/features/rollCall/createRollCall.feature

@@ -7,16 +7,16 @@ Feature: Create a Roll Call
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def lao = organizer.createValidLao()
     * def validRollCall = organizer.createValidRollCall(lao)
 
     # This call executes all the steps to create a valid lao on the server before every scenario
     # (lao creation, subscribe, catchup)
-    * call read('classpath:be/utils/simpleScenarios.feature@name=valid_lao') { organizer: '#(organizer)', lao: '#(lao)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=valid_lao') { organizer: '#(organizer)', lao: '#(lao)' }
 
   # Testing if after setting up a valid lao, subscribing to it and sending a catchup
   # we send a valid roll call create request and expect to receive a valid response

tests/karate/src/test/java/be/rollCall/openRollCall.feature → tests/karate/src/test/java/be/features/rollCall/openRollCall.feature

@@ -7,16 +7,16 @@ Feature: Roll Call Open
     # Call read(...) makes this feature and the called feature share the same scope
     # Meaning they share def variables, configurations ...
     # Especially JS functions defined in the called features can be directly used here thanks to Karate shared scopes
-    * call read('classpath:be/utils/server.feature')
-    * call read('classpath:be/mockClient.feature')
-    * call read('classpath:be/constants.feature')
+    * call read('classpath:be/features/utils/server.feature')
+    * call read('classpath:be/features/utils/mockClient.feature')
+    * call read('classpath:be/features/utils/constants.feature')
     * def organizer = call createMockClient
     * def lao = organizer.createValidLao()
     * def rollCall = organizer.createValidRollCall(lao)
 
     # This call executes all the steps to create a valid roll call on the server before every scenario
     # (lao creation, subscribe, catchup, roll call creation)
-    * call read('classpath:be/utils/simpleScenarios.feature@name=valid_roll_call') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)' }
+    * call read('classpath:be/features/utils/simpleScenarios.feature@name=valid_roll_call') { organizer: '#(organizer)', lao: '#(lao)', rollCall: '#(rollCall)' }
     * def openRollCall = rollCall.open()
 
   # This scenario tests a valid roll call open message.

tests/karate/src/test/java/be/utils/server.feature → tests/karate/src/test/java/be/features/utils/server.feature

@@ -82,15 +82,6 @@ Feature: This feature starts a server and stops it after every scenario.
     * call waitForPort
     * karate.log('Executing tests')
 
-    * def convertData =
-        """
-          function(){
-            var JsonConverter = Java.type('be.utils.JsonConverter')
-            return new JsonConverter()
-          }
-        """
-    * def converter = call convertData
-
     # Shutdown server automatically after the end of a feature
     * configure afterFeature =
           """