Skip to content

Commit 162625d

Browse files
committed
cleanup tests
1 parent ec43ac5 commit 162625d

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

.test/test_framework/container/tests/parameterized_query_test.go

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func setupParamTest(t *testing.T, testName string) (*test_utils.TestEnvironment,
4848
require.NoError(t, err)
4949
plugins := property_util.DEFAULT_PLUGINS
5050
if slices.Contains(env.Info().Request.Features, test_utils.LIMITLESS_DEPLOYMENT) {
51-
plugins += "," + driver_infrastructure.LIMITLESS_PLUGIN_CODE
51+
plugins = driver_infrastructure.LIMITLESS_PLUGIN_CODE
5252
}
5353

5454
props := map[string]string{"plugins": plugins}
@@ -137,6 +137,7 @@ func verifyInsertedData(t *testing.T, env *test_utils.TestEnvironment, db *sql.D
137137
func TestParameterizedQuery(t *testing.T) {
138138
t.Run("Parameterized Query With Named/Positional Args Query", func(t *testing.T) {
139139
env, db := setupParamTest(t, t.Name())
140+
defer db.Close()
140141
row, err := runPositionalArgsQuery(env, db)
141142
require.NoError(t, err)
142143

@@ -148,10 +149,12 @@ func TestParameterizedQuery(t *testing.T) {
148149
queryValueInt, _ := strconv.Atoi(queryValue)
149150
assert.Equal(t, queryValueInt, value)
150151
assert.Equal(t, queryStatus, status)
152+
test_utils.BasicCleanup(t.Name())
151153
})
152154

153155
t.Run("Parameterized Query With Named/Positional Args Exec", func(t *testing.T) {
154156
env, db := setupParamTest(t, t.Name())
157+
defer db.Close()
155158

156159
err := createParamTestTable(env, db)
157160
require.NoError(t, err)
@@ -165,10 +168,12 @@ func TestParameterizedQuery(t *testing.T) {
165168

166169
queryValueInt, _ := strconv.Atoi(queryValue)
167170
verifyInsertedData(t, env, db, queryValueInt, queryStatus)
171+
test_utils.BasicCleanup(t.Name())
168172
})
169173

170174
t.Run("Parameterized Query With Prepared Statements Stmt", func(t *testing.T) {
171175
env, db := setupParamTest(t, t.Name())
176+
defer db.Close()
172177

173178
preparedStatement := getPreparedStatement(env)
174179
stmt, err := db.PrepareContext(context.TODO(), preparedStatement)
@@ -182,10 +187,12 @@ func TestParameterizedQuery(t *testing.T) {
182187
testValueInt, _ := strconv.Atoi(testValue)
183188
assert.Equal(t, testValueInt, returnedValue)
184189
assert.Equal(t, testName, returnedName)
190+
test_utils.BasicCleanup(t.Name())
185191
})
186192

187193
t.Run("Parameterized Query With Prepared Statements Conn", func(t *testing.T) {
188194
env, db := setupParamTest(t, t.Name())
195+
defer db.Close()
189196

190197
conn, err := db.Conn(context.TODO())
191198
require.NoError(t, err)
@@ -203,10 +210,12 @@ func TestParameterizedQuery(t *testing.T) {
203210
testValueInt, _ := strconv.Atoi(testValue)
204211
assert.Equal(t, testValueInt, returnedValue)
205212
assert.Equal(t, testName, returnedName)
213+
test_utils.BasicCleanup(t.Name())
206214
})
207215

208216
t.Run("Parameterized Query With Prepared Statements Tx", func(t *testing.T) {
209217
env, db := setupParamTest(t, t.Name())
218+
defer db.Close()
210219

211220
tx, err := db.BeginTx(context.TODO(), nil)
212221
require.NoError(t, err)
@@ -229,10 +238,12 @@ func TestParameterizedQuery(t *testing.T) {
229238

230239
err = tx.Commit()
231240
require.NoError(t, err)
241+
test_utils.BasicCleanup(t.Name())
232242
})
233243

234244
t.Run("Parameterized Query With Prepared Statements Stmt Exec", func(t *testing.T) {
235245
env, db := setupParamTest(t, t.Name())
246+
defer db.Close()
236247

237248
err := createParamTestTable(env, db)
238249
require.NoError(t, err)
@@ -251,10 +262,12 @@ func TestParameterizedQuery(t *testing.T) {
251262

252263
testValueInt, _ := strconv.Atoi(testValue)
253264
verifyInsertedData(t, env, db, testValueInt, testName)
265+
test_utils.BasicCleanup(t.Name())
254266
})
255267

256268
t.Run("Parameterized Query With Prepared Statements Conn Exec", func(t *testing.T) {
257269
env, db := setupParamTest(t, t.Name())
270+
defer db.Close()
258271

259272
err := createParamTestTable(env, db)
260273
require.NoError(t, err)
@@ -277,10 +290,12 @@ func TestParameterizedQuery(t *testing.T) {
277290

278291
testValueInt, _ := strconv.Atoi(testValue)
279292
verifyInsertedData(t, env, db, testValueInt, testName)
293+
test_utils.BasicCleanup(t.Name())
280294
})
281295

282296
t.Run("Parameterized Query With Prepared Statements Tx Exec", func(t *testing.T) {
283297
env, db := setupParamTest(t, t.Name())
298+
defer db.Close()
284299

285300
err := createParamTestTable(env, db)
286301
require.NoError(t, err)
@@ -308,5 +323,6 @@ func TestParameterizedQuery(t *testing.T) {
308323

309324
testValueInt, _ := strconv.Atoi(testValue)
310325
verifyInsertedData(t, env, db, testValueInt, testName)
326+
test_utils.BasicCleanup(t.Name())
311327
})
312328
}

0 commit comments

Comments
 (0)