Fix tests

JohnLCaron · Apr 16, 2024 · cc1a72b · cc1a72b
1 parent b1a2dbf
commit cc1a72b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/docs/CommandLineInterface.md b/docs/CommandLineInterface.md
@@ -237,7 +237,6 @@ Options:
     --device, -device -> voting device name (always required) { String }
     --ballotFilepath, -ballot -> Plaintext ballot filepath (or 'CLOSE') (always required) { String }
     --outputDir, -out -> Directory to write output election record (always required) { String }
-    --encryptBallotDir, -output -> Write encrypted ballot to this directory (always required) { String }
     --noDeviceNameInDir, -deviceDir [false] -> Dont add device name to encrypted ballots directory 
     --help, -h -> Usage info 
  

diff --git a/src/test/kotlin/org/cryptobiotic/eg/cli/RunEncryptBallotTest.kt b/src/test/kotlin/org/cryptobiotic/eg/cli/RunEncryptBallotTest.kt
@@ -21,7 +21,7 @@ class RunEncryptBallotTest {
         val inputDir = "src/test/data/encrypt/testBallotNoChain"
         val outputDir = "${Testing.testOut}/encrypt/testRunEncryptBadPlaintextBallot"
         val consumerIn = makeConsumer(inputDir)
-        val publisher = makePublisher(outputDir, true)
+        makePublisher(outputDir, true)
 
         val retval = RunEncryptBallot.encryptBallot(
             consumerIn,
@@ -77,7 +77,7 @@ class RunEncryptBallotTest {
             arrayOf(
                 "--inputDir", inputDir,
                 "--ballotFilepath", "$outputDir/pballot-$ballotId.json",
-                "--encryptBallotDir", outputDir,
+                "--outputDir", outputDir,
                 "-device", "device42",
             )
         )
@@ -114,7 +114,7 @@ class RunEncryptBallotTest {
                 arrayOf(
                     "--inputDir", inputDir,
                     "--ballotFilepath", ballotFilename,
-                    "--encryptBallotDir", outputDir,
+                    "--outputDir", outputDir,
                     "-device", device,
                     "--noDeviceNameInDir"
                 )
@@ -157,7 +157,7 @@ class RunEncryptBallotTest {
                 arrayOf(
                     "--inputDir", inputDir,
                     "--ballotFilepath", ballotFilename,
-                    "--encryptBallotDir", outputDir,
+                    "--outputDir", outputDir,
                     "-device", device,
                 )
             )
@@ -173,7 +173,7 @@ class RunEncryptBallotTest {
             arrayOf(
                 "--inputDir", inputDir,
                 "--ballotFilepath", "CLOSE",
-                "--encryptBallotDir", outputDir,
+                "--outputDir", outputDir,
                 "-device", device,
             )
         )
@@ -207,7 +207,7 @@ class RunEncryptBallotTest {
                 arrayOf(
                     "--inputDir", inputDir,
                     "--ballotFilepath", ballotFilename,
-                    "--encryptBallotDir", outputDir,
+                    "--outputDir", outputDir,
                     "-device", device,
                 )
             )

diff --git a/src/test/kotlin/org/cryptobiotic/eg/cli/RunExampleEncryptionTest.kt b/src/test/kotlin/org/cryptobiotic/eg/cli/RunExampleEncryptionTest.kt
@@ -20,7 +20,7 @@ class RunExampleEncryptionTest {
                     "--inputDir", inputDir,
                     "--nballots", nballots.toString(),
                     "--plaintextBallotDir", "$outputDir/plaintext",
-                    "--encryptBallotDir", outputDir,
+                    "--outputDir", outputDir,
                     "-device", "device42,device11",
                 )
             )
@@ -43,7 +43,7 @@ class RunExampleEncryptionTest {
                 "--nballots", nballots.toString(),
                 "--plaintextBallotDir", "$outputDir/plaintext",
                 "-device", "device42,device11",
-                "--encryptBallotDir", "$outputDir",
+                "--outputDir", "$outputDir",
                 "--noDeviceNameInDir",
             )
         )