test-real: Modify the test.sh script to use shUnit2 framework

Signed-off-by: Zamir SUN <[email protected]>

Author: sztsian

.gitmodules

@@ -7,3 +7,6 @@
 [submodule "tinycbor"]
 	path = tinycbor
 	url = https://github.com/intel/tinycbor.git
+[submodule "test-real/shunit2"]
+	path = test-real/shunit2
+	url = https://github.com/kward/shunit2.git

test-real/test.sh

@@ -2,53 +2,66 @@
 export LANGUAGE=en_US
 export LANG=en_US.UTF8
 export GNUPGHOME="$(pwd)/temp_gnupg"
-rm -rf "$GNUPGHOME"
-mkdir -p "$GNUPGHOME"
-chmod 700 "$GNUPGHOME"
-cp pinentry-mock "$GNUPGHOME/"
-echo "pinentry-program $(pwd)/pinentry-mock" > "${GNUPGHOME}/gpg-agent.conf"
-echo "debug 1031" >> "${GNUPGHOME}/gpg-agent.conf"
-echo "debug-level 8" >> "${GNUPGHOME}/gpg-agent.conf"
-echo "log-file /tmp/canokey-test-gpg-agent.log" >> "${GNUPGHOME}/gpg-agent.conf"
-echo "debug 6145" > "${GNUPGHOME}/scdaemon.conf"
-echo "log-file /tmp/canokey-test-scd.log" >> "${GNUPGHOME}/scdaemon.conf"
-gpg --list-keys
-
-set -e
-set -x
 GPG="gpg --command-fd 0 --yes --expert"
