Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/AnnotationsTestCase.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -105,9 +105,9 @@ public abstract strictfp class Annotatio * For example the implementation of the {@link org.opengis.metadata.citation.Citation} * interface is the {@link org.apache.sis.metadata.iso.citation.DefaultCitation} class. * - * @param <T> The type represented by the {@code type} argument. - * @param type The GeoAPI interface (never a {@link CodeList} or {@link Enum} type). - * @return The SIS implementation for the given interface. + * @param <T> the type represented by the {@code type} argument. + * @param type the GeoAPI interface (never a {@link CodeList} or {@link Enum} type). + * @return the SIS implementation for the given interface. */ protected abstract <T> Class<? extends T> getImplementation(Class<T> type); @@ -145,9 +145,9 @@ public abstract strictfp class Annotatio * <p>In SIS implementation, most wrappers are also {@link javax.xml.bind.annotation.adapters.XmlAdapter}. * But this is not a requirement.</p> * - * @param type The GeoAPI interface, {@link CodeList} or {@link Enum} type. - * @return The wrapper for the given type, or {@code null} if none. - * @throws ClassNotFoundException If a wrapper was expected but not found. + * @param type the GeoAPI interface, {@link CodeList} or {@link Enum} type. + * @return the wrapper for the given type, or {@code null} if none. + * @throws ClassNotFoundException if a wrapper was expected but not found. */ protected abstract Class<?> getWrapperFor(Class<?> type) throws ClassNotFoundException; @@ -169,10 +169,10 @@ public abstract strictfp class Annotatio * Returns the value of {@link #getWrapperFor(Class)} for the given class, or for a parent * of the given class if {@code getWrapperFor(Class)} threw {@code ClassNotFoundException}. * - * @param type The GeoAPI interface, {@link CodeList} or {@link Enum} type. - * @return The wrapper for the given type. {@link WrapperClass#type} is {@code null} if + * @param type the GeoAPI interface, {@link CodeList} or {@link Enum} type. + * @return the wrapper for the given type. {@link WrapperClass#type} is {@code null} if * no wrapper has been found. - * @throws ClassNotFoundException If a wrapper was expected but not found in the + * @throws ClassNotFoundException if a wrapper was expected but not found in the * given type neither in any of the parent classes. */ private WrapperClass getWrapperInHierarchy(final Class<?> type) throws ClassNotFoundException { @@ -196,9 +196,9 @@ public abstract strictfp class Annotatio * Returns the XML type for an element of the given type. For example in ISO 19139, * the XML type of {@code CI_Citation} is {@code CI_Citation_Type}. * - * @param type The GeoAPI interface. - * @param impl The implementation class. - * @return The name of the XML type for the given element, or {@code null} if none. + * @param type the GeoAPI interface. + * @param impl the implementation class. + * @return the name of the XML type for the given element, or {@code null} if none. * * @see #testImplementationAnnotations() */ @@ -219,10 +219,10 @@ public abstract strictfp class Annotatio * <p>The prefix for the given namespace will be fetched by * {@link Namespaces#getPreferredPrefix(String, String)}.</p> * - * @param impl The implementation class, {@link CodeList} or {@link Enum} type. - * @param specification The specification that define the type, or {@code null} if unspecified. - * @return The expected namespace. - * @throws IllegalArgumentException If the given specification is unknown to this method. + * @param impl the implementation class, {@link CodeList} or {@link Enum} type. + * @param specification the specification that define the type, or {@code null} if unspecified. + * @return the expected namespace. + * @throws IllegalArgumentException if the given specification is unknown to this method. */ protected String getExpectedNamespace(final Class<?> impl, final Specification specification) { switch (specification) { @@ -247,9 +247,9 @@ public abstract strictfp class Annotatio * The default implementation returns {@link UML#identifier()}. Subclasses shall override this method * when mismatches are known to exist between the UML and XML element names. * - * @param enclosing The GeoAPI interface which contains the property, or {@code null} if none. - * @param uml The UML element for which to get the corresponding XML element name. - * @return The XML element name for the given UML element. + * @param enclosing the GeoAPI interface which contains the property, or {@code null} if none. + * @param uml the UML element for which to get the corresponding XML element name. + * @return the XML element name for the given UML element. */ protected String getExpectedXmlElementName(final Class<?> enclosing, final UML uml) { return uml.identifier(); @@ -265,10 +265,10 @@ public abstract strictfp class Annotatio * <li>The namespace is equals to the {@linkplain #getExpectedNamespace expected namespace}.</li> * </ul> * - * @param namespace The namespace given by the {@code @XmlRootElement} or {@code @XmlElement} annotation. - * @param impl The implementation or wrapper class for which to get the package namespace. - * @param uml The {@code @UML} annotation, or {@code null} if none. - * @return The actual namespace (same as {@code namespace} if it was not {@value #DEFAULT}). + * @param namespace the namespace given by the {@code @XmlRootElement} or {@code @XmlElement} annotation. + * @param impl the implementation or wrapper class for which to get the package namespace. + * @param uml the {@code @UML} annotation, or {@code null} if none. + * @return the actual namespace (same as {@code namespace} if it was not {@value #DEFAULT}). */ private String assertExpectedNamespace(String namespace, final Class<?> impl, final UML uml) { assertNotNull("Missing namespace.", namespace); @@ -312,8 +312,8 @@ public abstract strictfp class Annotatio * Returns the namespace declared in the {@link XmlSchema} annotation of the given package, * or {@code null} if none. * - * @param p The package, or {@code null}. - * @return The namespace, or {@code null} if none. + * @param p the package, or {@code null}. + * @return the namespace, or {@code null} if none. */ private static String getNamespace(final Package p) { if (p != null) { @@ -332,8 +332,8 @@ public abstract strictfp class Annotatio * Returns the namespace declared in the {@link XmlRootElement} annotation of the given class, * or the package annotation if none is found in the class. * - * @param impl The implementation class, or {@code null}. - * @return The namespace, or {@code null} if none. + * @param impl the implementation class, or {@code null}. + * @return the namespace, or {@code null} if none. */ private static String getNamespace(final Class<?> impl) { if (impl == null) { @@ -355,10 +355,10 @@ public abstract strictfp class Annotatio * a field having the same name than the UML identifier. If no such field is found or * is annotated, returns {@code null}. * - * @param impl The implementation class. - * @param method The name of the getter method to search for. - * @param uml The UML annotation on the GeoAPI interface, or {@code null} if none. - * @return The {@code XmlElement}, or {@code null} if none. + * @param impl the implementation class. + * @param method the name of the getter method to search for. + * @param uml the UML annotation on the GeoAPI interface, or {@code null} if none. + * @return the {@code XmlElement}, or {@code null} if none. */ private static XmlElement getXmlElement(final Class<?> impl, final String method, final UML uml) { XmlElement element = null; @@ -388,7 +388,7 @@ public abstract strictfp class Annotatio * Returns {@code true} if the given method is a non-standard extension. * If {@code true}, then {@code method} does not need to have UML annotation. * - * @param method The method to verify. + * @param method the method to verify. * @return {@code true} if the given method is an extension, or {@code false} otherwise. * * @since 0.5 @@ -551,8 +551,10 @@ public abstract strictfp class Annotatio testingClass = type.getCanonicalName(); final Class<?> impl = getImplementation(type); if (impl == null) { - // Implementation existence are tested by 'testImplementationAnnotations()'. - // It is not the purpose of this test to verify again their existence. + /* + * Implementation existence are tested by 'testImplementationAnnotations()'. + * It is not the purpose of this test to verify again their existence. + */ continue; } testingClass = impl.getCanonicalName();
Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/Assume.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -47,9 +47,9 @@ public final strictfp class Assume exten * If desired, those grids need to be downloaded by the user and stored in the directory * identified by the {@code SIS_DATA} environment variable.</p> * - * @param type The directory where to search for the given file. - * @param file The file that needs to exist. - * @return The path to the given file. + * @param type the directory where to search for the given file. + * @param file the file that needs to exist. + * @return the path to the given file. */ public static Path assumeDataExists(final DataDirectory type, final String file) { assumeNotNull(System.getenv(DataDirectory.ENV)); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/DependsOn.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -41,7 +41,7 @@ public @interface DependsOn { /** * The other test classes on which this test depends. * - * @return The test dependencies. + * @return the test dependencies. */ Class<?>[] value(); } Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/DependsOnMethod.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/DependsOnMethod.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/DependsOnMethod.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/DependsOnMethod.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -42,7 +42,7 @@ public @interface DependsOnMethod { /** * The names of test methods on which the annotated method depends. * - * @return The names of test methods on which the annotated method depends. + * @return the names of test methods on which the annotated method depends. */ String[] value(); } Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/LoggingWatcher.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -83,7 +83,7 @@ public final strictfp class LoggingWatch /** * Creates a new watcher for the given logger. * - * @param logger The logger to watch. + * @param logger the logger to watch. */ public LoggingWatcher(final Logger logger) { this.logger = logger; @@ -92,7 +92,7 @@ public final strictfp class LoggingWatch /** * Creates a new watcher for the given logger. * - * @param logger The name of logger to watch. + * @param logger the name of logger to watch. */ public LoggingWatcher(final String logger) { this.logger = Logger.getLogger(logger); @@ -103,7 +103,7 @@ public final strictfp class LoggingWatch * for the log messages before the tests are run. This installation will cause the * {@link #isLoggable(LogRecord)} method to be invoked when a message is logged. * - * @param description A description of the JUnit test which is starting. + * @param description a description of the JUnit test which is starting. * * @see #isLoggable(LogRecord) */ @@ -117,7 +117,7 @@ public final strictfp class LoggingWatch * Invoked when a test method finishes (whether passing or failing) * This method removes the filter which had been set for testing purpose. * - * @param description A description of the JUnit test that finished. + * @param description a description of the JUnit test that finished. */ @Override public final void finished(final FrameworkMethod description) { @@ -141,8 +141,8 @@ public final strictfp class LoggingWatch * This method is used instead of {@link #assertNextLogContains(String...)} when a log message may or * may not be emitted during a test, depending on circumstances that the test method does not control. * - * @param keywords The keywords that are expected to exist in the next log message - * if that log message has been emitted. + * @param keywords the keywords that are expected to exist in the next log message + * if that log message has been emitted. */ public void skipNextLogIfContains(final String... keywords) { final String message = messages.peek(); @@ -162,7 +162,7 @@ public final strictfp class LoggingWatch * Verifies that the next logging message contains the given keywords. * Each call of this method advances to the next log message. * - * @param keywords The keywords that are expected to exist in the next log message. + * @param keywords the keywords that are expected to exist in the next log message. */ public void assertNextLogContains(final String... keywords) { if (messages.isEmpty()) { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestCase.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -186,7 +186,7 @@ public abstract strictfp class TestCase * case. */ static void clearBuffer() { - synchronized (buffer) { // This is the lock used by the 'out' PrintWriter. + synchronized (buffer) { // This is the lock used by the 'out' PrintWriter. out.flush(); buffer.getBuffer().setLength(0); } @@ -204,7 +204,7 @@ public abstract strictfp class TestCase static void flushOutput() { System.out.flush(); System.err.flush(); - synchronized (buffer) { // This is the lock used by the 'out' PrintWriter. + synchronized (buffer) { // This is the lock used by the 'out' PrintWriter. out.flush(); /* * Get the text content and remove the trailing spaces Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -85,7 +85,7 @@ public abstract strictfp class TestSuite * * <p>This check is disabled if {@link #skipCheckForMissingTests} is {@code true}.</p> * - * @param suite The suite for which to check for missing tests. + * @param suite the suite for which to check for missing tests. */ protected static void assertNoMissingTest(final Class<? extends TestSuite> suite) { if (skipCheckForMissingTests) return; @@ -131,7 +131,9 @@ public abstract strictfp class TestSuite assertTrue(declared.removeAll(tests)); fail("Classes defined twice in " + suite.getSimpleName() + ": " + declared); } - // Ignore classes that are not really test, like "APIVerifier". + /* + * Ignore classes that are not really test, like "APIVerifier". + */ for (final Iterator<Class<?>> it=tests.iterator(); it.hasNext();) { if (!it.next().getName().endsWith(CLASSNAME_SUFFIX)) { it.remove(); @@ -200,7 +202,7 @@ public abstract strictfp class TestSuite * } * } * - * @param suite The suite for which to verify test order. + * @param suite the suite for which to verify test order. */ protected static void verifyTestList(final Class<? extends TestSuite> suite) { verifyTestList(suite, BASE_TEST_CLASSES); @@ -212,8 +214,8 @@ public abstract strictfp class TestSuite * the rare cases where some test cases need to extend something else than geoapi-conformance * or Apache SIS test class. * - * @param suite The suite for which to verify test order. - * @param baseTestClasses The set of base classes that all test cases are expected to extends. + * @param suite the suite for which to verify test order. + * @param baseTestClasses the set of base classes that all test cases are expected to extends. */ protected static void verifyTestList(final Class<? extends TestSuite> suite, final Class<?>[] baseTestClasses) { final Class<?>[] testCases = suite.getAnnotation(Suite.SuiteClasses.class).value(); @@ -246,7 +248,7 @@ public abstract strictfp class TestSuite * <p>Since this method stops SIS daemon threads, the SIS library shall not be used anymore after * this method execution.</p> * - * @throws Exception If an error occurred during unregistration of the supervisor MBean or resource disposal. + * @throws Exception if an error occurred during unregistration of the supervisor MBean or resource disposal. */ @AfterClass @SuppressWarnings("UseOfSystemOutOrSystemErr") Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLComparator.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -87,7 +87,7 @@ public strictfp class XMLComparator { private static final Map<String, String> PREFIX_URL = new HashMap<>(16); static { final Map<String,String> map = PREFIX_URL; - map.put("xmlns", "http://www.w3.org/2000/xmlns";); // No trailing slash. + map.put("xmlns", "http://www.w3.org/2000/xmlns";); // No trailing slash. map.put("xlink", Namespaces.XLINK); map.put("xsi", Namespaces.XSI); map.put("gml", Namespaces.GML); @@ -190,11 +190,11 @@ public strictfp class XMLComparator { * <li>{@link String}: The string content is parsed directly as a XML document.</li> * </ul> * - * @param expected The expected XML document. - * @param actual The XML document to compare. - * @throws IOException If the stream can not be read. - * @throws ParserConfigurationException If a {@link DocumentBuilder} can not be created. - * @throws SAXException If an error occurred while parsing the XML document. + * @param expected the expected XML document. + * @param actual the XML document to compare. + * @throws IOException if the stream can not be read. + * @throws ParserConfigurationException if a {@link DocumentBuilder} can not be created. + * @throws SAXException if an error occurred while parsing the XML document. */ public XMLComparator(final Object expected, final Object actual) throws IOException, ParserConfigurationException, SAXException @@ -288,8 +288,8 @@ public strictfp class XMLComparator { * Then this method invokes itself recursively for every children, * by a call to {@link #compareChildren(Node, Node)}. * - * @param expected The expected node. - * @param actual The node to compare. + * @param expected the expected node. + * @param actual the node to compare. */ protected void compareNode(final Node expected, final Node actual) { if (expected == null || actual == null) { @@ -329,8 +329,8 @@ public strictfp class XMLComparator { * * <p>Subclasses can override this method if they need a different processing.</p> * - * @param expected The expected node. - * @param actual The actual node. + * @param expected the expected node. + * @param actual the actual node. */ protected void compareTextNode(final Text expected, final Node actual) { assertInstanceOf("Actual node is not of the expected type.", Text.class, actual); @@ -346,8 +346,8 @@ public strictfp class XMLComparator { * * <p>Subclasses can override this method if they need a different processing.</p> * - * @param expected The expected node. - * @param actual The actual node. + * @param expected the expected node. + * @param actual the actual node. */ protected void compareCDATASectionNode(final CDATASection expected, final Node actual) { assertInstanceOf("Actual node is not of the expected type.", CDATASection.class, actual); @@ -363,8 +363,8 @@ public strictfp class XMLComparator { * * <p>Subclasses can override this method if they need a different processing.</p> * - * @param expected The expected node. - * @param actual The actual node. + * @param expected the expected node. + * @param actual the actual node. */ protected void compareCommentNode(final Comment expected, final Node actual) { assertInstanceOf("Actual node is not of the expected type.", Comment.class, actual); @@ -380,8 +380,8 @@ public strictfp class XMLComparator { * * <p>Subclasses can override this method if they need a different processing.</p> * - * @param expected The expected node. - * @param actual The actual node. + * @param expected the expected node. + * @param actual the actual node. */ protected void compareProcessingInstructionNode(final ProcessingInstruction expected, final Node actual) { assertInstanceOf("Actual node is not of the expected type.", ProcessingInstruction.class, actual); @@ -397,8 +397,8 @@ public strictfp class XMLComparator { * * <p>Subclasses can override this method if they need a different processing.</p> * - * @param expected The expected node. - * @param actual The actual node. + * @param expected the expected node. + * @param actual the actual node. */ protected void compareAttributeNode(final Attr expected, final Node actual) { assertInstanceOf("Actual node is not of the expected type.", Attr.class, actual); @@ -414,8 +414,8 @@ public strictfp class XMLComparator { * * <p>Subclasses can override this method if they need a different processing.</p> * - * @param expected The expected node. - * @param actual The node for which to compare children. + * @param expected the expected node. + * @param actual the node for which to compare children. */ protected void compareChildren(Node expected, Node actual) { expected = firstNonEmptySibling(expected.getFirstChild()); @@ -434,8 +434,8 @@ public strictfp class XMLComparator { * Compares the names and namespaces of the given node. * Subclasses can override this method if they need a different comparison. * - * @param expected The node having the expected name and namespace. - * @param actual The node to compare. + * @param expected the node having the expected name and namespace. + * @param actual the node to compare. */ protected void compareNames(final Node expected, final Node actual) { assertPropertyEquals("namespace", expected.getNamespaceURI(), actual.getNamespaceURI(), expected, actual); @@ -458,8 +458,8 @@ public strictfp class XMLComparator { * the extra attributes are ignored. This may change in a future version if it appears to be * a problem in practice.</p> * - * @param expected The node having the expected attributes. - * @param actual The node to compare. + * @param expected the node having the expected attributes. + * @param actual the node to compare. */ @SuppressWarnings("null") protected void compareAttributes(final Node expected, final Node actual) { @@ -510,10 +510,10 @@ public strictfp class XMLComparator { /** * Returns {@code true} if the given node or attribute shall be ignored. * - * @param ignored The set of node or attribute fully qualified names to ignore. - * @param ns The node or attribute namespace, or {@code null}. - * @param name The node or attribute name. - * @return {@coce true} if the node or attribute shall be ignored. + * @param ignored the set of node or attribute fully qualified names to ignore. + * @param ns the node or attribute namespace, or {@code null}. + * @param name the node or attribute name. + * @return {@coce true} if the node or attribute shall be ignored. */ private static boolean isIgnored(final Set<String> ignored, String ns, final String name) { if (!ignored.isEmpty()) { @@ -567,8 +567,8 @@ public strictfp class XMLComparator { * if none. This method first check the given node, then check all siblings. Attribute nodes are * ignored. * - * @param node The node to check, or {@code null}. - * @return The first node having a non-empty text content, or {@code null} if none. + * @param node the node to check, or {@code null}. + * @return the first node having a non-empty text content, or {@code null} if none. */ private Node firstNonEmptySibling(Node node) { for (; node != null; node = node.getNextSibling()) { @@ -604,8 +604,8 @@ public strictfp class XMLComparator { /** * Verifies that the text content of the given nodes are equal. * - * @param expected The node that contains the expected text. - * @param actual The node that contains the actual text to verify. + * @param expected the node that contains the expected text. + * @param actual the node that contains the actual text to verify. */ protected void assertTextContentEquals(final Node expected, final Node actual) { assertPropertyEquals("textContent", expected.getTextContent(), actual.getTextContent(), expected, actual); @@ -615,11 +615,11 @@ public strictfp class XMLComparator { * Verifies that the given property (text or number) are equal, ignoring spaces. If they are * not equal, then an error message is formatted using the given property name and nodes. * - * @param propertyName The name of the property being compared (typically "name", "namespace", etc.). - * @param expected The property value from the expected node to compare. - * @param actual The property value to compare to the expected one. - * @param expectedNode The node from which the expected property has been fetched. - * @param actualNode The node being compared to the expected node. + * @param propertyName the name of the property being compared (typically "name", "namespace", etc.). + * @param expected the property value from the expected node to compare. + * @param actual the property value to compare to the expected one. + * @param expectedNode the node from which the expected property has been fetched. + * @param actualNode the node being compared to the expected node. */ protected void assertPropertyEquals(final String propertyName, Comparable<?> expected, Comparable<?> actual, final Node expectedNode, final Node actualNode) @@ -671,9 +671,9 @@ public strictfp class XMLComparator { * Formats an error message for a node mismatch. The message will contain a string * representation of the expected and actual node. * - * @param expected The expected node. - * @param result The actual node. - * @return An error message containing the expected and actual node. + * @param expected the expected node. + * @param result the actual node. + * @return an error message containing the expected and actual node. */ protected String formatErrorMessage(final Node expected, final Node result) { final String lineSeparator = System.lineSeparator(); @@ -685,7 +685,7 @@ public strictfp class XMLComparator { /** * Formats in the given buffer an error message for a node mismatch. * - * @param lineSeparator The platform-specific line separator. + * @param lineSeparator the platform-specific line separator. */ private static void formatErrorMessage(final StringBuilder buffer, final Node expected, final Node result, final String lineSeparator) @@ -705,10 +705,10 @@ public strictfp class XMLComparator { * * <p>This method formats only a summary if the hierarchy is equals to the expected one.</p> * - * @param buffer The buffer in which to append the formatted hierarchy. - * @param node The node for which to format the parents. - * @param expected The expected hierarchy, or {@code null} if unknown. - * @param lineSeparator The platform-specific line separator. + * @param buffer the buffer in which to append the formatted hierarchy. + * @param node the node for which to format the parents. + * @param expected the expected hierarchy, or {@code null} if unknown. + * @param lineSeparator the platform-specific line separator. */ private static List<String> formatHierarchy(final StringBuilder buffer, Node node, final List<String> expected, final String lineSeparator) @@ -741,9 +741,9 @@ public strictfp class XMLComparator { * Appends to the given buffer a string representation of the given node. * The string representation is terminated by a line feed. * - * @param buffer The buffer in which to append the formatted node. - * @param node The node to format. - * @param lineSeparator The platform-specific line separator. + * @param buffer the buffer in which to append the formatted node. + * @param node the node to format. + * @param lineSeparator the platform-specific line separator. */ @SuppressWarnings("null") private static void formatNode(final StringBuilder buffer, final Node node, final String lineSeparator) { @@ -751,8 +751,10 @@ public strictfp class XMLComparator { buffer.append("(no node)").append(lineSeparator); return; } - // Format the text content, together with the text content of the - // child if there is exactly one child. + /* + * Format the text content, together with the text content of the + * child if there is exactly one child. + */ final String ns = node.getNamespaceURI(); if (ns != null) { buffer.append(ns).append(':'); @@ -767,8 +769,9 @@ public strictfp class XMLComparator { hasText = appendTextContent(buffer, children.item(0)); } } - - // Format the number of children and the number of attributes, if any. + /* + * Format the number of children and the number of attributes, if any. + */ String separator = " ("; if (numChildren != 0) { buffer.append(separator).append("nbChild=").append(numChildren); @@ -786,8 +789,9 @@ public strictfp class XMLComparator { if (!separator.equals(" (")) { buffer.append(')'); } - - // Format all attributes, if any. + /* + * Format all attributes, if any. + */ separator = " ["; for (int i=0; i<numAtts; i++) { buffer.append(separator).append(atts.item(i)); @@ -804,8 +808,8 @@ public strictfp class XMLComparator { * or related type ({@link CDATASection}, {@link Comment} or {@link ProcessingInstruction}). * Otherwise this method does nothing. * - * @param buffer The buffer in which to append text content. - * @param node The node for which to append text content. + * @param buffer the buffer in which to append text content. + * @param node the node for which to append text content. * @return {@code true} if a text has been formatted. */ private static boolean appendTextContent(final StringBuilder buffer, final Node node) { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/XMLTestCase.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -118,8 +118,8 @@ public abstract strictfp class XMLTestCa * We intentionally use a timezone different than UTC in order to have an error of one or two hours * if a code fails to take timezone offset in account.</div> * - * @return The shared (un)marshaller pool. - * @throws JAXBException If an error occurred while creating the JAXB marshaller. + * @return the shared (un)marshaller pool. + * @throws JAXBException if an error occurred while creating the JAXB marshaller. */ protected static synchronized MarshallerPool getMarshallerPool() throws JAXBException { if (defaultPool == null) { @@ -134,9 +134,9 @@ public abstract strictfp class XMLTestCa /** * Initializes the {@link #context} to the given locale and timezone. * - * @param marshal {@code true} for setting the {@link Context#MARSHALLING} flag. - * @param locale The locale, or {@code null} for the default. - * @param timezone The timezone, or {@code null} for the default. + * @param marshal {@code true} for setting the {@link Context#MARSHALLING} flag. + * @param locale the locale, or {@code null} for the default. + * @param timezone the timezone, or {@code null} for the default. * * @see #clearContext() */ @@ -166,8 +166,8 @@ public abstract strictfp class XMLTestCa * If the resource is not found in that package, then this method searches in the parent classes. * The intend is to allow some test classes to be overridden in different modules. * - * @param filename The name of the XML file. - * @return The URL to the given XML file. + * @param filename the name of the XML file. + * @return the URL to the given XML file. */ private URL getResource(final String filename) { Class<?> c = getClass(); @@ -182,11 +182,11 @@ public abstract strictfp class XMLTestCa /** * Marshals the given object and ensure that the result is equals to the content of the given file. * - * @param filename The name of the XML file in the package of the final subclass of {@code this}. - * @param object The object to marshal. - * @param ignoredAttributes The fully-qualified names of attributes to ignore - * (typically {@code "xmlns:*"} and {@code "xsi:schemaLocation"}). - * @throws JAXBException If an error occurred during marshalling. + * @param filename the name of the XML file in the package of the final subclass of {@code this}. + * @param object the object to marshal. + * @param ignoredAttributes the fully-qualified names of attributes to ignore + * (typically {@code "xmlns:*"} and {@code "xsi:schemaLocation"}). + * @throws JAXBException if an error occurred during marshalling. * * @see #unmarshalFile(Class, String) */ @@ -200,13 +200,13 @@ public abstract strictfp class XMLTestCa * Marshals the given object and ensure that the result is equals to the content of the given file, * within a tolerance threshold for numerical values. * - * @param filename The name of the XML file in the package of the final subclass of {@code this}. - * @param object The object to marshal. - * @param tolerance The tolerance threshold for comparison of numerical values. - * @param ignoredNodes The fully-qualified names of the nodes to ignore, or {@code null} if none. - * @param ignoredAttributes The fully-qualified names of attributes to ignore - * (typically {@code "xmlns:*"} and {@code "xsi:schemaLocation"}). - * @throws JAXBException If an error occurred during marshalling. + * @param filename the name of the XML file in the package of the final subclass of {@code this}. + * @param object the object to marshal. + * @param tolerance the tolerance threshold for comparison of numerical values. + * @param ignoredNodes the fully-qualified names of the nodes to ignore, or {@code null} if none. + * @param ignoredAttributes the fully-qualified names of attributes to ignore + * (typically {@code "xmlns:*"} and {@code "xsi:schemaLocation"}). + * @throws JAXBException if an error occurred during marshalling. * * @see #unmarshalFile(Class, String) * @@ -221,9 +221,9 @@ public abstract strictfp class XMLTestCa /** * Marshals the given object using the {@linkplain #getMarshallerPool() test marshaller pool}. * - * @param object The object to marshal. - * @return The marshalled object. - * @throws JAXBException If an error occurred while marshalling the object. + * @param object the object to marshal. + * @return the marshalled object. + * @throws JAXBException if an error occurred while marshalling the object. * * @see #unmarshal(Class, String) */ @@ -238,10 +238,10 @@ public abstract strictfp class XMLTestCa /** * Marshals the given object using the given marshaler. * - * @param marshaller The marshaller to use. - * @param object The object to marshal. - * @return The marshalled object. - * @throws JAXBException If an error occurred while marshalling the object. + * @param marshaller the marshaller to use. + * @param object the object to marshal. + * @return the marshalled object. + * @throws JAXBException if an error occurred while marshalling the object. * * @see #unmarshal(Unmarshaller, String) */ @@ -261,11 +261,11 @@ public abstract strictfp class XMLTestCa * The resource is obtained by a call to {@code getClass().getResource(filename)}, which implies that the file * shall be in the same package than the subclass of {@code this}. * - * @param <T> Compile-time type of {@code type} argument. - * @param type The expected type of the unmarshalled object. - * @param filename The name of the XML file in the package of the final subclass of {@code this}. - * @return The object unmarshalled from the given file. - * @throws JAXBException If an error occurred during unmarshalling. + * @param <T> compile-time type of {@code type} argument. + * @param type the expected type of the unmarshalled object. + * @param filename the name of the XML file in the package of the final subclass of {@code this}. + * @return the object unmarshalled from the given file. + * @throws JAXBException if an error occurred during unmarshalling. * * @see #assertMarshalEqualsFile(String, Object, String...) */ @@ -281,11 +281,11 @@ public abstract strictfp class XMLTestCa /** * Unmarshals the given object using the {@linkplain #getMarshallerPool() test marshaller pool}. * - * @param <T> Compile-time type of {@code type} argument. - * @param type The expected type of the unmarshalled object. - * @param xml The XML representation of the object to unmarshal. - * @return The unmarshalled object. - * @throws JAXBException If an error occurred while unmarshalling the XML. + * @param <T> compile-time type of {@code type} argument. + * @param type the expected type of the unmarshalled object. + * @param xml the XML representation of the object to unmarshal. + * @return the unmarshalled object. + * @throws JAXBException if an error occurred while unmarshalling the XML. * * @see #marshal(Object) */ @@ -301,10 +301,10 @@ public abstract strictfp class XMLTestCa /** * Unmarshals the given XML using the given unmarshaler. * - * @param unmarshaller The unmarshaller to use. - * @param xml The XML representation of the object to unmarshal. - * @return The unmarshalled object. - * @throws JAXBException If an error occurred while unmarshalling the XML. + * @param unmarshaller the unmarshaller to use. + * @param xml the XML representation of the object to unmarshal. + * @return the unmarshalled object. + * @throws JAXBException if an error occurred while unmarshalling the XML. * * @see #marshal(Marshaller, Object) */ @@ -318,8 +318,8 @@ public abstract strictfp class XMLTestCa * Parses the date for the given string using the {@code "yyyy-MM-dd HH:mm:ss"} pattern * and the time zone of the XML (un)marshallers used for the tests. * - * @param date The date as a {@link String}. - * @return The date as a {@link Date}. + * @param date the date as a {@link String}. + * @return the date as a {@link Date}. */ protected static Date xmlDate(final String date) { ArgumentChecks.ensureNonNull("date", date); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/foreigner/SerializableTableColumn.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -25,7 +25,7 @@ import org.apache.sis.util.collection.Ta /** * For testing {@link TableColumn} deserialization. * - * @param <V> Base type of all values in the column identified by this instance. + * @param <V> base type of all values in the column identified by this instance. * * @author Martin Desruisseaux (Geomatys) * @since 0.3 Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/CoordinateSystemAxisMock.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -44,8 +44,8 @@ public strictfp class CoordinateSystemAx /** * Creates a new axis for the given name. * - * @param name The axis name. - * @param abbreviation The axis abbreviation. + * @param name the axis name. + * @param abbreviation the axis abbreviation. */ public CoordinateSystemAxisMock(final String name, final String abbreviation) { super(name); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/IdentifiedObjectMock.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -61,7 +61,7 @@ public strictfp class IdentifiedObjectMo * Returns all properties defined in this object, * for the convenience of {@link #equals(Object)} and {@link #hashCode()}. * - * @return The properties to use in hash code computations and in comparisons. + * @return the properties to use in hash code computations and in comparisons. */ protected Object[] properties() { return new Object[] {code, alias}; @@ -78,7 +78,7 @@ public strictfp class IdentifiedObjectMo * Creates an identified object of the given name. * Callers are free to assign new value to the {@link #alias} field directly. * - * @param code The initial {@link #getCode()} value, or {@code null} if none. + * @param code the initial {@link #getCode()} value, or {@code null} if none. */ public IdentifiedObjectMock(final String code) { this.code = code; @@ -88,8 +88,8 @@ public strictfp class IdentifiedObjectMo * Creates an identified object of the given alias. * Callers are free to assign new value to the {@link #alias} field directly. * - * @param code The initial {@link #getCode()} value, or {@code null} if none. - * @param alias The initial {@link #alias} value, or {@code null} if none. + * @param code the initial {@link #getCode()} value, or {@code null} if none. + * @param alias the initial {@link #alias} value, or {@code null} if none. */ public IdentifiedObjectMock(final String code, final GenericName alias) { this.code = code; @@ -99,7 +99,7 @@ public strictfp class IdentifiedObjectMo /** * Returns the object name, or {@code null} if none. * - * @return The name of this object, or {@code null} if none. + * @return the name of this object, or {@code null} if none. */ @Override public final ReferenceIdentifier getName() { @@ -109,7 +109,7 @@ public strictfp class IdentifiedObjectMo /** * Returns the code supplied at construction time, or {@code null} if none. * - * @return The object code, or {@code null}. + * @return the object code, or {@code null}. */ @Override public final String getCode() { @@ -129,7 +129,7 @@ public strictfp class IdentifiedObjectMo /** * Returns the namespace version ({@code null} for now). * - * @return The namespace version. + * @return the namespace version. */ @Override public final String getVersion() { @@ -139,7 +139,7 @@ public strictfp class IdentifiedObjectMo /** * Returns the authority that define the object ({@code null} for now). * - * @return The defining authority. + * @return the defining authority. */ @Override public final Citation getAuthority() { @@ -159,7 +159,7 @@ public strictfp class IdentifiedObjectMo /** * Returns the identifiers (currently null). * - * @return The identifiers of this object. + * @return the identifiers of this object. */ @Override public final Set<ReferenceIdentifier> getIdentifiers() { @@ -169,7 +169,7 @@ public strictfp class IdentifiedObjectMo /** * Returns the remarks (currently null). * - * @return The remarks associated to this object. + * @return the remarks associated to this object. */ @Override public final InternationalString getRemarks() { @@ -179,8 +179,8 @@ public strictfp class IdentifiedObjectMo /** * Returns the WKT representation (currently none). * - * @return The WLK representation of this object. - * @throws UnsupportedOperationException If there is no WKT representation. + * @return the WKT representation of this object. + * @throws UnsupportedOperationException if there is no WKT representation. */ @Override public final String toWKT() throws UnsupportedOperationException { @@ -198,7 +198,7 @@ public strictfp class IdentifiedObjectMo /** * Returns a hash code value for this object. * - * @return A hash code value. + * @return a hash code value. */ @Override public final int hashCode() { @@ -208,7 +208,7 @@ public strictfp class IdentifiedObjectMo /** * Compares this object with the given object for equality. * - * @param object The other object, or {@code null}. + * @param object the other object, or {@code null}. * @return {@code true} if both objects are equal. */ @Override Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/test/mock/VerticalCRSMock.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -95,11 +95,11 @@ public final strictfp class VerticalCRSM /** * Creates a new vertical CRS for the given name. * - * @param name The CRS, CS, datum and axis name. - * @param up {@code true} if the axis direction is up, or {@code false} if down. - * @param unit The unit of measurement. - * @param minimumValue The minium value. - * @param maximumValue The maximum value. + * @param name the CRS, CS, datum and axis name. + * @param up {@code true} if the axis direction is up, or {@code false} if down. + * @param unit the unit of measurement. + * @param minimumValue the minium value. + * @param maximumValue the maximum value. */ private VerticalCRSMock(final String name, VerticalDatumType type, final double minimumValue, final double maximumValue, final Unit<?> unit, final boolean up) Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/ClassesTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -188,16 +188,16 @@ public final strictfp class ClassesTest /** * Tests the {@link Classes#boundOfParameterizedProperty(Field)} method. * - * @throws NoSuchFieldException Should never occur. - * @throws NoSuchMethodException Should never occur. + * @throws NoSuchFieldException if there is an error in a field name. + * @throws NoSuchMethodException if there is an error in a method name. */ @Test public void testBoundOfParameterizedProperty() throws NoSuchFieldException, NoSuchMethodException { final Class<?>[] g = null; final Class<?>[] s = new Class<?>[] {Set.class}; final Class<Parameterized> c = Parameterized.class; - assertNull( boundOfParameterizedProperty(c.getMethod("getter0", g))); - assertNull( boundOfParameterizedProperty(c.getMethod("setter0", s))); + assertNull( boundOfParameterizedProperty(c.getMethod("getter0", g))); + assertNull( boundOfParameterizedProperty(c.getMethod("setter0", s))); assertEquals(Long .class, boundOfParameterizedProperty(c.getField ("attrib2" ))); assertEquals(Integer .class, boundOfParameterizedProperty(c.getMethod("getter1", g))); assertEquals(Byte .class, boundOfParameterizedProperty(c.getMethod("getter2", g))); @@ -215,22 +215,21 @@ public final strictfp class ClassesTest @SuppressWarnings("rawtypes") private static final class Parameterized { public Set<? extends Long> attrib2 = null; - public Set getter0() {return null;} // Intentionnaly unparameterized. + public Set getter0() {return null;} // Intentionnaly unparameterized. public Set< Integer> getter1() {return null;} public Set<? extends Byte> getter2() {return null;} public Set<? super Float> getter3() {return null;} public Set< short[]> getter4() {return null;} public Set<Comparable<?>> getter5() {return null;} - public void setter0(Set dummy) {} // Intentionnaly unparameterized. + public void setter0(Set dummy) {} // Intentionnaly unparameterized. public void setter1(Set< String> dummy) {} public void setter2(Set<? extends Short> dummy) {} public void setter3(Set<? super Double> dummy) {} } /** - * Tests the {@link Classes#getShortName(Class)}, in particular the example values - * given in the javadoc. + * Tests the {@link Classes#getShortName(Class)}, in particular the example values given in the javadoc. */ @Test public void testGetShortName() { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CacheTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -66,7 +66,7 @@ public final strictfp class CacheTest ex * Tests {@link Cache} as a {@link java.util.Map} using weak references. In this test, we * have to keep in mind than some elements in {@code weakMap} may disappear at any time. * - * @throws InterruptedException If the test has been interrupted. + * @throws InterruptedException if the test has been interrupted. * * @see WeakValueHashMapTest#testWeakReferences() */ @@ -103,7 +103,7 @@ public final strictfp class CacheTest ex * Tests the cache when a thread is blocking a second one. * The second thread tries to write a value while the first thread holds the lock. * - * @throws InterruptedException If the test has been interrupted. + * @throws InterruptedException if the test has been interrupted. */ @Test @DependsOnMethod("testPutAndUnlock") @@ -184,8 +184,8 @@ public final strictfp class CacheTest ex * Validates the entries created by the {@link #stress()} test. The check performed in * this method shall obviously be consistent with the values created by {@code stress()}. * - * @param name The name of the value being measured. - * @param cache The cache to validate. + * @param name the name of the value being measured. + * @param cache the cache to validate. * @return Statistics on the key values of the given map. */ private static Statistics validateStressEntries(final String name, final Map<Integer,Integer> cache) { @@ -203,7 +203,7 @@ public final strictfp class CacheTest ex * Starts many threads writing in the same cache, with a high probability that two threads * ask for the same key in some occasions. * - * @throws InterruptedException If the test has been interrupted. + * @throws InterruptedException if the test has been interrupted. */ @Test @Performance @@ -228,12 +228,13 @@ public final strictfp class CacheTest ex } /** - * Put random values in the map. + * Puts random values in the map. */ + @SuppressWarnings({"UnnecessaryBoxing", "CallToThreadYield", "NumberEquality"}) @Override public void run() { for (int i=0; i<count; i++) { final Integer key = i; - final Integer expected = new Integer(i * i); // We really want new instance. + final Integer expected = new Integer(i * i); // We really want new instance. final Integer value; try { value = cache.getOrCreate(key, new Callable<Integer>() { @@ -248,9 +249,9 @@ public final strictfp class CacheTest ex } continue; } - if (expected == value) { // Identity comparison (not value comparison). + if (expected == value) { // Identity comparison (not value comparison). addCount++; - yield(); // Gives a chance to other threads. + yield(); // Gives a chance to other threads. } } } Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/CodeListSetTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -54,7 +54,7 @@ public final strictfp class CodeListSetT assertTrue(c.isEmpty()); switch (n) { default: throw new AssertionError(n); - case 4: assertTrue(c.add(FUTURE)); // Fallthrough everywhere. + case 4: assertTrue(c.add(FUTURE)); // Fallthrough everywhere. case 3: assertTrue(c.add(UP)); case 2: assertTrue(c.add(EAST)); case 1: assertTrue(c.add(NORTH)); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedMapTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -82,7 +82,7 @@ public final strictfp class DerivedMapTe assertEquals("before remove(300)", 8, source.get (3 ).intValue()); assertEquals(" remove(300)", 80, tested.remove (300).intValue()); assertFalse ("after remove(300)", source.containsKey(3 )); - assertEquals(" remove(300)", 80, target.remove (300).intValue()); // For comparison purpose. + assertEquals(" remove(300)", 80, target.remove (300).intValue()); // For comparison purpose. assertEquals(target, tested); assertEquals("before put(900)", 1, source.get(9 ).intValue()); @@ -119,8 +119,8 @@ public final strictfp class DerivedMapTe /** * Multiplies the given value by 10, except value {@value #EXCLUDED}. * - * @param value The value to multiply. - * @return The multiplied value, or {@code null}. + * @param value the value to multiply. + * @return the multiplied value, or {@code null}. */ @Override public Integer apply(final Integer value) { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/DerivedSetTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -56,18 +56,18 @@ public final strictfp class DerivedSetTe assertEquals(target.size(), tested.size()); assertEquals(target, tested); - assertFalse("contains(2)", tested.contains(2 )); // Original value - assertTrue ("contains(20)", tested.contains(20)); // Derived value + assertFalse("contains(2)", tested.contains(2 )); // Original value + assertTrue ("contains(20)", tested.contains(20)); // Derived value assertTrue ("before remove(70)", source.contains(7 )); assertTrue ( "remove(70)", tested.remove (70)); assertFalse( "after remove(70)", source.contains(7 )); - assertTrue ( "remove(70)", target.remove(70)); // For comparison purpose. + assertTrue ( "remove(70)", target.remove (70)); // For comparison purpose. assertEquals(target, tested); assertFalse("before add(30)", source.contains(3 )); assertTrue ( "add(30)", tested.add (30)); assertTrue ( "after add(30)", source.contains(3 )); - assertTrue ( "add(30)", target.add (30)); // For comparison purpose. + assertTrue ( "add(30)", target.add (30)); // For comparison purpose. assertEquals(target, tested); } @@ -97,8 +97,8 @@ public final strictfp class DerivedSetTe /** * Multiply the given value by 10, except value {@value #EXCLUDED}. * - * @param value The value to multiply. - * @return The multiplied value, or {@code null}. + * @param value the value to multiply. + * @return the multiplied value, or {@code null}. */ @Override public Integer apply(final Integer value) { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/IntegerListTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -47,7 +47,7 @@ public final strictfp class IntegerListT /** * Writes values and read them again for making sure they are the expected ones. * - * @param maximalValue The maximal value allowed. + * @param maximalValue the maximal value allowed. */ private void testReadWrite(final int maximalValue) { final Random random = TestUtilities.createRandomNumberGenerator(); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/TreeTablesTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -47,8 +47,8 @@ public final strictfp class TreeTablesTe * The {@code concatenateSingletons(…)} example documented in the {@link TreeTables} class javadoc. * This simple code assumes that the children collection in the given node is a {@link List}. * - * @param node The root of the node to simplify. - * @return The root of the simplified tree. May be the given {@code node} or a child. + * @param node the root of the node to simplify. + * @return the root of the simplified tree. May be the given {@code node} or a child. */ public static TreeTable.Node concatenateSingletons(final TreeTable.Node node) { final List<TreeTable.Node> children = (List<TreeTable.Node>) node.getChildren(); @@ -70,7 +70,7 @@ public final strictfp class TreeTablesTe /** * Tests the {@link #concatenateSingletons(TreeTable.Node)} example. * - * @throws ParseException Should never happen. + * @throws ParseException if parsing of test tree failed. */ @Test public void testConcatenateSingletons() throws ParseException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakHashSetTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -95,7 +95,7 @@ public final strictfp class WeakHashSetT * Tests the {@link WeakHashSet} using weak references. In this test, we have to keep * in mind that some elements in {@code weakSet} may disappear at any time! * - * @throws InterruptedException If the test has been interrupted. + * @throws InterruptedException if the test has been interrupted. */ @Test @DependsOnMethod("testStrongReferences") @@ -105,7 +105,8 @@ public final strictfp class WeakHashSetT final WeakHashSet<Integer> weakSet = new WeakHashSet<>(Integer.class); final HashSet<Integer> strongSet = new HashSet<>(); for (int i=0; i<SAMPLE_SIZE; i++) { - final Integer value = new Integer(random.nextInt(SAMPLE_SIZE)); // Really need new instances + @SuppressWarnings("UnnecessaryBoxing") + final Integer value = new Integer(random.nextInt(SAMPLE_SIZE)); // Really need new instances if (random.nextBoolean()) { /* * Tests addition. @@ -121,7 +122,7 @@ public final strictfp class WeakHashSetT */ assertTrue("add:", strongModified); } else { - assertTrue(value != weakSet.get(value)); + assertNotSame(value, weakSet.get(value)); if (strongModified) { /* * The element was not in HashSet but still exist in the WeakHashSet. Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/collection/WeakValueHashMapTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -65,7 +65,7 @@ public final strictfp class WeakValueHas * Implementation of the {@link #testStrongReferences()} method, * to be reused by {@link CacheTest}. * - * @param weakMap The map implementation to test. + * @param weakMap the map implementation to test. */ static void testStrongReferences(final Map<Integer,Integer> weakMap) { final Random random = new Random(); @@ -95,7 +95,7 @@ public final strictfp class WeakValueHas * In this test, we have to keep in mind than some elements * in {@code weakMap} may disappear at any time. * - * @throws InterruptedException If the test has been interrupted. + * @throws InterruptedException if the test has been interrupted. */ @Test @DependsOnMethod("testStrongReferences") @@ -109,13 +109,16 @@ public final strictfp class WeakValueHas * * @param weakMap The map implementation to test. */ + @SuppressWarnings("UnnecessaryBoxing") static void testWeakReferences(final Map<Integer,Integer> weakMap) throws InterruptedException { final Random random = new Random(); for (int pass=0; pass<NUM_RETRY; pass++) { weakMap.clear(); final HashMap<Integer,Integer> strongMap = new HashMap<>(); for (int i=0; i<SAMPLE_SIZE; i++) { - // We really want new instances here. + /* + * We really want new instances here. + */ final Integer key = new Integer(random.nextInt(SAMPLE_SIZE)); final Integer value = new Integer(random.nextInt(SAMPLE_SIZE)); if (random.nextBoolean()) { @@ -136,8 +139,10 @@ public final strictfp class WeakValueHas assertNotSame(value, weakPrevious); } if (strongPrevious != null) { - // Note: If 'strongPrevious==null', 'weakPrevious' can not - // be null since GC has not collected its entry yet. + /* + * Note: If 'strongPrevious==null', 'weakPrevious' can not + * be null since GC has not collected its entry yet. + */ assertSame("put:", strongPrevious, weakPrevious); } } else { @@ -206,11 +211,12 @@ public final strictfp class WeakValueHas */ @Test @DependsOnMethod("testStrongReferences") + @SuppressWarnings("UnnecessaryBoxing") public void testIdentityComparisons() { final WeakValueHashMap<Integer,Integer> weakMap = new WeakValueHashMap<>(Integer.class, true); final Integer k1 = 10; final Integer k2 = 20; - final Integer k3 = new Integer(10); // Really want a new instance. + final Integer k3 = new Integer(10); // Really want a new instance. final Integer v1 = 1; final Integer v2 = 2; final Integer v3 = 3; Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/AbstractNameTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/AbstractNameTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/AbstractNameTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/AbstractNameTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -33,7 +33,7 @@ import static org.apache.sis.util.iso.De * For tests using the name factory, see {@link DefaultNameFactoryTest}. * * @author Martin Desruisseaux (Geomatys) - * @since 0.3 (derived from goetk-3.00) + * @since 0.3 * @version 0.3 * @module */ Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultInternationalStringTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -81,8 +81,8 @@ public final strictfp class DefaultInter /** * Ensures that the given international string contains the expected localized texts. * - * @param quebecker Either {@link #MESSAGE_fr} or {@link #MESSAGE_fr_CA}, - * depending on the localization details being tested. + * @param quebecker either {@link #MESSAGE_fr} or {@link #MESSAGE_fr_CA}, + * depending on the localization details being tested. */ private static void assertLocalized(final InternationalString toTest, final String quebecker) { assertEquals ("Unlocalized message:", MESSAGE, toTest.toString(null)); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/DefaultNameFactoryTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -29,7 +29,7 @@ import org.apache.sis.test.TestRunner; * a {@link DefaultNameFactory} instance shared for all tests in this class. * * @author Martin Desruisseaux (Geomatys) - * @since 0.3 (derived from goetk-3.00) + * @since 0.3 * @version 0.3 * @module */ @@ -39,13 +39,13 @@ public final strictfp class DefaultNameF /** * The factory to test. */ - private static DefaultNameFactory factory; + private static DefaultNameFactory factorySIS; /** * Creates a new test suite using the singleton factory instance. */ public DefaultNameFactoryTest() { - super(factory); + super(factorySIS); } /** @@ -53,7 +53,7 @@ public final strictfp class DefaultNameF */ @BeforeClass public static void createFactory() { - factory = new DefaultNameFactory(); + factorySIS = new DefaultNameFactory(); } /** @@ -61,6 +61,6 @@ public final strictfp class DefaultNameF */ @AfterClass public static void disposeFactory() { - factory = null; + factorySIS = null; } } Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/LargeCodeList.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/LargeCodeList.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/LargeCodeList.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/LargeCodeList.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -59,7 +59,7 @@ public final strictfp class LargeCodeLis /** * Returns the list of {@code LargeCodeList}s. * - * @return The list of codes declared in the current JVM. + * @return the list of codes declared in the current JVM. */ public static LargeCodeList[] values() { synchronized (VALUES) { @@ -69,6 +69,8 @@ public final strictfp class LargeCodeLis /** * Returns the list of codes of the same kind than this code list element. + * + * @return list of codes of {@code LargeCodeList} kind. */ @Override public LargeCodeList[] family() { @@ -79,8 +81,8 @@ public final strictfp class LargeCodeLis * Returns the axis code that matches the given string, * or returns a new one if none match it. * - * @param code The name of the code list element to fetch or to create. - * @return A code list element matching the given name. + * @param code the name of the code list element to fetch or to create. + * @return a code list element matching the given name. */ public static LargeCodeList valueOf(final String code) { return valueOf(LargeCodeList.class, code); Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NameMarshallingTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -82,7 +82,7 @@ public final strictfp class NameMarshall /** * Tests XML of a {@link LocalName}. * - * @throws JAXBException Should not happen. + * @throws JAXBException if (un)marshalling failed. */ @Test public void testLocalName() throws JAXBException { @@ -104,7 +104,7 @@ public final strictfp class NameMarshall /** * Tests XML of a {@link LocalName} with {@code &} symbol. * - * @throws JAXBException Should not happen. + * @throws JAXBException if (un)marshalling failed. */ @Test @DependsOnMethod("testLocalName") @@ -127,7 +127,7 @@ public final strictfp class NameMarshall /** * Tests XML of a {@link LocalName} with a scope. * - * @throws JAXBException Should not happen. + * @throws JAXBException if (un)marshalling failed. */ @Test @DependsOnMethod("testLocalName") @@ -151,7 +151,7 @@ public final strictfp class NameMarshall /** * Tests XML of a {@link TypeName}. * - * @throws JAXBException Should not happen. + * @throws JAXBException if (un)marshalling failed. */ @Test public void testTypeName() throws JAXBException { @@ -177,7 +177,7 @@ public final strictfp class NameMarshall /** * Tests XML of a {@link org.opengis.util.ScopedName}. * - * @throws JAXBException Should not happen. + * @throws JAXBException if (un)marshalling failed. */ @Test public void testScopedName() throws JAXBException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/NamesTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -119,8 +119,9 @@ public final strictfp class NamesTest ex */ private static void assertValueClassEquals(final Class<?> expected, final TypeName type) { assertEquals(expected, toClass(type)); - - // Tests detection with an implementation which is not the SIS one. + /* + * Tests detection with an implementation which is not the SIS one. + */ assertEquals(expected, toClass(new TypeName() { @Override public int depth() {return type.depth();} @Override public List<? extends LocalName> getParsedNames() {return type.getParsedNames();} Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/iso/TypeNamesTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -73,7 +73,7 @@ public final strictfp class TypeNamesTes /** * Tests the mapping of basic types like strings, URI, dates and numbers. * - * @throws ClassNotFoundException Should not happen since we do invoke {@link Class#forName(String)} in this test. + * @throws ClassNotFoundException should not happen since we do invoke {@link Class#forName(String)} in this test. */ @Test public void testBasicTypes() throws ClassNotFoundException { @@ -102,7 +102,7 @@ public final strictfp class TypeNamesTes /** * Tests the mapping of more complex object that are not basic types. * - * @throws ClassNotFoundException Should not happen since we do invoke {@link Class#forName(String)} in this test. + * @throws ClassNotFoundException should not happen since we do invoke {@link Class#forName(String)} in this test. */ @Test public void testMetadataClasses() throws ClassNotFoundException { @@ -113,7 +113,7 @@ public final strictfp class TypeNamesTes /** * Tests the mapping of objects not defined by OGC. * - * @throws ClassNotFoundException If the call to {@link Class#forName(String)} failed. + * @throws ClassNotFoundException if the call to {@link Class#forName(String)} failed. */ @Test public void testOtherClasses() throws ClassNotFoundException { @@ -123,7 +123,7 @@ public final strictfp class TypeNamesTes /** * Checks for the sentinel values in case of invalid names. * - * @throws ClassNotFoundException Should not happen since we do invoke {@link Class#forName(String)} in this test. + * @throws ClassNotFoundException should not happen since we do invoke {@link Class#forName(String)} in this test. */ @Test public void testInvalidNames() throws ClassNotFoundException { Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/logging/EmptyWarningListeners.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/logging/EmptyWarningListeners.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/logging/EmptyWarningListeners.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/logging/EmptyWarningListeners.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -45,6 +45,7 @@ public final strictfp class EmptyWarning /** * The logger to be returned by {@link #getLogger()}. */ + @SuppressWarnings("NonConstantLogger") private final Logger logger; /** Modified: sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/logging/LoggerAdapterTest.java URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/logging/LoggerAdapterTest.java?rev=1779559&r1=1779558&r2=1779559&view=diff ============================================================================== --- sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/logging/LoggerAdapterTest.java [UTF-8] (original) +++ sis/trunk/core/sis-utility/src/test/java/org/apache/sis/util/logging/LoggerAdapterTest.java [UTF-8] Fri Jan 20 04:34:26 2017 @@ -56,14 +56,17 @@ public final strictfp class LoggerAdapte assertEquals(level, logger.level); assertEquals(message, logger.last); } - // Actually, Level.OFF has the highest intValue. - // LoggerAdapter can easily match this level to a no-op. + /* + * Actually, Level.OFF has the highest intValue. + * LoggerAdapter can easily match this level to a no-op. + */ logger.clear(); logger.log(Level.OFF, "off"); assertEquals(Level.OFF, logger.level); - - // Actually, Level.ALL has the smallest intValue. - // LoggerAdapter has no easy match for this level. + /* + * Actually, Level.ALL has the smallest intValue. + * LoggerAdapter has no easy match for this level. + */ logger.clear(); logger.log(Level.ALL, "all"); assertEquals(Level.OFF, logger.level);
