Skip to content

Commit 37761f5

Browse files
brideckbrideck
committed
Cleanup JDBC Tests - Wrong Vehicles, App Packaging
1 parent 1594a39 commit 37761f5

4 files changed

Lines changed: 20 additions & 21 deletions

File tree

‎tcks/profiles/platform/jdbc/src/main/java/com/sun/ts/tests/jdbc/ee/callStmt/callStmt1/callStmtClient1AppClient.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
@Tag("tck-appclient")
5151

5252
public class callStmtClient1AppClient extends callStmtClient1 implements Serializable {
53-
5453
@TargetsContainer("tck-appclient")
5554
@OverProtocol("appclient")
5655
@Deployment(name = "appclient", testable = true)
@@ -63,7 +62,7 @@ public static EnterpriseArchive createDeploymentAppclient(@ArquillianResource Te
6362
archive.addClasses(callStmtClient1.class, ServiceEETest.class, EETest.class);
6463
// The appclient-client descriptor
6564
URL appClientUrl = callStmtClient1AppClient.class
66-
.getResource("/com/sun/ts/tests/jdbc/ee/callStmt1/appclient_vehicle_client.xml");
65+
.getResource("/com/sun/ts/tests/jdbc/ee/callStmt/callStmt1/appclient_vehicle_client.xml");
6766
if (appClientUrl != null) {
6867
archive.addAsManifestResource(appClientUrl, "application-client.xml");
6968
}

‎tcks/profiles/platform/jdbc/src/main/java/com/sun/ts/tests/jdbc/ee/callStmt/callStmt1/callStmtClient1EJB.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ public void testGetInt02() throws Exception {
373373
* method to retrieve the null value. Check if it returns null
374374
*/
375375
@Test
376-
@TargetVehicle("appclient")
376+
@TargetVehicle("ejb")
377377
public void testGetInt03() throws Exception {
378378
super.testGetInt03();
379379
}
@@ -393,7 +393,7 @@ public void testGetInt03() throws Exception {
393393
* equal.
394394
*/
395395
@Test
396-
@TargetVehicle("appclient")
396+
@TargetVehicle("ejb")
397397
public void testGetBoolean01() throws Exception {
398398
super.testGetBoolean01();
399399
}
@@ -413,7 +413,7 @@ public void testGetBoolean01() throws Exception {
413413
* equal.
414414
*/
415415
@Test
416-
@TargetVehicle("appclient")
416+
@TargetVehicle("ejb")
417417
public void testGetBoolean02() throws Exception {
418418
super.testGetBoolean02();
419419
}
@@ -432,7 +432,7 @@ public void testGetBoolean02() throws Exception {
432432
* returned by the getLong(int parameterIndex). Both the values should be equal.
433433
*/
434434
@Test
435-
@TargetVehicle("appclient")
435+
@TargetVehicle("ejb")
436436
public void testGetLong01() throws Exception {
437437
super.testGetLong01();
438438
}
@@ -451,7 +451,7 @@ public void testGetLong01() throws Exception {
451451
* returned by the getLong(int parameterIndex) Both the values should be equal.
452452
*/
453453
@Test
454-
@TargetVehicle("appclient")
454+
@TargetVehicle("ejb")
455455
public void testGetLong02() throws Exception {
456456
super.testGetLong02();
457457
}
@@ -469,7 +469,7 @@ public void testGetLong02() throws Exception {
469469
* it returns null
470470
*/
471471
@Test
472-
@TargetVehicle("appclient")
472+
@TargetVehicle("ejb")
473473
public void testGetLong03() throws Exception {
474474
super.testGetLong03();
475475
}

‎tcks/profiles/platform/jdbc/src/main/java/com/sun/ts/tests/jdbc/ee/callStmt/callStmt10/callStmtClient10AppClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public static EnterpriseArchive createDeploymentAppclient(@ArquillianResource Te
6868

6969
// The appclient-client descriptor
7070
URL appClientUrl = callStmtClient10AppClient.class
71-
.getResource("/com/sun/ts/tests/jdbc/ee/callStmt10/appclient_vehicle_client.xml");
71+
.getResource("/com/sun/ts/tests/jdbc/ee/callStmt/callStmt10/appclient_vehicle_client.xml");
7272
if (appClientUrl != null) {
7373
archive.addAsManifestResource(appClientUrl, "application-client.xml");
7474
}

‎tcks/profiles/platform/jdbc/src/main/java/com/sun/ts/tests/jdbc/ee/dbMeta/dbMeta12/dbMetaClient12EJB.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public static void main(String[] args) {
123123
*
124124
*/
125125
@Test
126-
@TargetVehicle("appclient")
126+
@TargetVehicle("ejb")
127127
public void testGetSQLStateType() throws Exception {
128128
super.testGetSQLStateType();
129129
}
@@ -140,7 +140,7 @@ public void testGetSQLStateType() throws Exception {
140140
*
141141
*/
142142
@Test
143-
@TargetVehicle("appclient")
143+
@TargetVehicle("ejb")
144144
public void testGetDatabaseMinorVersion() throws Exception {
145145
super.testGetDatabaseMinorVersion();
146146
}
@@ -158,7 +158,7 @@ public void testGetDatabaseMinorVersion() throws Exception {
158158
*
159159
*/
160160
@Test
161-
@TargetVehicle("appclient")
161+
@TargetVehicle("ejb")
162162
public void testGetDatabaseMajorVersion() throws Exception {
163163
super.testGetDatabaseMajorVersion();
164164
}
@@ -175,7 +175,7 @@ public void testGetDatabaseMajorVersion() throws Exception {
175175
*
176176
*/
177177
@Test
178-
@TargetVehicle("appclient")
178+
@TargetVehicle("ejb")
179179
public void testGetJDBCMinorVersion() throws Exception {
180180
super.testGetJDBCMinorVersion();
181181
}
@@ -192,7 +192,7 @@ public void testGetJDBCMinorVersion() throws Exception {
192192
*
193193
*/
194194
@Test
195-
@TargetVehicle("appclient")
195+
@TargetVehicle("ejb")
196196
public void testGetJDBCMajorVersion() throws Exception {
197197
super.testGetJDBCMajorVersion();
198198
}
@@ -209,7 +209,7 @@ public void testGetJDBCMajorVersion() throws Exception {
209209
*
210210
*/
211211
@Test
212-
@TargetVehicle("appclient")
212+
@TargetVehicle("ejb")
213213
public void testSupportsSavepoints() throws Exception {
214214
super.testSupportsSavepoints();
215215
}
@@ -226,7 +226,7 @@ public void testSupportsSavepoints() throws Exception {
226226
*
227227
*/
228228
@Test
229-
@TargetVehicle("appclient")
229+
@TargetVehicle("ejb")
230230
public void testSupportsNamedParameters() throws Exception {
231231
super.testSupportsNamedParameters();
232232
}
@@ -243,7 +243,7 @@ public void testSupportsNamedParameters() throws Exception {
243243
*
244244
*/
245245
@Test
246-
@TargetVehicle("appclient")
246+
@TargetVehicle("ejb")
247247
public void testSupportsMultipleOpenResults() throws Exception {
248248
super.testSupportsMultipleOpenResults();
249249
}
@@ -260,7 +260,7 @@ public void testSupportsMultipleOpenResults() throws Exception {
260260
*
261261
*/
262262
@Test
263-
@TargetVehicle("appclient")
263+
@TargetVehicle("ejb")
264264
public void testSupportsGetGeneratedKeys() throws Exception {
265265
super.testSupportsGetGeneratedKeys();
266266
}
@@ -277,7 +277,7 @@ public void testSupportsGetGeneratedKeys() throws Exception {
277277
*
278278
*/
279279
@Test
280-
@TargetVehicle("appclient")
280+
@TargetVehicle("ejb")
281281
public void testSupportsResultSetHoldability01() throws Exception {
282282
super.testSupportsResultSetHoldability01();
283283
}
@@ -294,7 +294,7 @@ public void testSupportsResultSetHoldability01() throws Exception {
294294
*
295295
*/
296296
@Test
297-
@TargetVehicle("appclient")
297+
@TargetVehicle("ejb")
298298
public void testSupportsResultSetHoldability02() throws Exception {
299299
super.testSupportsResultSetHoldability02();
300300
}
@@ -311,7 +311,7 @@ public void testSupportsResultSetHoldability02() throws Exception {
311311
*
312312
*/
313313
@Test
314-
@TargetVehicle("appclient")
314+
@TargetVehicle("ejb")
315315
public void testGetResultSetHoldability() throws Exception {
316316
super.testGetResultSetHoldability();
317317
}

0 commit comments

Comments
 (0)