fix missing approvals

upb-uc4 · Jan 15, 2021 · 9a05607 · 9a05607
1 parent f9581d3
commit 9a05607
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/src/test/scala/de/upb/cs/uc4/hyperledger/testUtil/TestSetup.scala b/src/test/scala/de/upb/cs/uc4/hyperledger/testUtil/TestSetup.scala
@@ -1,11 +1,7 @@
 package de.upb.cs.uc4.hyperledger.testUtil
 
-import java.security.PrivateKey
-
 import de.upb.cs.uc4.hyperledger.connections.traits.{ ConnectionExaminationRegulationTrait, ConnectionGroupTrait, ConnectionMatriculationTrait }
 import de.upb.cs.uc4.hyperledger.testUtil.TestDataMatriculation.testModule
-import de.upb.cs.uc4.hyperledger.utilities.helper.Logger
-import org.hyperledger.fabric.gateway.impl.identity.X509IdentityImpl
 
 object TestSetup {
   def setupExaminationRegulations(erConnection: ConnectionExaminationRegulationTrait): Unit = {

diff --git a/src/test/scala/de/upb/cs/uc4/hyperledger/tests/contracts/AdmissionTests.scala b/src/test/scala/de/upb/cs/uc4/hyperledger/tests/contracts/AdmissionTests.scala
@@ -38,6 +38,8 @@ class AdmissionTests extends TestBase {
           // approve as Users
           initializeOperation(testUser1).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", mat1)
           initializeOperation(testUser2).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", mat2)
+          initializeOperation(username).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", mat1)
+          initializeOperation(username).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", mat2)
 
           // store on chain
           TestHelper.trySetupConnections(

diff --git a/src/test/scala/de/upb/cs/uc4/hyperledger/tests/contracts/MatriculationAccessTests.scala b/src/test/scala/de/upb/cs/uc4/hyperledger/tests/contracts/MatriculationAccessTests.scala
@@ -38,6 +38,7 @@ class MatriculationAccessTests extends TestBase {
         val testUserPw = RegistrationManager.register(caURL, tlsCert, enrollmentID, username, walletPath, "org1")
         EnrollmentManager.enroll(caURL, tlsCert, walletPath, enrollmentID, testUserPw, organisationId, channel, chaincode, networkDescriptionPath)
         initializeOperation(enrollmentID).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", newData)
+        initializeOperation(username).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", newData)
 
         // add matriculation as admin
         TestHelperStrings.compareJson(newData, chaincodeConnection.addMatriculationData(newData))

diff --git a/src/test/scala/de/upb/cs/uc4/hyperledger/tests/contracts/MatriculationErrorTests.scala b/src/test/scala/de/upb/cs/uc4/hyperledger/tests/contracts/MatriculationErrorTests.scala
@@ -59,6 +59,8 @@ class MatriculationErrorTests extends TestBase {
       for ((testDescription: String, matriculationData: String) <- testData) {
         s"$testDescription" in {
           Logger.info("Begin test: " + testDescription)
+          // TODO add approvals for all
+          // TODO check error message
           TestHelper.testTransactionException(
             "addMatriculationData",
             () => chaincodeConnection.addMatriculationData(matriculationData)

diff --git a/src/test/scala/de/upb/cs/uc4/hyperledger/tests/general/UnsignedTransactionTests.scala b/src/test/scala/de/upb/cs/uc4/hyperledger/tests/general/UnsignedTransactionTests.scala
@@ -207,6 +207,7 @@ class UnsignedTransactionTests extends TestBase {
         val (privateKey, certificate) = prepareUser(testUserId)
         val inputMatJSon = TestDataMatriculation.validMatriculationData4(testUserId)
         initializeOperation(testUserId).approveTransaction(testUserId, "UC4.MatriculationData", "addMatriculationData", inputMatJSon)
+        initializeOperation(username).approveTransaction(testUserId, "UC4.MatriculationData", "addMatriculationData", inputMatJSon)
         matriculationConnection.addMatriculationData(inputMatJSon)
 
         // Log proposal
@@ -224,6 +225,7 @@ class UnsignedTransactionTests extends TestBase {
         val (privateKey, certificate) = prepareUser(testUserId)
         val inputMatJSon = TestDataMatriculation.validMatriculationData4(testUserId)
         initializeOperation(testUserId).approveTransaction(testUserId, "UC4.MatriculationData", "addMatriculationData", inputMatJSon)
+        initializeOperation(username).approveTransaction(testUserId, "UC4.MatriculationData", "addMatriculationData", inputMatJSon)
         matriculationConnection.addMatriculationData(inputMatJSon)
 
         // Log proposal
@@ -246,6 +248,7 @@ class UnsignedTransactionTests extends TestBase {
         val inputAdmissionJson = TestDataAdmission.validAdmission(testUserId, "C1", "MatriculationTestModule.1", "2020-12-31T23:59:59")
         val matriculationData = TestDataMatriculation.validMatriculationData4(testUserId)
         initializeOperation(testUserId).approveTransaction(testUserId, "UC4.MatriculationData", "addMatriculationData", matriculationData)
+        initializeOperation(username).approveTransaction(testUserId, "UC4.MatriculationData", "addMatriculationData", matriculationData)
         matriculationConnection.addMatriculationData(matriculationData)
 
         // Log proposal

diff --git a/src/test/scala/de/upb/cs/uc4/hyperledger/tests/general/UserManagementTests.scala b/src/test/scala/de/upb/cs/uc4/hyperledger/tests/general/UserManagementTests.scala
@@ -36,7 +36,8 @@ class UserManagementTests extends TestBase {
         val testData: String = TestDataMatriculation.validMatriculationData1(enrollmentID)
 
         // add approval as admin user
-        super.initializeOperation(username).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", testData)
+        initializeOperation(username).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", testData)
+        initializeOperation(enrollmentID).approveTransaction(username, "UC4.MatriculationData", "addMatriculationData", testData)
 
         // access chaincode as test user 301
         val matriculationConnectionUser = super.initializeMatriculation(enrollmentID)