4 files changed, 49 insertions, 0 deletions
diff --git a/test/scaladoc/run/SI-6017.check b/test/scaladoc/run/SI-6017.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-6017.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-6017.scala b/test/scaladoc/run/SI-6017.scala
new file mode 100644
index 0000000000..a4950e48d8
--- /dev/null
+++ b/test/scaladoc/run/SI-6017.scala
@@ -0,0 +1,23 @@
+import scala.tools.nsc.doc
+import scala.tools.nsc.doc.model._
+import scala.tools.nsc.doc.html.page.{Index, ReferenceIndex}
+import scala.tools.partest.ScaladocModelTest
+
+object Test extends ScaladocModelTest {
+  override def scaladocSettings = ""
+  override def code = """
+    class STAR
+    class Star
+  """
+
+  def testModel(rootPackage: Package) {
+    model match {
+      case Some(universe) => {
+        val index = IndexModelFactory.makeIndex(universe)
+        // Because "STAR" and "Star" are different
+        assert(index.firstLetterIndex('s').keys.toSeq.length == 2)
+      }
+      case _ => assert(false)
+    }
+  }
+}
diff --git a/test/scaladoc/run/SI-6812.check b/test/scaladoc/run/SI-6812.check
new file mode 100644
index 0000000000..619c56180b
--- /dev/null
+++ b/test/scaladoc/run/SI-6812.check
@@ -0,0 +1 @@
+Done.
diff --git a/test/scaladoc/run/SI-6812.scala b/test/scaladoc/run/SI-6812.scala
new file mode 100644
index 0000000000..fbd9588ede
--- /dev/null
+++ b/test/scaladoc/run/SI-6812.scala
@@ -0,0 +1,24 @@
+import scala.tools.nsc.doc.model._
+import scala.tools.partest.ScaladocModelTest
+import language._
+
+object Test extends ScaladocModelTest {
+
+  override def code = """
+    import scala.reflect.macros.Context
+    import language.experimental.macros
+
+    object Macros {
+      def impl(c: Context) = c.literalUnit
+      def foo = macro impl
+    }
+
+    class C {
+      def bar = Macros.foo
+    }
+  """
+
+  def scaladocSettings = ""
+  override def extraSettings = super.extraSettings + " -Ymacro-no-expand"
+  def testModel(root: Package) = ()
+}