Merging upstream version 2.0.3+dfsg:

- does not include dygraphs anymore (Closes: #923993)
- does not include pako anymore (Closes: #1042533)
- does not include dashboard binaries anymore (Closes: #1045145)

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 100 insertions, 0 deletions

diff --git a/src/go/pkg/matcher/expr_test.go b/src/go/pkg/matcher/expr_test.go
new file mode 100644
index 000000000..93a183226
--- /dev/null
+++ b/src/go/pkg/matcher/expr_test.go
@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+package matcher
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSimpleExpr_none(t *testing.T) {
+	expr := &SimpleExpr{}
+
+	m, err := expr.Parse()
+	assert.EqualError(t, err, ErrEmptyExpr.Error())
+	assert.Nil(t, m)
+}
+
+func TestSimpleExpr_include(t *testing.T) {
+	expr := &SimpleExpr{
+		Includes: []string{
+			"~ /api/",
+			"~ .php$",
+		},
+	}
+
+	m, err := expr.Parse()
+	assert.NoError(t, err)
+
+	assert.True(t, m.MatchString("/api/a.php"))
+	assert.True(t, m.MatchString("/api/a.php2"))
+	assert.True(t, m.MatchString("/api2/a.php"))
+	assert.True(t, m.MatchString("/api/img.php"))
+	assert.False(t, m.MatchString("/api2/img.php2"))
+}
+
+func TestSimpleExpr_exclude(t *testing.T) {
+	expr := &SimpleExpr{
+		Excludes: []string{
+			"~ /api/img",
+		},
+	}
+
+	m, err := expr.Parse()
+	assert.NoError(t, err)
+
+	assert.True(t, m.MatchString("/api/a.php"))
+	assert.True(t, m.MatchString("/api/a.php2"))
+	assert.True(t, m.MatchString("/api2/a.php"))
+	assert.False(t, m.MatchString("/api/img.php"))
+	assert.True(t, m.MatchString("/api2/img.php2"))
+}
+
+func TestSimpleExpr_both(t *testing.T) {
+	expr := &SimpleExpr{
+		Includes: []string{
+			"~ /api/",
+			"~ .php$",
+		},
+		Excludes: []string{
+			"~ /api/img",
+		},
+	}
+
+	m, err := expr.Parse()
+	assert.NoError(t, err)
+
+	assert.True(t, m.MatchString("/api/a.php"))
+	assert.True(t, m.MatchString("/api/a.php2"))
+	assert.True(t, m.MatchString("/api2/a.php"))
+	assert.False(t, m.MatchString("/api/img.php"))
+	assert.False(t, m.MatchString("/api2/img.php2"))
+}
+
+func TestSimpleExpr_Parse_NG(t *testing.T) {
+	{
+		expr := &SimpleExpr{
+			Includes: []string{
+				"~ (ab",
+				"~ .php$",
+			},
+		}
+
+		m, err := expr.Parse()
+		assert.Error(t, err)
+		assert.Nil(t, m)
+	}
+	{
+		expr := &SimpleExpr{
+			Excludes: []string{
+				"~ (ab",
+				"~ .php$",
+			},
+		}
+
+		m, err := expr.Parse()
+		assert.Error(t, err)
+		assert.Nil(t, m)
+	}
+}