[chore] [pdata] Add test coverage for slices Sort method (open-teleme…

…try#7115)
animetauren · Feb 4, 2023 · 0f6a174 · 0f6a174
1 parent 16c851d
commit 0f6a174
Show file tree

Hide file tree

Showing 20 changed files with 294 additions and 1 deletion.
diff --git a/pdata/internal/cmd/pdatagen/internal/base_slices.go b/pdata/internal/cmd/pdatagen/internal/base_slices.go
@@ -240,6 +240,23 @@ func (es ${structName}) Sort(less func(a, b ${elementName}) bool) {
 	sort.SliceStable(*es.orig, func(i, j int) bool { return less(es.At(i), es.At(j)) })
 }`
 
+// TODO: Use assert.Less once https://github.com/stretchr/testify/pull/1339 is merged.
+const slicePtrTestTemplate = `func Test${structName}_Sort(t *testing.T) {
+	es := generateTest${structName}()
+	es.Sort(func(a, b ${elementName}) bool {
+		return uintptr(unsafe.Pointer(a.orig)) < uintptr(unsafe.Pointer(b.orig))
+	})
+	for i := 1; i < es.Len(); i++ {
+		assert.True(t, uintptr(unsafe.Pointer(es.At(i-1).orig)) < uintptr(unsafe.Pointer(es.At(i).orig)))
+	}
+	es.Sort(func(a, b ${elementName}) bool {
+		return uintptr(unsafe.Pointer(a.orig)) > uintptr(unsafe.Pointer(b.orig))
+	})
+	for i := 1; i < es.Len(); i++ {
+		assert.True(t, uintptr(unsafe.Pointer(es.At(i-1).orig)) > uintptr(unsafe.Pointer(es.At(i).orig)))
+	}
+}`
+
 const sliceValueTemplate = `// CopyTo copies all elements from the current slice overriding the destination.
 func (es ${structName}) CopyTo(dest ${structName}) {
 	srcLen := es.Len()
@@ -295,7 +312,8 @@ func (ss *sliceOfPtrs) generateStruct(sb *bytes.Buffer) {
 }
 
 func (ss *sliceOfPtrs) generateTests(sb *bytes.Buffer) {
-	sb.WriteString(os.Expand(commonSliceTestTemplate, ss.templateFields()))
+	sb.WriteString(os.Expand(commonSliceTestTemplate, ss.templateFields()) + newLine + newLine)
+	sb.WriteString(os.Expand(slicePtrTestTemplate, ss.templateFields()))
 }
 
 func (ss *sliceOfPtrs) generateTestValueHelpers(sb *bytes.Buffer) {

diff --git a/pdata/internal/cmd/pdatagen/internal/plog_package.go b/pdata/internal/cmd/pdatagen/internal/plog_package.go
@@ -27,6 +27,7 @@ var plog = &Package{
 	},
 	testImports: []string{
 		`"testing"`,
+		`"unsafe"`,
 		``,
 		`"github.com/stretchr/testify/assert"`,
 		``,

diff --git a/pdata/internal/cmd/pdatagen/internal/pmetric_package.go b/pdata/internal/cmd/pdatagen/internal/pmetric_package.go
@@ -27,6 +27,7 @@ var pmetric = &Package{
 	},
 	testImports: []string{
 		`"testing"`,
+		`"unsafe"`,
 		``,
 		`"github.com/stretchr/testify/assert"`,
 		``,

diff --git a/pdata/internal/cmd/pdatagen/internal/ptrace_package.go b/pdata/internal/cmd/pdatagen/internal/ptrace_package.go
@@ -27,6 +27,7 @@ var ptrace = &Package{
 	},
 	testImports: []string{
 		`"testing"`,
+		`"unsafe"`,
 		``,
 		`"github.com/stretchr/testify/assert"`,
 		``,

diff --git a/pdata/plog/generated_logrecordslice_test.go b/pdata/plog/generated_logrecordslice_test.go
diff --git a/pdata/plog/generated_resourcelogsslice_test.go b/pdata/plog/generated_resourcelogsslice_test.go
diff --git a/pdata/plog/generated_scopelogsslice_test.go b/pdata/plog/generated_scopelogsslice_test.go
diff --git a/pdata/pmetric/generated_exponentialhistogramdatapointslice_test.go b/pdata/pmetric/generated_exponentialhistogramdatapointslice_test.go
diff --git a/pdata/pmetric/generated_histogramdatapointslice_test.go b/pdata/pmetric/generated_histogramdatapointslice_test.go
diff --git a/pdata/pmetric/generated_metricslice_test.go b/pdata/pmetric/generated_metricslice_test.go
diff --git a/pdata/pmetric/generated_numberdatapointslice_test.go b/pdata/pmetric/generated_numberdatapointslice_test.go
diff --git a/pdata/pmetric/generated_resourcemetricsslice_test.go b/pdata/pmetric/generated_resourcemetricsslice_test.go
diff --git a/pdata/pmetric/generated_scopemetricsslice_test.go b/pdata/pmetric/generated_scopemetricsslice_test.go
diff --git a/pdata/pmetric/generated_summarydatapointslice_test.go b/pdata/pmetric/generated_summarydatapointslice_test.go
diff --git a/pdata/pmetric/generated_summarydatapointvalueatquantileslice_test.go b/pdata/pmetric/generated_summarydatapointvalueatquantileslice_test.go