Skip to content

Commit 5c3a1a5

Browse files
committed
Use @AfterEach for test cleanup instead of manual calls
Move cleanupAgentEnv() to an @AfterEach tearDown method so test isolation is failure-safe. Previously, if an assertion failed before the manual cleanup call, static state would leak between tests. Co-authored-by: Isaac
1 parent 4c3b838 commit 5c3a1a5

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

databricks-sdk-java/src/test/java/com/databricks/sdk/core/UserAgentTest.java

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,17 @@
44
import java.util.ArrayList;
55
import java.util.HashMap;
66
import java.util.Map;
7+
import org.junit.jupiter.api.AfterEach;
78
import org.junit.jupiter.api.Assertions;
89
import org.junit.jupiter.api.Test;
910

1011
public class UserAgentTest {
1112

13+
@AfterEach
14+
void tearDown() {
15+
cleanupAgentEnv();
16+
}
17+
1218
private void setupAgentEnv(Map<String, String> envMap) {
1319
UserAgent.agentProvider = null;
1420
UserAgent.cicdProvider = null;
@@ -80,7 +86,6 @@ public void testUserAgentCicdNoProvider() {
8086
UserAgent.env =
8187
new Environment(new HashMap<>(), new ArrayList<>(), System.getProperty("os.name"));
8288
Assertions.assertFalse(UserAgent.asString().contains("cicd"));
83-
UserAgent.env = null;
8489
}
8590

8691
@Test
@@ -96,7 +101,6 @@ public void testUserAgentCicdOneProvider() {
96101
new ArrayList<>(),
97102
System.getProperty("os.name"));
98103
Assertions.assertTrue(UserAgent.asString().contains("cicd/github"));
99-
UserAgent.env = null;
100104
}
101105

102106
@Test
@@ -113,7 +117,6 @@ public void testUserAgentCicdTwoProvider() {
113117
new ArrayList<>(),
114118
System.getProperty("os.name"));
115119
Assertions.assertTrue(UserAgent.asString().contains("cicd/gitlab"));
116-
UserAgent.env = null;
117120
}
118121

119122
@Test
@@ -125,7 +128,6 @@ public void testAgentProviderAntigravity() {
125128
}
126129
});
127130
Assertions.assertTrue(UserAgent.asString().contains("agent/antigravity"));
128-
cleanupAgentEnv();
129131
}
130132

131133
@Test
@@ -137,7 +139,6 @@ public void testAgentProviderClaudeCode() {
137139
}
138140
});
139141
Assertions.assertTrue(UserAgent.asString().contains("agent/claude-code"));
140-
cleanupAgentEnv();
141142
}
142143

143144
@Test
@@ -149,7 +150,6 @@ public void testAgentProviderCline() {
149150
}
150151
});
151152
Assertions.assertTrue(UserAgent.asString().contains("agent/cline"));
152-
cleanupAgentEnv();
153153
}
154154

155155
@Test
@@ -161,7 +161,6 @@ public void testAgentProviderCodex() {
161161
}
162162
});
163163
Assertions.assertTrue(UserAgent.asString().contains("agent/codex"));
164-
cleanupAgentEnv();
165164
}
166165

167166
@Test
@@ -173,7 +172,6 @@ public void testAgentProviderCursor() {
173172
}
174173
});
175174
Assertions.assertTrue(UserAgent.asString().contains("agent/cursor"));
176-
cleanupAgentEnv();
177175
}
178176

179177
@Test
@@ -185,7 +183,6 @@ public void testAgentProviderGeminiCli() {
185183
}
186184
});
187185
Assertions.assertTrue(UserAgent.asString().contains("agent/gemini-cli"));
188-
cleanupAgentEnv();
189186
}
190187

191188
@Test
@@ -197,14 +194,12 @@ public void testAgentProviderOpencode() {
197194
}
198195
});
199196
Assertions.assertTrue(UserAgent.asString().contains("agent/opencode"));
200-
cleanupAgentEnv();
201197
}
202198

203199
@Test
204200
public void testAgentProviderNoAgent() {
205201
setupAgentEnv(new HashMap<>());
206202
Assertions.assertFalse(UserAgent.asString().contains("agent/"));
207-
cleanupAgentEnv();
208203
}
209204

210205
@Test
@@ -217,7 +212,6 @@ public void testAgentProviderMultipleAgents() {
217212
}
218213
});
219214
Assertions.assertFalse(UserAgent.asString().contains("agent/"));
220-
cleanupAgentEnv();
221215
}
222216

223217
@Test
@@ -229,7 +223,6 @@ public void testAgentProviderEmptyValue() {
229223
}
230224
});
231225
Assertions.assertFalse(UserAgent.asString().contains("agent/"));
232-
cleanupAgentEnv();
233226
}
234227

235228
@Test
@@ -255,6 +248,5 @@ public void testAgentProviderCached() {
255248
System.getProperty("os.name"));
256249
Assertions.assertTrue(UserAgent.asString().contains("agent/cursor"));
257250
Assertions.assertFalse(UserAgent.asString().contains("agent/claude-code"));
258-
cleanupAgentEnv();
259251
}
260252
}

0 commit comments

Comments
 (0)