Simplify test code

Author: bbrks

rest/importtest/import_test.go

@@ -74,32 +74,24 @@ func TestImportFeed(t *testing.T) {
 }
 
 func TestImportFeedWithRecursiveSyncFunction(t *testing.T) {
-
 	base.SkipImportTestsIfNotEnabled(t)
 
-	rtConfig := rest.RestTesterConfig{
+	base.SetUpTestLogging(t, base.LevelDebug, base.KeyImport, base.KeyCRUD)
+
+	rt := rest.NewRestTester(t, &rest.RestTesterConfig{
 		SyncFn:     `function access(doc) { access("foo", "bar"); }`,
 		AutoImport: base.Ptr(true),
-	}
-
-	rt := rest.NewRestTester(t, &rtConfig)
+	})
 	defer rt.Close()
-	dataStore := rt.GetSingleDataStore()
-
-	base.SetUpTestLogging(t, base.LevelDebug, base.KeyImport, base.KeyCRUD)
 
 	// Create doc via the SDK
 	mobileKey := t.Name()
-	mobileBody := make(map[string]interface{})
-	mobileBody["channels"] = "ABC"
-	_, err := dataStore.Add(mobileKey, 0, mobileBody)
-	assert.NoError(t, err, "Error writing SDK doc")
+	mobileBody := map[string]any{"channels": "ABC"}
+	added, err := rt.GetSingleDataStore().Add(mobileKey, 0, mobileBody)
+	require.NoError(t, err, "Error writing SDK doc")
+	require.True(t, added)
 
-	// Wait for import
-	err = rt.WaitForCondition(func() bool {
-		return rt.GetDatabase().DbStats.SharedBucketImportStats.ImportErrorCount.Value() == 1
-	})
-	require.NoError(t, err)
+	base.RequireWaitForStat(t, rt.GetDatabase().DbStats.SharedBucketImportStats.ImportErrorCount.Value, 1)
 
 	// Attempt to get the document via Sync Gateway.
 	response := rt.SendAdminRequest("GET", "/{{.keyspace}}/"+mobileKey, "")