tests: update unit tests

.gitignore

@@ -1,8 +1,4 @@
 /minivpn
-/vpnping
-/obfs4vpn
-/geturl
-/ndt7
 .vscode
 *.swp
 *.swo
@@ -11,3 +7,4 @@
 /*.out
 data/*
 measurements/*
+coverage/*

Makefile

@@ -3,7 +3,7 @@ TARGET ?= "1.1.1.1"
 COUNT ?= 5
 TIMEOUT ?= 10
 LOCAL_TARGET := $(shell ip -4 addr show docker0 | grep 'inet ' | awk '{print $$2}' | cut -f 1 -d /)
-COVERAGE_THRESHOLD := 80
+COVERAGE_THRESHOLD := 75
 FLAGS=-ldflags="-w -s -buildid=none -linkmode=external" -buildmode=pie -buildvcs=false
 
 build:
@@ -30,11 +30,19 @@ bootstrap:
 test:
 	GOFLAGS='-count=1' go test -v ./...
 
-test-coverage:
-	go test -coverprofile=coverage.out ./vpn
+test-unit:
+	mkdir -p ./coverage/unit
+	go test -cover ./internal/... -args -test.gocoverdir="`pwd`/coverage/unit"
+
+test-integration:
+	cd tests/integration && ./wrap_integration_cover.sh
 
-test-coverage-refactor:
-	go test -coverprofile=coverage.out ./internal/...
+test-combined-coverage:
+	go tool covdata percent -i=./coverage/unit,./coverage/int
+	# convert to text profile and exclude extras/integration test itself
+	go tool covdata textfmt -i=./coverage/unit,./coverage/int -o coverage/profile
+	cat coverage/profile| grep -v "extras/ping" | grep -v "tests/integration" > coverage/profile.out
+	scripts/go-coverage-check.sh ./coverage/profile.out ${COVERAGE_THRESHOLD}
 
 test-coverage-threshold:
 	go test --short -coverprofile=cov-threshold.out ./vpn

cmd/minivpn/main.go

@@ -96,7 +96,7 @@ func main() {
 	ctx := context.Background()
 
 	proto := config.Remote().Protocol
-	addr := config.Remote().AddrPort
+	addr := config.Remote().Endpoint
 
 	conn, err := dialer.DialContext(ctx, proto, addr)
 	if err != nil {

internal/bytesx/bytesx.go

@@ -35,7 +35,7 @@
 	ErrUnpaddingPKCS7 = errors.New("PKCS#7 unpadding error")
 )
 
 // genRandomBytes returns an array of bytes with the given size using
 // a CSRNG, on success, or an error, in case of failure.
 func GenRandomBytes(size int) ([]byte, error) {
 	b := make([]byte, size)
@@ -140,6 +140,8 @@
 
 // WriteUint32 is a convenience function that appends to the given buffer
 // 4 bytes containing the big-endian representation of the given uint32 value.
+// Caller is responsible to ensure the passed value does not overflow the
+// maximal capacity of 4 bytes.
 func WriteUint32(buf *bytes.Buffer, val uint32) {
 	var numBuf [4]byte
 	binary.BigEndian.PutUint32(numBuf[:], val)