+kEYID=""
+
+oneTimeSetUp(){
+    gpg --version
+    rm -rf "$GNUPGHOME"
+    mkdir -p "$GNUPGHOME"
+    chmod 700 "$GNUPGHOME"
+    cp pinentry-mock "$GNUPGHOME/"
+    echo "pinentry-program $(pwd)/pinentry-mock" > "${GNUPGHOME}/gpg-agent.conf"
+    echo "debug 1031" >> "${GNUPGHOME}/gpg-agent.conf"
+    echo "debug-level 8" >> "${GNUPGHOME}/gpg-agent.conf"
+    echo "log-file /tmp/canokey-test-gpg-agent.log" >> "${GNUPGHOME}/gpg-agent.conf"
+    echo "debug 6145" > "${GNUPGHOME}/scdaemon.conf"
+    echo "log-file /tmp/canokey-test-scd.log" >> "${GNUPGHOME}/scdaemon.conf"
+    gpg --list-keys
+    # begin testing
+    killall gpg-agent || true
+    echo -e 'Key-Type: 1\nKey-Length: 2048\nSubkey-Type: 1\nSubkey-Length: 2048\nName-Real: Someone\nName-Email: [email protected]\nPassphrase: 12345678\n%commit\n%echo done' | gpg --batch --gen-key -v
+    export KEYID=$(gpg -K --with-colons |egrep '^sec'|egrep -o '\w{16}')
+    echo 'Key Id is:' $KEYID
+}
 
 # utility functions
 
 # generate key in gpg
 Addkey() {
     echo -e "addkey\n$1\n$2\n0\nsave" | $GPG --edit-key $KEYID; 
+    assertEquals 'Addkey failed' 0 $?
 }
 
 # generate key in card
 Addcardkey() {
     echo -e "addcardkey\n$1\n0\nsave\n" | $GPG --edit-key $KEYID;
+    assertEquals 'Addcardkey failed' 0 $?
 }
 
 # move key from gpg to card
 Key2card() { 
     echo -e "key $1\nkeytocard\n$2\nsave" | $GPG --edit-key $KEYID;
+    assertEquals 'Key2card failed' 0 $?
     gpg --card-status; 
 }
 
 # reset card
 GPGReset() {
     echo -e 'admin\nfactory-reset\ny\nyes' | $GPG --edit-card;
+    assertEquals 'GPG reset failed' 0 $?
 }
 
 # test signing
 GPGSign() { 
     date -Iseconds | gpg --armor --default-key $(gpg -K --with-colons|awk -F: '$1~/ssb/ && $12~/s|a/ {print $5}'|tail -n 1)! -s|gpg; 
+    assertEquals 'GPG sign failed' 0 $?
 }
 
 # test encryption
 GPGEnc()  {
     date -Iseconds | gpg --yes --armor --recipient $(gpg -K --with-colons | awk -F: '$1~/ssb/ && $12~/e/ {print $5}'|tail -n 1) --encrypt|gpg; 
+    assertEquals 'GPG encrypt failed' 0 $?
 }
 
 GenerateKey() {
@@ -61,13 +74,7 @@ GenerateKey() {
 }
 
 
-# begin testing
-killall gpg-agent || true
-echo -e 'Key-Type: 1\nKey-Length: 2048\nSubkey-Type: 1\nSubkey-Length: 2048\nName-Real: Someone\nName-Email: [email protected]\nPassphrase: 12345678\n%commit\n%echo done' | gpg --batch --gen-key -v
-KEYID=$(gpg -K --with-colons |egrep '^sec'|egrep -o '\w{16}')
-echo 'Key Id is:' $KEYID
-
-TestImport() {
+test_ImportP256() {
     # import ecc p-256 keys
     GPGReset
     Addkey 10 3 # Key 2 gen ECDSA P-256
@@ -78,7 +85,8 @@ TestImport() {
     Key2card 4 3 # Key 4 to Authentication
     GPGSign
     GPGEnc
-
+}
+test_ImportRsa2048(){
     # import rsa2048 keys
     GPGReset
     Addkey 4 2048 # Key 5 gen RSA2048
@@ -89,6 +97,8 @@ TestImport() {
     Key2card 7 3 # Key 7 to Authentication
     GPGSign
     GPGEnc
+}
+test_Import25519(){
 
     # import 25519 keys
     GPGReset
@@ -98,8 +108,12 @@ TestImport() {
     Key2card 9 2 # Key 9 to Encryption
     Addkey 10 1 # Key 10 gen ed25519
     Key2card 10 3 # Key 10 to Authentication
-    # GPGSign
+    startSkipping
+    GPGSign
+    endSkipping
     GPGEnc
+}
+test_ImportP384(){
 
     # import ecc p-384 keys
     GPGReset
@@ -111,6 +125,8 @@ TestImport() {
     Key2card 13 3 # Key 13 to Authentication
     GPGSign
     GPGEnc
+}
+test_ImportSecp256k1(){
 
     # import ecc secp256k1 keys
     GPGReset
@@ -122,6 +138,8 @@ TestImport() {
     Key2card 16 3 # Key 16 to Authentication
     GPGSign
     GPGEnc
+}
+test_ImportRsa4096(){
 
     # import rsa4096 keys
     GPGReset
@@ -135,44 +153,35 @@ TestImport() {
     GPGEnc
 }
 
-TestGenerateRsa2048() {
+test_GenerateRsa2048() {
     # generate rsa2048 keys
     GenerateKey 1 2048
 }
 
-TestGenerateRsa4096() {
+#test_GenerateRsa4096() {
     # generate rsa4096 keys
-    GenerateKey 1 4096
-}
+#    startSkipping
+#    GenerateKey 1 4096
+#}
 
-TestGenerate25519() {
+test_Generate25519() {
     # generate 25519 keys
     GenerateKey 2 1
 }
 
-TestGenerateP256() {
+test_GenerateP256() {
     # generate p-256 keys
     GenerateKey 2 3
 }
 
-TestGenerateP384() {
+test_GenerateP384() {
     # generate p-384 keys
     GenerateKey 2 4
 }
 
-TestGenerateSecp256K1() {
+test_GenerateSecp256K1() {
     # generate secp256k1 keys
     GenerateKey 2 9
 }
 
-TestGenerate() {
-    TestGenerateRsa2048
-    # TestGenerateRsa4096
-    TestGenerate25519
-    TestGenerateP256
-    TestGenerateP384
-    TestGenerateSecp256K1
-}
-
-TestImport
-TestGenerate
+. ./shunit2/shunit2