fwk: fix references to pkg testdata

( cd fwk; find . -name '*.go' -exec grep -Hq 'fwk/testdata' '{}' \; -print | xargs sed -i '' -e 's!fwk/testdata!fwk/internal/fwktest!' -e 's!testdata\.!fwktest.!' -e 's!some tools defined in testdata!some tools defined in fwktest!' )
go-hep · May 10, 2022 · d4ec96b · d4ec96b
1 parent c04eef8
commit d4ec96b
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 75 deletions.
diff --git a/fwk/dflow_test.go b/fwk/dflow_test.go
@@ -20,7 +20,7 @@ func TestDFlowSvcGraph(t *testing.T) {
 	})
 
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task1",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task1",
 		Name: "t0",
 		Props: job.P{
 			"Ints1": "t0-ints1",
@@ -29,7 +29,7 @@ func TestDFlowSvcGraph(t *testing.T) {
 	})
 
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task1",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task1",
 		Name: "t1",
 		Props: job.P{
 			"Ints1": "t1-ints1",
@@ -38,7 +38,7 @@ func TestDFlowSvcGraph(t *testing.T) {
 	})
 
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task2",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task2",
 		Name: "t2",
 		Props: job.P{
 			"Input":  "t1-ints1",
@@ -47,7 +47,7 @@ func TestDFlowSvcGraph(t *testing.T) {
 	})
 
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.svc1",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.svc1",
 		Name: "svc1",
 	})
 

diff --git a/fwk/examples/fwk-ex-tuto-1/main.go b/fwk/examples/fwk-ex-tuto-1/main.go
@@ -16,7 +16,7 @@ import (
 	// side-effect import 'testdata'.
 	// merely importing it will register the components defined in this package
 	// with the fwk components' factory.
-	_ "go-hep.org/x/hep/fwk/testdata"
+	_ "go-hep.org/x/hep/fwk/internal/fwktest"
 )
 
 var (
@@ -55,7 +55,7 @@ options:
 	// create a task that reads integers from some location
 	// and publish the square of these integers under some other location
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task2",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task2",
 		Name: "t2",
 		Props: job.P{
 			"Input":  "t1-ints1",
@@ -67,7 +67,7 @@ options:
 	// note we create it after the one that consumes these integers
 	// to exercize the automatic data-flow scheduling.
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task1",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task1",
 		Name: "t1",
 		Props: job.P{
 			"Ints1": "t1-ints1",

diff --git a/fwk/examples/fwk-ex-tuto-2/main.go b/fwk/examples/fwk-ex-tuto-2/main.go
@@ -16,9 +16,9 @@ import (
 	// job is the scripting interface to 'fwk'
 	"go-hep.org/x/hep/fwk/job"
 
-	// we need to access some tools defined in testdata (the ascii InputStream)
+	// we need to access some tools defined in fwktest (the ascii InputStream)
 	// so we need to directly import that package
-	"go-hep.org/x/hep/fwk/testdata"
+	"go-hep.org/x/hep/fwk/internal/fwktest"
 )
 
 var (
@@ -69,7 +69,7 @@ options:
 	// create a task that reads integers from some location
 	// and publish the square of these integers under some other location
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task2",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task2",
 		Name: "t2",
 		Props: job.P{
 			"Input":  "t1-ints1",
@@ -90,7 +90,7 @@ options:
 					Type: reflect.TypeOf(int64(0)), // type of that data
 				},
 			},
-			"Streamer": &testdata.InputStream{
+			"Streamer": &fwktest.InputStream{
 				R: f,
 			},
 		},

diff --git a/fwk/examples/fwk-ex-tuto-3/main.go b/fwk/examples/fwk-ex-tuto-3/main.go
@@ -16,9 +16,9 @@ import (
 	// job is the scripting interface to 'fwk'
 	"go-hep.org/x/hep/fwk/job"
 
-	// we need to access some tools defined in testdata (the ascii InputStream)
+	// we need to access some tools defined in fwktest (the ascii InputStream)
 	// so we need to directly import that package
-	"go-hep.org/x/hep/fwk/testdata"
+	"go-hep.org/x/hep/fwk/internal/fwktest"
 )
 
 var (
@@ -81,7 +81,7 @@ options:
 	// create a task that reads integers from some location
 	// and publish the square of these integers under some other location
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task2",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task2",
 		Name: "t2",
 		Props: job.P{
 			"Input":  "t1-ints1",
@@ -102,7 +102,7 @@ options:
 					Type: reflect.TypeOf(int64(0)), // type of that data
 				},
 			},
-			"Streamer": &testdata.InputStream{
+			"Streamer": &fwktest.InputStream{
 				R: r,
 			},
 		},
@@ -119,7 +119,7 @@ options:
 					Type: reflect.TypeOf(int64(0)), // type of that data
 				},
 			},
-			"Streamer": &testdata.OutputStream{
+			"Streamer": &fwktest.OutputStream{
 				W: w,
 			},
 		},

diff --git a/fwk/examples/fwk-ex-tuto-6-write-data/main.go b/fwk/examples/fwk-ex-tuto-6-write-data/main.go
@@ -16,9 +16,9 @@ import (
 	// job is the scripting interface to 'fwk'
 	"go-hep.org/x/hep/fwk/job"
 
-	// we need to access some tools defined in testdata (the ascii InputStream)
+	// we need to access some tools defined in fwktest (the ascii InputStream)
 	// so we need to directly import that package
-	"go-hep.org/x/hep/fwk/testdata"
+	"go-hep.org/x/hep/fwk/internal/fwktest"
 
 	// for persistency
 	"go-hep.org/x/hep/fwk/rio"
@@ -70,7 +70,7 @@ options:
 	// create a task that reads integers from some location
 	// and publish the square of these integers under some other location
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task2",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task2",
 		Name: "t2",
 		Props: job.P{
 			"Input":  "t1-ints1",
@@ -98,7 +98,7 @@ options:
 					Type: reflect.TypeOf(int64(0)), // type of that data
 				},
 			},
-			"Streamer": &testdata.InputStream{
+			"Streamer": &fwktest.InputStream{
 				R: f,
 			},
 		},

diff --git a/fwk/examples/fwk-ex-tuto-7-read-data/main.go b/fwk/examples/fwk-ex-tuto-7-read-data/main.go
@@ -19,9 +19,9 @@ import (
 	// for persistency
 	"go-hep.org/x/hep/fwk/rio"
 
-	// we need to access some tools defined in testdata
+	// we need to access some tools defined in fwktest
 	// so we need to directly import that package
-	_ "go-hep.org/x/hep/fwk/testdata"
+	_ "go-hep.org/x/hep/fwk/internal/fwktest"
 )
 
 var (
@@ -70,7 +70,7 @@ options:
 	// create a task that reads integers from some location
 	// and publish the square of these integers under some other location
 	app.Create(job.C{
-		Type: "go-hep.org/x/hep/fwk/testdata.task2",
+		Type: "go-hep.org/x/hep/fwk/internal/fwktest.task2",
 		Name: "t2",
 		Props: job.P{
 			"Input":  "t1-ints1-massaged",