Updating and simplifying tests

Author: dfava

querysql/querysql_test.go

@@ -27,6 +27,7 @@ func isClosed(r *sql.Rows) bool {
 	return err != nil && err.Error() == "sql: Rows are closed"
 }
 
+// TODO(dsf): Expand to test std logger
 func TestMultipleRowsetsResultsHappyDay(t *testing.T) {
 	qry := `
 -- single scalar
@@ -144,6 +145,7 @@ select _function='OtherTestFunction', time=42, money=convert(money, 12345.67);
 
 }
 
+// TODO(dsf): Also test the std logger
 func TestInvalidLogLevel(t *testing.T) {
 	qry := `
 -- log something
@@ -218,16 +220,13 @@ select 2;
 
 func TestDispatcherSetupError(t *testing.T) {
 	var mustNotBeTrue bool
-	var hook LogHook
-	logger := logrus.StandardLogger()
-	logger.Hooks.Add(&hook)
 	defer func() {
 		r := recover()
 		assert.NotNil(t, r) // nil if a panic didn't happen, not nil if a panic happened
 		assert.False(t, mustNotBeTrue)
 	}()
 
-	ctx := querysql.WithLogger(context.Background(), querysql.LogrusMSSQLLogger(logger, logrus.InfoLevel))
+	ctx := context.Background()
 	ctx = querysql.WithDispatcher(ctx, querysql.GoMSSQLDispatcher([]interface{}{
 		"SomethingThatIsNotAFunctionPointer", // This should cause a panic
 	}))
@@ -724,19 +723,13 @@ create table MyUsers (
 );
 insert into MyUsers (Username) values ('JohnDoe');
 
--- logging
-select _log='info', Y = 'one';
-
 -- dispatcher
 select _function='TestFunction', component = 'abc', val=1, time=1.23;
 
 select _function='ReturnAnonFunc', label = 'myLabel', time=1.23;
 `
 
-	var hook LogHook
-	logger := logrus.StandardLogger()
-	logger.Hooks.Add(&hook)
-	ctx := querysql.WithLogger(context.Background(), querysql.LogrusMSSQLLogger(logger, logrus.InfoLevel))
+	ctx := context.Background()
 	ctx = querysql.WithDispatcher(ctx, querysql.GoMSSQLDispatcher([]interface{}{
 		testhelper.TestFunction,
 		testhelper.ReturnAnonFunc("myComponent"),
@@ -748,11 +741,6 @@ select _function='ReturnAnonFunc', label = 'myLabel', time=1.23;
 
 	assert.True(t, testhelper.TestFunctionsCalled["ReturnAnonFunc.myComponent"])
 
-	// Check that we have exhausted the logging select before we do the call that gets ErrNoMoreSets
-	assert.Equal(t, []logrus.Fields{
-		{"Y": "one"},
-	}, hook.lines)
-
 	assert.True(t, testhelper.TestFunctionsCalled["TestFunction"])
 }
 
@@ -767,7 +755,7 @@ func TestDispatcherPanicsWithTwoAnonFuncs(t *testing.T) {
 		assert.False(t, mustNotBeTrue)
 	}()
 
-	ctx := querysql.WithLogger(context.Background(), querysql.LogrusMSSQLLogger(logger, logrus.InfoLevel))
+	ctx := context.Background()
 	ctx = querysql.WithDispatcher(ctx, querysql.GoMSSQLDispatcher([]interface{}{
 		testhelper.ReturnAnonFunc("myComponent"),
 		testhelper.ReturnAnonFunc("myComponent2"), // This should cause a panic