daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: use testutil

Browse Source 
Squashed commit of the following:

commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Oct 21 21:13:06 2021 +0300

    all: fix windows tests

commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Oct 21 20:23:55 2021 +0300

    all: imp code

commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Oct 21 19:43:32 2021 +0300

    all: imp testing

commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Oct 21 18:53:51 2021 +0300

    all: use testutil
This commit is contained in:
Eugene Burkov
2021-10-22 11:58:18 +03:00
parent 7804d97743
commit ea8950a80d
29 changed files with 211 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
internal/querylog/decode_test.go
View File

@@ -14,6 +14,7 @@ import (
"github.com/AdguardTeam/urlfilter/rules"
"github.com/miekg/dns"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestDecodeLogEntry(t *testing.T) {
@@ -45,7 +46,7 @@ func TestDecodeLogEntry(t *testing.T) {
`"Elapsed":837429}`
ans, err := base64.StdEncoding.DecodeString(ansStr)
assert.Nil(t, err)
require.NoError(t, err)
want := &logEntry{
IP: net.IPv4(127, 0, 0, 1),

12
internal/querylog/qlog_test.go
View File

@@ -35,13 +35,13 @@ func TestQueryLog(t *testing.T) {
// Add disk entries.
addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
// Write to disk (first file).
require.Nil(t, l.flushLogBuffer(true))
require.NoError(t, l.flushLogBuffer(true))
// Start writing to the second file.
require.Nil(t, l.rotate())
require.NoError(t, l.rotate())
// Add disk entries.
addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
// Write to disk.
require.Nil(t, l.flushLogBuffer(true))
require.NoError(t, l.flushLogBuffer(true))
// Add memory entries.
addEntry(l, "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3))
addEntry(l, "example.com", net.IPv4(1, 1, 1, 4), net.IPv4(2, 2, 2, 4))
@@ -144,7 +144,7 @@ func TestQueryLogOffsetLimit(t *testing.T) {
addEntry(l, secondPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
}
// Write them to the first file.
require.Nil(t, l.flushLogBuffer(true))
require.NoError(t, l.flushLogBuffer(true))
// Add more to the in-memory part of log.
for i := 0; i < entNum; i++ {
addEntry(l, firstPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
@@ -215,7 +215,7 @@ func TestQueryLogMaxFileScanEntries(t *testing.T) {
addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
}
// Write them to disk.
require.Nil(t, l.flushLogBuffer(true))
require.NoError(t, l.flushLogBuffer(true))
params := newSearchParams()
@@ -300,7 +300,7 @@ func assertLogEntry(t *testing.T, entry *logEntry, host string, answer, client n
assert.Equal(t, "IN", entry.QClass)
msg := &dns.Msg{}
require.Nil(t, msg.Unpack(entry.Answer))
require.NoError(t, msg.Unpack(entry.Answer))
require.Len(t, msg.Answer, 1)
ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]).To16()

43
internal/querylog/qlogfile_test.go
View File

@@ -12,6 +12,7 @@ import (
"time"
"github.com/AdguardTeam/golibs/errors"
"github.com/AdguardTeam/golibs/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -80,11 +81,10 @@ func newTestQLogFile(t *testing.T, linesNum int) (file *QLogFile) {
// Create the new QLogFile instance.
file, err := NewQLogFile(testFile)
require.Nil(t, err)
require.NoError(t, err)
assert.NotNil(t, file)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
testutil.CleanupAndRequireSuccess(t, file.Close)
return file
}
@@ -107,7 +107,7 @@ func TestQLogFile_ReadNext(t *testing.T) {
// Calculate the expected position.
fileInfo, err := q.file.Stat()
require.Nil(t, err)
require.NoError(t, err)
var expPos int64
if expPos = fileInfo.Size(); expPos > 0 {
expPos--
@@ -115,7 +115,7 @@ func TestQLogFile_ReadNext(t *testing.T) {
// Seek to the start.
pos, err := q.SeekStart()
require.Nil(t, err)
require.NoError(t, err)
require.EqualValues(t, expPos, pos)
var read int
@@ -170,17 +170,17 @@ func TestQLogFile_SeekTS_good(t *testing.T) {
for _, tc := range testCases {
t.Run(l.name+"_"+tc.name, func(t *testing.T) {
line, err := getQLogFileLine(q, tc.line)
require.Nil(t, err)
require.NoError(t, err)
ts := readQLogTimestamp(line)
assert.NotEqualValues(t, 0, ts)
// Try seeking to that line now.
pos, _, err := q.SeekTS(ts)
require.Nil(t, err)
require.NoError(t, err)
assert.NotEqualValues(t, 0, pos)
testLine, err := q.ReadNext()
require.Nil(t, err)
require.NoError(t, err)
assert.Equal(t, line, testLine)
})
}
@@ -220,7 +220,7 @@ func TestQLogFile_SeekTS_bad(t *testing.T) {
testCases[1].ts = lateTS.UnixNano()
line, err := getQLogFileLine(q, l.num/2)
require.Nil(t, err)
require.NoError(t, err)
testCases[2].ts = readQLogTimestamp(line) - 1
for _, tc := range testCases {
@@ -230,7 +230,8 @@ func TestQLogFile_SeekTS_bad(t *testing.T) {
var depth int
_, depth, err = q.SeekTS(tc.ts)
assert.NotEmpty(t, l.num)
require.NotNil(t, err)
require.Error(t, err)
if tc.leq {
assert.LessOrEqual(t, depth, int(math.Log2(float64(l.num))+3))
}
@@ -260,19 +261,19 @@ func TestQLogFile(t *testing.T) {
// Seek to the start.
pos, err := q.SeekStart()
require.Nil(t, err)
require.NoError(t, err)
assert.Greater(t, pos, int64(0))
// Read first line.
line, err := q.ReadNext()
require.Nil(t, err)
require.NoError(t, err)
assert.Contains(t, line, "0.0.0.2")
assert.True(t, strings.HasPrefix(line, "{"), line)
assert.True(t, strings.HasSuffix(line, "}"), line)
// Read second line.
line, err = q.ReadNext()
require.Nil(t, err)
require.NoError(t, err)
assert.EqualValues(t, 0, q.position)
assert.Contains(t, line, "0.0.0.1")
assert.True(t, strings.HasPrefix(line, "{"), line)
@@ -286,19 +287,15 @@ func TestQLogFile(t *testing.T) {
func NewTestQLogFileData(t *testing.T, data string) (file *QLogFile) {
f, err := os.CreateTemp(t.TempDir(), "*.txt")
require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close)
_, err = f.WriteString(data)
require.Nil(t, err)
require.NoError(t, err)
file, err = NewQLogFile(f.Name())
require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close)
return file
}

15
internal/querylog/qlogreader_test.go
View File

@@ -5,6 +5,7 @@ import (
"testing"
"time"
"github.com/AdguardTeam/golibs/testutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
@@ -18,12 +19,10 @@ func newTestQLogReader(t *testing.T, filesNum, linesNum int) (reader *QLogReader
// Create the new QLogReader instance.
reader, err := NewQLogReader(testFiles)
require.Nil(t, err)
require.NoError(t, err)
assert.NotNil(t, reader)
t.Cleanup(func() {
assert.Nil(t, reader.Close())
})
testutil.CleanupAndRequireSuccess(t, reader.Close)
return reader
}
@@ -53,7 +52,7 @@ func TestQLogReader(t *testing.T) {
// Seek to the start.
err := r.SeekStart()
require.Nil(t, err)
require.NoError(t, err)
// Read everything.
var read int
@@ -112,7 +111,7 @@ func TestQLogReader_Seek(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
ts, err := time.Parse(time.RFC3339Nano, tc.time)
require.Nil(t, err)
require.NoError(t, err)
err = r.SeekTS(ts.UnixNano())
assert.ErrorIs(t, err, tc.want)
@@ -142,11 +141,11 @@ func TestQLogReader_ReadNext(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
err := r.SeekStart()
require.Nil(t, err)
require.NoError(t, err)
for i := 1; i < tc.start; i++ {
_, err = r.ReadNext()
require.Nil(t, err)
require.NoError(t, err)
}
_, err = r.ReadNext()