Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix copyright year & method names in spring-test

This commit fixes the copyright year for changes made in commit
5b147bf. In addition, method names
have been changed to reflect the semantic changes made in that same
commit.
  • Loading branch information...
commit 8a37521a3cd5dc0d51599abf9824c35513816fbb 1 parent e4c1361
Sam Brannen sbrannen authored
4 spring-test/src/test/java/org/springframework/test/context/ClassLevelDirtiesContextTests.java
View
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@
import org.springframework.test.context.support.DirtiesContextTestExecutionListener;
/**
- * JUnit 4 based integration test which verifies correct {@link ContextCache
+ * JUnit 4 based integration test which verifies correct {@linkplain ContextCache
* application context caching} in conjunction with the
* {@link SpringJUnit4ClassRunner} and the {@link DirtiesContext
* @DirtiesContext} annotation at the class level.
2  spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
View
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
12 spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
View
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -64,34 +64,34 @@ public void timedTests() throws Exception {
// Should Pass.
@Test(timeout = 2000)
- public void testJUnitTimeoutWithNoOp() {
+ public void jUnitTimeoutWithNoOp() {
/* no-op */
}
// Should Pass.
@Test
@Timed(millis = 2000)
- public void testSpringTimeoutWithNoOp() {
+ public void springTimeoutWithNoOp() {
/* no-op */
}
// Should Fail due to timeout.
@Test(timeout = 10)
- public void testJUnitTimeoutWithOneSecondWait() throws Exception {
+ public void jUnitTimeoutWithSleep() throws Exception {
Thread.sleep(20);
}
// Should Fail due to timeout.
@Test
@Timed(millis = 10)
- public void testSpringTimeoutWithOneSecondWait() throws Exception {
+ public void springTimeoutWithSleep() throws Exception {
Thread.sleep(20);
}
// Should Fail due to duplicate configuration.
@Test(timeout = 200)
@Timed(millis = 200)
- public void testSpringAndJUnitTimeout() {
+ public void springAndJUnitTimeouts() {
/* no-op */
}
}
Please sign in to comment.
Something went wrong with that request. Please try again.