diff -r 3b8d63726d11 java.hints.test/apichanges.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java.hints.test/apichanges.xml	Wed Mar 21 09:41:36 2012 +0100
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Search for CHANGEME in this document when copying and using it: -->
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright 1997-2010 Oracle and/or its affiliates. All rights reserved.
+
+Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+Other names may be trademarks of their respective owners.
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License.  When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
+particular file as subject to the "Classpath" exception as provided
+by Oracle in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2010 Sun
+Microsystems, Inc. All Rights Reserved.
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+-->
+<?xml-stylesheet type="text/xml" href="../nbbuild/javadoctools/apichanges.xsl"?>
+<!DOCTYPE apichanges PUBLIC "-//NetBeans//DTD API changes list 1.0//EN" "../nbbuild/javadoctools/apichanges.dtd">
+
+<!--
+
+INFO FOR PEOPLE ADDING CHANGES:
+
+Check the DTD (apichanges.dtd) for details on the syntax. You do not
+need to regenerate the HTML, as this is part of Javadoc generation; just
+change the XML. Rough syntax of a change (several parts optional):
+
+<change>
+    <api name="compiler"/>
+    <summary>Some brief description here, can use <b>XHTML</b></summary>
+    <version major="1" minor="99"/>
+    <date day="13" month="6" year="2001"/>
+    <author login="jrhacker"/>
+    <compatibility addition="yes"/>
+    <description>
+        The main description of the change here.
+        Again can use full <b>XHTML</b> as needed.
+    </description>
+    <class package="org.openide.compiler" name="DoWhatIWantCompiler"/>
+    <issue number="14309"/>
+</change>
+
+Also permitted elements: <package>, <branch>. <version> is API spec
+version, recommended for all new changes. <compatibility> should say
+if things were added/modified/deprecated/etc. and give all information
+related to upgrading old code. List affected top-level classes and
+link to issue numbers if applicable. See the DTD for more details.
+
+Changes need not be in any particular order, they are sorted in various
+ways by the stylesheet anyway.
+
+Dates are assumed to mean "on the trunk". If you *also* make the same
+change on a stabilization branch, use the <branch> tag to indicate this
+and explain why the change was made on a branch in the <description>.
+
+Please only change this file on the trunk! Rather: you can change it
+on branches if you want, but these changes will be ignored; only the
+trunk version of this file is important.
+
+Deprecations do not count as incompatible, assuming that code using the
+deprecated calls continues to see their documented behavior. But do
+specify deprecation="yes" in <compatibility>.
+
+This file is not a replacement for Javadoc: it is intended to list changes,
+not describe the complete current behavior, for which ordinary documentation
+is the proper place.
+
+-->
+
+<apichanges>
+
+    <!-- First, a list of API names you may use: -->
+    <apidefs>
+        <apidef name="JavaHintsTest">Java Hints Test API</apidef>
+    </apidefs>
+
+    <!-- ACTUAL CHANGES BEGIN HERE: -->
+
+    <changes>
+
+        <change id="HintWarning-assertFixes">
+             <api name="JavaHintsTest"/>
+             <summary>Added assertFixes method to HintWarning</summary>
+             <version major="1" minor="1"/>
+             <date day="28" month="3" year="2012"/>
+             <author login="jlahoda"/>
+             <compatibility addition="yes" binary="compatible" deletion="no" deprecation="no" modification="no" semantic="compatible" source="compatible"/>
+             <description>
+                 Added assertFixes method to HintWarning
+             </description>
+             <class name="HintTest" package="org.netbeans.modules.java.hints.test.api"/>
+             <issue number="209828"/>
+        </change>
+
+    </changes>
+
+    <!-- Now the surrounding HTML text and document structure: -->
+
+    <htmlcontents>
+<!-- Generated from apichanges.xml -->
+    <head>
+      <title>Change History for the Editor Hints SPI</title>
+      <link rel="stylesheet" href="prose.css" type="text/css"/>
+    </head>
+    <body>
+
+<p class="overviewlink"><a href="@TOP@/overview-summary.html">Overview</a></p>
+
+<h1>Introduction</h1>
+
+<p>This document lists changes made to the <a href="@TOP@/overview-summary.html">Editor Hints SPI</a>.</p>
+
+<!-- The actual lists of changes, as summaries and details: -->
+      <hr/>
+      <standard-changelists module-code-name="org.netbeans.spi.editor.hints/0"/>
+
+      <hr/><p>@FOOTER@</p>
+
+    </body>
+  </htmlcontents>
+
+</apichanges>
diff -r 3b8d63726d11 java.hints.test/nbproject/project.properties
--- a/java.hints.test/nbproject/project.properties	Wed Mar 21 09:36:52 2012 +0100
+++ b/java.hints.test/nbproject/project.properties	Wed Mar 21 09:41:36 2012 +0100
@@ -1,6 +1,7 @@
 is.autoload=true
 javac.source=1.6
 javac.compilerargs=-Xlint -Xlint:-serial
