test: fix existing test suites

sundowndev · Sep 16, 2022 · 8e74497 · 8e74497
1 parent f055ac4
commit 8e74497
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 16 deletions.
diff --git a/lib/number/number_test.go b/lib/number/number_test.go
@@ -17,6 +17,7 @@ func TestNumber(t *testing.T) {
 			name:  "should succeed to parse number",
 			input: "33678342311",
 			expected: &Number{
+				Valid:         true,
 				RawLocal:      "0678342311",
 				Local:         "06 78 34 23 11",
 				E164:          "+33678342311",
@@ -30,6 +31,7 @@ func TestNumber(t *testing.T) {
 			name:  "should succeed to parse number",
 			input: "15552221212",
 			expected: &Number{
+				Valid:         false,
 				RawLocal:      "5552221212",
 				Local:         "(555) 222-1212",
 				E164:          "+15552221212",

diff --git a/lib/remote/googlecse_scanner_test.go b/lib/remote/googlecse_scanner_test.go
@@ -238,8 +238,8 @@ func TestGoogleCSEScanner_Scan_Success(t *testing.T) {
 			remote := NewLibrary(filter.NewEngine())
 			remote.AddScanner(scanner)
 
-			if !scanner.ShouldRun(*tt.number) {
-				t.Fatal("ShouldRun() should be truthy")
+			if scanner.DryRun(*tt.number) != nil {
+				t.Fatal("DryRun() should return nil")
 			}
 
 			got, errs := remote.Scan(tt.number)
@@ -253,9 +253,18 @@ func TestGoogleCSEScanner_Scan_Success(t *testing.T) {
 	}
 }
 
-func TestGoogleCSEScanner_ShouldRun(t *testing.T) {
+func TestGoogleCSEScanner_DryRun(t *testing.T) {
+	_ = os.Setenv("GOOGLECSE_CX", "abc")
+	_ = os.Setenv("GOOGLE_API_KEY", "abc")
+	defer os.Unsetenv("GOOGLECSE_CX")
+	defer os.Unsetenv("GOOGLE_API_KEY")
 	scanner := NewGoogleCSEScanner(&http.Client{})
-	assert.False(t, scanner.ShouldRun(*test.NewFakeUSNumber()))
+	assert.Nil(t, scanner.DryRun(*test.NewFakeUSNumber()))
+}
+
+func TestGoogleCSEScanner_DryRun_Error(t *testing.T) {
+	scanner := NewGoogleCSEScanner(&http.Client{})
+	assert.EqualError(t, scanner.DryRun(*test.NewFakeUSNumber()), "search engine ID and/or API key is not defined")
 }
 
 func TestGoogleCSEScanner_MaxResults(t *testing.T) {

diff --git a/lib/remote/googlesearch_scanner_test.go b/lib/remote/googlesearch_scanner_test.go
@@ -274,8 +274,8 @@ func TestGoogleSearchScanner(t *testing.T) {
 			remote := NewLibrary(filter.NewEngine())
 			remote.AddScanner(scanner)
 
-			if !scanner.ShouldRun(*tt.number) {
-				t.Fatal("ShouldRun() should be truthy")
+			if scanner.DryRun(*tt.number) != nil {
+				t.Fatal("DryRun() should return nil")
 			}
 
 			got, errs := remote.Scan(tt.number)

diff --git a/lib/remote/local_scanner_test.go b/lib/remote/local_scanner_test.go
@@ -45,8 +45,8 @@ func TestLocalScanner(t *testing.T) {
 			remote := NewLibrary(filter.NewEngine())
 			remote.AddScanner(scanner)
 
-			if !scanner.ShouldRun(*tt.number) {
-				t.Fatal("ShouldRun() should be truthy")
+			if scanner.DryRun(*tt.number) != nil {
+				t.Fatal("DryRun() should return nil")
 			}
 
 			got, errs := remote.Scan(tt.number)

diff --git a/lib/remote/remote.go b/lib/remote/remote.go
@@ -62,7 +62,7 @@ func (r *Library) Scan(n *number.Number) (map[string]interface{}, map[string]err
 		if err := s.DryRun(*n); err != nil {
 			logrus.
 				WithField("scanner", s.Name()).
-				WithField("reason", s.Name()).
+				WithField("reason", err.Error()).
 				Debug("Scanner was ignored because it should not run")
 			continue
 		}

diff --git a/lib/remote/remote_test.go b/lib/remote/remote_test.go
@@ -25,14 +25,14 @@ func TestRemoteLibrarySuccessScan(t *testing.T) {
 	}
 
 	fakeScanner := &mocks.Scanner{}
-	fakeScanner.On("ShouldRun", *num).Return(true).Once()
+	fakeScanner.On("DryRun", *num).Return(nil).Once()
 	fakeScanner.On("Name").Return("fake").Times(2)
-	fakeScanner.On("Scan", *num).Return(fakeScannerResponse{Valid: true}, nil).Once()
+	fakeScanner.On("Run", *num).Return(fakeScannerResponse{Valid: true}, nil).Once()
 
 	fakeScanner2 := &mocks.Scanner{}
-	fakeScanner2.On("ShouldRun", *num).Return(true).Once()
+	fakeScanner2.On("DryRun", *num).Return(nil).Once()
 	fakeScanner2.On("Name").Return("fake2").Times(2)
-	fakeScanner2.On("Scan", *num).Return(fakeScannerResponse{Valid: false}, nil).Once()
+	fakeScanner2.On("Run", *num).Return(fakeScannerResponse{Valid: false}, nil).Once()
 
 	lib := NewLibrary(filter.NewEngine())
 
@@ -56,9 +56,9 @@ func TestRemoteLibraryFailedScan(t *testing.T) {
 	dummyError := errors.New("test")
 
 	fakeScanner := &mocks.Scanner{}
-	fakeScanner.On("ShouldRun", *num).Return(true).Once()
+	fakeScanner.On("DryRun", *num).Return(nil).Once()
 	fakeScanner.On("Name").Return("fake").Times(2)
-	fakeScanner.On("Scan", *num).Return(nil, dummyError).Once()
+	fakeScanner.On("Run", *num).Return(nil, dummyError).Once()
 
 	lib := NewLibrary(filter.NewEngine())
 
@@ -79,7 +79,7 @@ func TestRemoteLibraryEmptyScan(t *testing.T) {
 
 	fakeScanner := &mocks.Scanner{}
 	fakeScanner.On("Name").Return("mockscanner").Times(2)
-	fakeScanner.On("ShouldRun", *num).Return(false).Once()
+	fakeScanner.On("DryRun", *num).Return(errors.New("dummy error")).Once()
 
 	lib := NewLibrary(filter.NewEngine())