fix test

Konstantin8105 · May 30, 2024 · 9963ca3 · 9963ca3
1 parent 8dda4c4
commit 9963ca3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -1,10 +1,6 @@
 name: Go
 
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
+on: [push, pull_request]
 
 jobs:
 

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -20,8 +20,8 @@ mkdir -p ./testdata/
 # github.com/Konstantin8105/c4go/version
 
 # Package list
-# export PKGS=$(go list -e ./... | grep -v testdata | grep -v examples | grep -v tests | grep -v vendor | tr '\n' ' ')
-export PKGS="github.com/Konstantin8105/c4go github.com/Konstantin8105/c4go/types"
+export PKGS=$(go list -e ./... | grep -v testdata | grep -v examples | grep -v tests | grep -v vendor | tr '\n' ' ')
+# export PKGS="github.com/Konstantin8105/c4go github.com/Konstantin8105/c4go/util"
 
 # View
 echo "PKGS       : $PKGS"

diff --git a/util/util.go b/util/util.go
@@ -87,10 +87,10 @@ func IsLastArray(s string) bool {
 // ParseFunction - parsing elements of C function
 func ParseFunction(s string) (prefix string, funcname string, f []string, r []string, err error) {
 	defer func() {
-		if len(f) == 1 && f[0] == "void" {
-			f = nil
-		}
-
+		// fix bug in tests:
+		// if len(f) == 1 && f[0] == "void" {
+		// 	f = nil
+		// }
 		if err != nil {
 			err = fmt.Errorf("cannot parse function '%s' : %v", s, err)
 		} else {

diff --git a/util/util_test.go b/util/util_test.go
@@ -275,19 +275,19 @@ func TestResolveFunction(t *testing.T) {
 			if len(actualField) != len(tc.fields) {
 				a, _ := json.Marshal(actualField)
 				f, _ := json.Marshal(tc.fields)
-				t.Errorf("Size of field is not same.\nActual  : %s\nExpected: %s\n",
-					string(a),
-					string(f))
-				return
-			}
-			if len(actualField) != len(tc.fields) {
-				a, _ := json.Marshal(actualField)
-				f, _ := json.Marshal(tc.fields)
-				t.Errorf("Size of field is not same.\nActual  : %s\nExpected: %s\n",
+				t.Errorf("Size of field is not same.\nActual  : `%s`\nExpected: `%s`\n",
 					string(a),
 					string(f))
 				return
 			}
+			// if len(actualField) != len(tc.fields) {
+			// 	a, _ := json.Marshal(actualField)
+			// 	f, _ := json.Marshal(tc.fields)
+			// 	t.Errorf("Size of field is not same.\nActual  : `%s`\nExpected: `%s`\n",
+			// 		string(a),
+			// 		string(f))
+			// 	return
+			// }
 			for i := range actualField {
 				actualField[i] = strings.Replace(actualField[i], " ", "", -1)
 				tc.fields[i] = strings.Replace(tc.fields[i], " ", "", -1)