Merge pull request #25 from dailymotion/test_name_fix

Implemented a fix for test name and full name specification.
dailymotion · Feb 27, 2020 · 656b250 · 656b250
2 parents 9994694 + 3bf2bd5
commit 656b250
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/result.go b/result.go
@@ -78,6 +78,10 @@ func (r *result) addStep(step stepObject) {
 	r.Steps = append(r.Steps, step)
 }
 
+func (r *result) addFullName(FullName string) {
+	r.FullName = FullName
+}
+
 func (r *result) setStatus(status string) {
 	r.Status = status
 }
@@ -111,6 +115,11 @@ func (r *result) setDefaultLabels(t *testing.T) {
 	r.addLabel("package", testPackage)
 	r.addLabel("testClass", testPackage)
 	r.addLabel("testMethod", t.Name())
+	if len(wsd) == 0 {
+		r.addFullName(fmt.Sprintf("%s:%s", testFile, t.Name()))
+	} else {
+		r.addFullName(fmt.Sprintf("%s:%s", strings.TrimPrefix(testFile, wsd+"/"), t.Name()))
+	}
 	if hostname, err := os.Hostname(); err == nil {
 		r.addLabel("host", hostname)
 	}

diff --git a/test.go b/test.go
@@ -33,8 +33,7 @@ func Test(t *testing.T, testOptions ...Option) {
 	r = newResult()
 	r.UUID = generateUUID()
 	r.Start = getTimestampMs()
-	r.Name = t.Name()
-	r.FullName = strings.Join(camelcase.Split(t.Name()), " ")
+	r.Name = strings.Join(camelcase.Split(t.Name())[1:], " ")
 	r.Description = t.Name()
 	r.setDefaultLabels(t)
 	r.Steps = make([]stepObject, 0)