@@ -3,16 +3,16 @@ package yara_x
33import (
44 "bytes"
55 "fmt"
6- "io/ioutil"
76 "os"
87 "testing"
98
109 "github.com/stretchr/testify/assert"
10+ "github.com/stretchr/testify/require"
1111)
1212
1313func TestNamespaces (t * testing.T ) {
1414 c , err := NewCompiler ()
15- assert .NoError (t , err )
15+ require .NoError (t , err )
1616
1717 c .NewNamespace ("foo" )
1818 c .AddSource ("rule test { condition: true }" )
@@ -26,7 +26,7 @@ func TestNamespaces(t *testing.T) {
2626
2727func TestGlobals (t * testing.T ) {
2828 c , err := NewCompiler ()
29- assert .NoError (t , err )
29+ require .NoError (t , err )
3030 x := map [string ]any {"a" : map [string ]any {"a" : "b" }, "b" : "d" }
3131 y := []any {"z" }
3232
@@ -54,7 +54,7 @@ func TestUnsupportedModules(t *testing.T) {
5454 rule test { condition: true }` ,
5555 IgnoreModule ("unsupported_module" ))
5656
57- assert .NoError (t , err )
57+ require .NoError (t , err )
5858 scanResults , _ := r .Scan ([]byte {})
5959 assert .Len (t , scanResults .MatchingRules (), 1 )
6060}
@@ -85,23 +85,23 @@ func TestDisabledIncludes(t *testing.T) {
8585}
8686
8787func TestIncludes (t * testing.T ) {
88- file , err := ioutil . TempFile ( "" , "prefix" )
89- assert .NoError (t , err )
88+ file , err := os . CreateTemp ( t . TempDir () , "prefix" )
89+ require .NoError (t , err )
9090
9191 defer os .Remove (file .Name ())
9292
9393 _ , err = Compile (
9494 fmt .Sprintf (`include "%s"` , file .Name ()),
9595 IncludeDir (os .TempDir ()))
9696
97- assert .NoError (t , err )
97+ require .NoError (t , err )
9898}
9999
100100func TestRelaxedReSyntax (t * testing.T ) {
101101 r , err := Compile (`
102102 rule test { strings: $a = /\Release/ condition: $a }` ,
103103 RelaxedReSyntax (true ))
104- assert .NoError (t , err )
104+ require .NoError (t , err )
105105 scanResults , _ := r .Scan ([]byte ("Release" ))
106106 assert .Len (t , scanResults .MatchingRules (), 1 )
107107}
@@ -110,7 +110,7 @@ func TestConditionOptimization(t *testing.T) {
110110 _ , err := Compile (`
111111 rule test { condition: true }` ,
112112 ConditionOptimization (true ))
113- assert .NoError (t , err )
113+ require .NoError (t , err )
114114}
115115
116116func TestErrorOnSlowPattern (t * testing.T ) {
@@ -129,14 +129,14 @@ func TestErrorOnSlowLoop(t *testing.T) {
129129
130130func TestSerialization (t * testing.T ) {
131131 r , err := Compile ("rule test { condition: true }" )
132- assert .NoError (t , err )
132+ require .NoError (t , err )
133133
134134 var buf bytes.Buffer
135135
136136 // Write rules into buffer
137137 n , err := r .WriteTo (& buf )
138138
139- assert .NoError (t , err )
139+ require .NoError (t , err )
140140 assert .Len (t , buf .Bytes (), int (n ))
141141
142142 // Read rules from buffer
@@ -157,7 +157,7 @@ func TestVariables(t *testing.T) {
157157 assert .Len (t , scanResults .MatchingRules (), 1 )
158158
159159 c , err := NewCompiler ()
160- assert .NoError (t , err )
160+ require .NoError (t , err )
161161
162162 c .DefineGlobal ("var" , 1234 )
163163 c .AddSource ("rule test { condition: var == 1234 }" )
@@ -177,7 +177,7 @@ func TestVariables(t *testing.T) {
177177 c .DefineGlobal ("var" , false )
178178 c .AddSource ("rule test { condition: var }" )
179179 scanResults , _ = NewScanner (c .Build ()).Scan ([]byte {})
180- assert .Len (t , scanResults .MatchingRules (), 0 )
180+ assert .Empty (t , scanResults .MatchingRules ())
181181
182182 c .DefineGlobal ("var" , "foo" )
183183 c .AddSource ("rule test { condition: var == \" foo\" }" )
@@ -207,26 +207,26 @@ func TestCompilerFeatures(t *testing.T) {
207207 rules := `import "test_proto2" rule test { condition: test_proto2.requires_foo_and_bar }`
208208
209209 _ , err := Compile (rules )
210- assert .EqualError (t , err , `error[E100]: foo is required
210+ require .EqualError (t , err , `error[E100]: foo is required
211211 --> line:1:57
212212 |
2132131 | import "test_proto2" rule test { condition: test_proto2.requires_foo_and_bar }
214214 | ^^^^^^^^^^^^^^^^^^^^ this field was used without foo` )
215215
216216 _ , err = Compile (rules , WithFeature ("foo" ))
217- assert .EqualError (t , err , `error[E100]: bar is required
217+ require .EqualError (t , err , `error[E100]: bar is required
218218 --> line:1:57
219219 |
2202201 | import "test_proto2" rule test { condition: test_proto2.requires_foo_and_bar }
221221 | ^^^^^^^^^^^^^^^^^^^^ this field was used without bar` )
222222
223223 _ , err = Compile (rules , WithFeature ("foo" ), WithFeature ("bar" ))
224- assert .NoError (t , err )
224+ require .NoError (t , err )
225225}
226226
227227func TestErrors (t * testing.T ) {
228228 c , err := NewCompiler ()
229- assert .NoError (t , err )
229+ require .NoError (t , err )
230230
231231 c .AddSource ("rule test_1 { condition: true }" )
232232 assert .Equal (t , []CompileError {}, c .Errors ())
@@ -291,13 +291,13 @@ func TestErrors(t *testing.T) {
291291
292292func TestRules (t * testing.T ) {
293293 c , err := NewCompiler ()
294- assert .NoError (t , err )
294+ require .NoError (t , err )
295295
296296 c .AddSource (`rule test_1 : tag1 tag2 {
297297 condition:
298298 true
299299 }` )
300- assert .NoError (t , err )
300+ require .NoError (t , err )
301301
302302 c .AddSource (`rule test_2 {
303303 meta:
@@ -308,7 +308,7 @@ func TestRules(t *testing.T) {
308308 condition:
309309 true
310310 }` )
311- assert .NoError (t , err )
311+ require .NoError (t , err )
312312
313313 rules := c .Build ()
314314 assert .Equal (t , 2 , rules .Count ())
@@ -324,7 +324,7 @@ func TestRules(t *testing.T) {
324324 assert .Equal (t , []string {"tag1" , "tag2" }, slice [0 ].Tags ())
325325 assert .Equal (t , []string {}, slice [1 ].Tags ())
326326
327- assert .Len (t , slice [0 ].Metadata (), 0 )
327+ assert .Empty (t , slice [0 ].Metadata ())
328328 assert .Len (t , slice [1 ].Metadata (), 4 )
329329
330330 assert .Equal (t , "foo" , slice [1 ].Metadata ()[0 ].Identifier ())
@@ -342,7 +342,7 @@ func TestRules(t *testing.T) {
342342
343343func TestImportsIter (t * testing.T ) {
344344 c , err := NewCompiler ()
345- assert .NoError (t , err )
345+ require .NoError (t , err )
346346
347347 c .AddSource (`
348348 import "pe"
@@ -351,7 +351,7 @@ func TestImportsIter(t *testing.T) {
351351 condition:
352352 true
353353 }` )
354- assert .NoError (t , err )
354+ require .NoError (t , err )
355355
356356 rules := c .Build ()
357357 imports := rules .Imports ()
@@ -363,7 +363,7 @@ func TestImportsIter(t *testing.T) {
363363
364364func TestWarnings (t * testing.T ) {
365365 c , err := NewCompiler ()
366- assert .NoError (t , err )
366+ require .NoError (t , err )
367367
368368 c .AddSource ("rule test { strings: $a = {01 [0-1][0-1] 02 } condition: $a }" )
369369
0 commit comments