-spec.version.base=1.0
+spec.version.base=1.1
 javadoc.arch=${basedir}/arch.xml
+javadoc.apichanges=${basedir}/apichanges.xml
 requires.nb.javac=true
diff -r 3b8d63726d11 java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java
--- a/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java	Wed Mar 21 09:36:52 2012 +0100
+++ b/java.hints.test/src/org/netbeans/modules/java/hints/test/api/HintTest.java	Wed Mar 21 09:41:36 2012 +0100
@@ -94,6 +94,7 @@
 import org.netbeans.modules.java.hints.providers.spi.HintDescription;
 import org.netbeans.modules.java.hints.providers.spi.HintMetadata;
 import org.netbeans.modules.java.hints.spiimpl.MessageImpl;
+import org.netbeans.modules.java.hints.spiimpl.SyntheticFix;
 import org.netbeans.modules.java.hints.spiimpl.hints.HintsInvoker;
 import org.netbeans.modules.java.hints.spiimpl.options.HintsSettings;
 import org.netbeans.modules.java.hints.test.Utilities.TestLookup;
@@ -839,6 +840,27 @@
 
             return new AppliedFix();
         }
+        /**Verifies that the current warning provides the given fixes.
+         *
+         * @param fixes the {@link Fix#getText() } of the expected fixes
+         * @return itself
+         * @throws AssertionError if the expected fixes do not match the provided fixes
+         * @since 1.1
+         */
+        public HintWarning assertFixes(String... expectedFixes) throws Exception {
+            assertTrue("Must be computed", warning.getFixes().isComputed());
+
+            List<String> fixNames = new LinkedList<String>();
+
+            for (Fix f : warning.getFixes().getFixes()) {
+                if (f instanceof SyntheticFix) continue;
+                fixNames.add(f.getText());
+            }
+
+            assertEquals("Fixes for the current warning do not match the expected fixes. All fixes: " + fixNames.toString(), Arrays.asList(expectedFixes), fixNames);
+
+            return this;
+        }
     }
 
     /**A wrapper over result after applying a fix.
diff -r 3b8d63726d11 java.hints/test/unit/src/org/netbeans/modules/java/hints/perf/TinyTest.java
--- a/java.hints/test/unit/src/org/netbeans/modules/java/hints/perf/TinyTest.java	Wed Mar 21 09:36:52 2012 +0100
+++ b/java.hints/test/unit/src/org/netbeans/modules/java/hints/perf/TinyTest.java	Wed Mar 21 09:41:36 2012 +0100
@@ -457,4 +457,18 @@
                               "     }\n" +
                               "}\n");
     }
+
+    public void testCollectionsToArray2() throws Exception {
+        HintTest.create()
+                .input("package test;\n" +
+                       "public class Test {\n" +
+                       "     private java.util.Collection<String> col() { return null; }\n" +
+                       "     private String[] test() {\n" +
+                       "         return col().toArray(new String[0]);\n" +
+                       "     }\n" +
+                       "}\n")
+                .run(Tiny.class)
+                .findWarning("4:22-4:29:verifier:ERR_Tiny_collectionsToArray")
+                .assertFixes();
+    }
 }
\ No newline at end of file