root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[SPR-5889] Renaming TestNG tests from *Tests_ back to *Tests, but keeping @org.junit.Ignore to exclude them from the JUnit test run. 

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1463 50f2f4bb-b051-0410-bef5-90022cba6387
This commit is contained in:
Sam Brannen 2009-07-03 09:57:19 +00:00
parent aef72ba508
commit 5d53a1845b
2 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests_.java → org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -26,7 +26,6 @@ import static org.testng.Assert.assertTrue;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.sql.DataSource; import javax.sql.DataSource;
import org.junit.Ignore;
import org.springframework.beans.Employee; import org.springframework.beans.Employee;
import org.springframework.beans.Pet; import org.springframework.beans.Pet;
import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.BeanNameAware;
@ -48,35 +47,25 @@ import org.testng.annotations.Test;
/** /**
* Combined unit test for {@link AbstractTestNGSpringContextTests} and * Combined unit test for {@link AbstractTestNGSpringContextTests} and
* {@link AbstractTransactionalTestNGSpringContextTests}. * {@link AbstractTransactionalTestNGSpringContextTests}.
* *
* @author Sam Brannen * @author Sam Brannen
* @since 2.5 * @since 2.5
*/ */
@Ignore // renamed to Tests_ to avoid being picked up by junit. Spring Build support for TestNG is pending. @org.junit.Ignore("TestNG tests should not be run by JUnit")
@ContextConfiguration @ContextConfiguration
public class ConcreteTransactionalTestNGSpringContextTests_ extends AbstractTransactionalTestNGSpringContextTests public class ConcreteTransactionalTestNGSpringContextTests extends AbstractTransactionalTestNGSpringContextTests
implements BeanNameAware, InitializingBean { implements BeanNameAware, InitializingBean {
// ------------------------------------------------------------------------|
// --- CONSTANTS ----------------------------------------------------------|
// ------------------------------------------------------------------------|
private static final String BOB = "bob"; private static final String BOB = "bob";
private static final String JANE = "jane"; private static final String JANE = "jane";
private static final String SUE = "sue"; private static final String SUE = "sue";
private static final String YODA = "yoda"; private static final String YODA = "yoda";
// ------------------------------------------------------------------------|
// --- STATIC VARIABLES ---------------------------------------------------|
// ------------------------------------------------------------------------|
private static int numSetUpCalls = 0; private static int numSetUpCalls = 0;
private static int numSetUpCallsInTransaction = 0; private static int numSetUpCallsInTransaction = 0;
private static int numTearDownCalls = 0; private static int numTearDownCalls = 0;
private static int numTearDownCallsInTransaction = 0; private static int numTearDownCallsInTransaction = 0;
// ------------------------------------------------------------------------|
// --- INSTANCE VARIABLES -------------------------------------------------|
// ------------------------------------------------------------------------| // ------------------------------------------------------------------------|
private boolean beanInitialized = false; private boolean beanInitialized = false;
@ -97,8 +86,6 @@ public class ConcreteTransactionalTestNGSpringContextTests_ extends AbstractTran
protected String bar; protected String bar;
// ------------------------------------------------------------------------|
// --- STATIC METHODS -----------------------------------------------------|
// ------------------------------------------------------------------------| // ------------------------------------------------------------------------|
private static int clearPersonTable(SimpleJdbcTemplate simpleJdbcTemplate) { private static int clearPersonTable(SimpleJdbcTemplate simpleJdbcTemplate) {
@ -126,8 +113,6 @@ public class ConcreteTransactionalTestNGSpringContextTests_ extends AbstractTran
return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name); return simpleJdbcTemplate.update("DELETE FROM person WHERE name=?", name);
} }
// ------------------------------------------------------------------------|
// --- INSTANCE METHODS ---------------------------------------------------|
// ------------------------------------------------------------------------| // ------------------------------------------------------------------------|
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {
@ -152,7 +137,7 @@ public class ConcreteTransactionalTestNGSpringContextTests_ extends AbstractTran
private void assertNumRowsInPersonTable(int expectedNumRows, String testState) { private void assertNumRowsInPersonTable(int expectedNumRows, String testState) {
assertEquals(countRowsInPersonTable(this.simpleJdbcTemplate), expectedNumRows, assertEquals(countRowsInPersonTable(this.simpleJdbcTemplate), expectedNumRows,
"Verifying the number of rows in the person table (" + testState + ")."); "Verifying the number of rows in the person table (" + testState + ").");
} }
private void assertAddPerson(final String name) { private void assertAddPerson(final String name) {
@ -182,7 +167,7 @@ public class ConcreteTransactionalTestNGSpringContextTests_ extends AbstractTran
public void verifyApplicationContextSet() { public void verifyApplicationContextSet() {
assertInTransaction(false); assertInTransaction(false);
assertNotNull(super.applicationContext, assertNotNull(super.applicationContext,
"The application context should have been set due to ApplicationContextAware semantics."); "The application context should have been set due to ApplicationContextAware semantics.");
Employee employeeBean = (Employee) super.applicationContext.getBean("employee"); Employee employeeBean = (Employee) super.applicationContext.getBean("employee");
assertEquals(employeeBean.getName(), "John Smith", "Verifying employee's name."); assertEquals(employeeBean.getName(), "John Smith", "Verifying employee's name.");
} }
@ -192,7 +177,7 @@ public class ConcreteTransactionalTestNGSpringContextTests_ extends AbstractTran
public void verifyBeanInitialized() { public void verifyBeanInitialized() {
assertInTransaction(false); assertInTransaction(false);
assertTrue(this.beanInitialized, assertTrue(this.beanInitialized,
"This test instance should have been initialized due to InitializingBean semantics."); "This test instance should have been initialized due to InitializingBean semantics.");
} }
@Test @Test
@ -200,7 +185,7 @@ public class ConcreteTransactionalTestNGSpringContextTests_ extends AbstractTran
public void verifyBeanNameSet() { public void verifyBeanNameSet() {
assertInTransaction(false); assertInTransaction(false);
assertEquals(this.beanName, getClass().getName(), assertEquals(this.beanName, getClass().getName(),
"The bean name of this test instance should have been set due to BeanNameAware semantics."); "The bean name of this test instance should have been set due to BeanNameAware semantics.");
} }
@Test @Test
@ -275,8 +260,6 @@ public class ConcreteTransactionalTestNGSpringContextTests_ extends AbstractTran
} }
// ------------------------------------------------------------------------|
// --- TYPES --------------------------------------------------------------|
// ------------------------------------------------------------------------| // ------------------------------------------------------------------------|
public static class DatabaseSetup { public static class DatabaseSetup {

17
org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests_.java → org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2007 the original author or authors. * Copyright 2002-2009 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -21,7 +21,6 @@ import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertNotSame; import static org.testng.Assert.assertNotSame;
import static org.testng.Assert.assertSame; import static org.testng.Assert.assertSame;
import org.junit.Ignore;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.ContextConfiguration;
@ -44,13 +43,13 @@ import org.testng.annotations.Test;
* individual tests. DirtiesContextTransactionalTestNGSpringContextTests * individual tests. DirtiesContextTransactionalTestNGSpringContextTests
* therefore verifies the expected behavior and correct semantics. * therefore verifies the expected behavior and correct semantics.
* </p> * </p>
* *
* @author Sam Brannen * @author Sam Brannen
* @since 2.5 * @since 2.5
*/ */
@Ignore // renamed to Tests_ to avoid being picked up by junit. Spring Build support for TestNG is pending. @org.junit.Ignore("TestNG tests should not be run by JUnit")
@ContextConfiguration @ContextConfiguration
public class DirtiesContextTransactionalTestNGSpringContextTests_ extends AbstractTransactionalTestNGSpringContextTests { public class DirtiesContextTransactionalTestNGSpringContextTests extends AbstractTransactionalTestNGSpringContextTests {
private ApplicationContext dirtiedApplicationContext; private ApplicationContext dirtiedApplicationContext;
@ -58,9 +57,9 @@ public class DirtiesContextTransactionalTestNGSpringContextTests_ extends Abstra
private void performCommonAssertions() { private void performCommonAssertions() {
assertInTransaction(true); assertInTransaction(true);
assertNotNull(super.applicationContext, assertNotNull(super.applicationContext,
"The application context should have been set due to ApplicationContextAware semantics."); "The application context should have been set due to ApplicationContextAware semantics.");
assertNotNull(super.simpleJdbcTemplate, assertNotNull(super.simpleJdbcTemplate,
"The SimpleJdbcTemplate should have been created in setDataSource() via DI for the DataSource."); "The SimpleJdbcTemplate should have been created in setDataSource() via DI for the DataSource.");
} }
@Test @Test
@ -74,13 +73,13 @@ public class DirtiesContextTransactionalTestNGSpringContextTests_ extends Abstra
public void verifyContextWasDirtied() { public void verifyContextWasDirtied() {
performCommonAssertions(); performCommonAssertions();
assertNotSame(super.applicationContext, this.dirtiedApplicationContext, assertNotSame(super.applicationContext, this.dirtiedApplicationContext,
"The application context should have been 'dirtied'."); "The application context should have been 'dirtied'.");
this.dirtiedApplicationContext = super.applicationContext; this.dirtiedApplicationContext = super.applicationContext;
} }
@Test(dependsOnMethods = { "verifyContextWasDirtied" }) @Test(dependsOnMethods = { "verifyContextWasDirtied" })
public void verifyContextWasNotDirtied() { public void verifyContextWasNotDirtied() {
assertSame(this.applicationContext, this.dirtiedApplicationContext, assertSame(this.applicationContext, this.dirtiedApplicationContext,
"The application context should NOT have been 'dirtied'."); "The application context should NOT have been 'dirtied'.");
} }
} }