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

Don't encode '@' in {@code} tags

This commit is contained in:
Sam Brannen 2014-04-08 14:36:49 +02:00
parent a198026469
commit a1486e46c8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2013 the original author or authors. * Copyright 2002-2014 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.
@ -131,7 +131,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
* Get the name of the default {@code ContextLoader} class to use for * Get the name of the default {@code ContextLoader} class to use for
* the supplied test class. The named class will be used if the test class * the supplied test class. The named class will be used if the test class
* does not explicitly declare a {@code ContextLoader} class via the * does not explicitly declare a {@code ContextLoader} class via the
* {@code @ContextConfiguration} annotation. * {@code @ContextConfiguration} annotation.
* <p>The default implementation returns {@code null}, thus implying use * <p>The default implementation returns {@code null}, thus implying use
* of the <em>standard</em> default {@code ContextLoader} class name. * of the <em>standard</em> default {@code ContextLoader} class name.
* Can be overridden by subclasses. * Can be overridden by subclasses.
@ -144,7 +144,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
/** /**
* Returns a description suitable for an ignored test class if the test is * Returns a description suitable for an ignored test class if the test is
* disabled via {@code &#064;IfProfileValue} at the class-level, and * disabled via {@code @IfProfileValue} at the class-level, and
* otherwise delegates to the parent implementation. * otherwise delegates to the parent implementation.
* @see ProfileValueUtils#isTestEnabledInThisEnvironment(Class) * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Class)
*/ */
@ -158,7 +158,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
/** /**
* Check whether the test is enabled in the first place. This prevents * Check whether the test is enabled in the first place. This prevents
* classes with a non-matching {@code &#064;IfProfileValue} annotation * classes with a non-matching {@code @IfProfileValue} annotation
* from running altogether, even skipping the execution of * from running altogether, even skipping the execution of
* {@code prepareTestInstance()} {@code TestExecutionListener} * {@code prepareTestInstance()} {@code TestExecutionListener}
* methods. * methods.
@ -263,10 +263,10 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
* in order to include execution of {@link org.junit.Before &#064;Before} * in order to include execution of {@link org.junit.Before &#064;Before}
* and {@link org.junit.After &#064;After} methods within the timed * and {@link org.junit.After &#064;After} methods within the timed
* execution. Note that this differs from the default JUnit behavior of * execution. Note that this differs from the default JUnit behavior of
* executing {@code &#064;Before} and {@code &#064;After} methods * executing {@code @Before} and {@code @After} methods
* in the main thread while executing the actual test method in a separate * in the main thread while executing the actual test method in a separate
* thread. Thus, the end effect is that {@code &#064;Before} and * thread. Thus, the end effect is that {@code @Before} and
* {@code &#064;After} methods will be executed in the same thread as * {@code @After} methods will be executed in the same thread as
* the test method. As a consequence, JUnit-specified timeouts will work * the test method. As a consequence, JUnit-specified timeouts will work
* fine in combination with Spring transactions. Note that JUnit-specific * fine in combination with Spring transactions. Note that JUnit-specific
* timeouts still differ from Spring-specific timeouts in that the former * timeouts still differ from Spring-specific timeouts in that the former
@ -326,7 +326,7 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
/** /**
* Returns {@code true} if {@link Ignore &#064;Ignore} is present for * Returns {@code true} if {@link Ignore &#064;Ignore} is present for
* the supplied {@link FrameworkMethod test method} or if the test method is * the supplied {@link FrameworkMethod test method} or if the test method is
* disabled via {@code &#064;IfProfileValue}. * disabled via {@code @IfProfileValue}.
* @see ProfileValueUtils#isTestEnabledInThisEnvironment(Method, Class) * @see ProfileValueUtils#isTestEnabledInThisEnvironment(Method, Class)
*/ */
protected boolean isTestMethodIgnored(FrameworkMethod frameworkMethod) { protected boolean isTestMethodIgnored(FrameworkMethod frameworkMethod) {