Fix tests in AccessibilityTests

Because the test suite now watches compilation errors, the tests did no longer succeed (they were broken since the beginning). After the insertion of a package name everything should work fine now.
scala-ide · Sep 12, 2014 · ff990eb · ff990eb
1 parent 434df9c
commit ff990eb
Showing 1 changed file with 31 additions and 20 deletions.
diff --git a/org.scala-ide.sdt.core.tests/src/org/scalaide/core/ui/completion/AccessibilityTests.scala b/org.scala-ide.sdt.core.tests/src/org/scalaide/core/ui/completion/AccessibilityTests.scala
@@ -8,15 +8,16 @@ class AccessibilityTests {
   import AccessibilityTests._
 
   def mkTestObj(
+      packageName: String,
       additionInClass: String = "",
       additionInPackage: String = "",
       additionOutsideOfPackage: String = "") = s"""
-    package accessibility {
+    package $packageName {
       class Foo {
         private def secretPrivate(): Unit = ()
         private[this] def secretPrivateThis(): Unit = ()
         protected def secretProtected(): Unit = ()
-        protected[accessibility] def secretProtectedInPackage(): Unit = ()
+        protected[$packageName] def secretProtectedInPackage(): Unit = ()
         def secretPublic(): Unit = ()
 
         $additionInClass
@@ -27,13 +28,14 @@ class AccessibilityTests {
   """
 
   @Test
-  def noAccessToPrivateThisOutsideOfInstance() =
-    mkTestObj(additionInClass = """
+  def noAccessToPrivateThisOutsideOfInstance() = {
+    val pkgName = s"noAccessToPrivateThisOutsideOfInstance"
+    mkTestObj(pkgName, additionInClass = """
       def someTests(other: Foo): Unit = {
         other.secr^
       }
     """) becomes
-    mkTestObj(additionInClass = """
+    mkTestObj(pkgName, additionInClass = """
       def someTests(other: Foo): Unit = {
         other.secretPrivate()^
       }
@@ -44,15 +46,17 @@ class AccessibilityTests {
         "secretProtected(): Unit",
         "secretProtectedInPackage(): Unit",
         "secretPublic(): Unit"))
+  }
 
   @Test
-  def accessToPrivateThisInsideOfInstance() =
-    mkTestObj(additionInClass = """
+  def accessToPrivateThisInsideOfInstance() = {
+    val pkgName = "accessToPrivateThisInsideOfInstance"
+    mkTestObj(pkgName, additionInClass = """
       def someTests(other: Foo): Unit = {
         this.secr^
       }
     """) becomes
-    mkTestObj(additionInClass = """
+    mkTestObj(pkgName, additionInClass = """
       def someTests(other: Foo): Unit = {
         this.secretPrivateThis()^
       }
@@ -64,17 +68,19 @@ class AccessibilityTests {
         "secretProtected(): Unit",
         "secretProtectedInPackage(): Unit",
         "secretPublic(): Unit"))
+  }
 
   @Test
-  def noAccessToPrivateInSubclass() =
-    mkTestObj(additionInPackage = """
+  def noAccessToPrivateInSubclass() = {
+    val pkgName = "noAccessToPrivateInSubclass"
+    mkTestObj(pkgName, additionInPackage = """
       class AccessibilityChecks extends Foo {
         def someTests {
           this.secr^
         }
       }
     """) becomes
-    mkTestObj(additionInPackage = """
+    mkTestObj(pkgName, additionInPackage = """
       class AccessibilityChecks extends Foo {
         def someTests {
           this.secretProtected()^
@@ -86,17 +92,19 @@ class AccessibilityTests {
         "secretProtected(): Unit",
         "secretProtectedInPackage(): Unit",
         "secretPublic(): Unit"))
+  }
 
   @Test
-  def noAccessToPrivateInUnrelatedClass() =
-    mkTestObj(additionInPackage = """
+  def noAccessToPrivateInUnrelatedClass() = {
+    val pkgName = "noAccessToPrivateInUnrelatedClass"
+    mkTestObj(pkgName, additionInPackage = """
       class UnrelatedClass {
         def someTests(foo: Foo) {
           foo.secr^
         }
       }
     """) becomes
-    mkTestObj(additionInPackage = """
+    mkTestObj(pkgName, additionInPackage = """
       class UnrelatedClass {
         def someTests(foo: Foo) {
           foo.secretPublic()^
@@ -107,22 +115,24 @@ class AccessibilityTests {
       expectedCompletions = Seq(
         "secretProtectedInPackage(): Unit",
         "secretPublic(): Unit"))
+  }
 
   @Test
-  def noAccessToPackageVisibilityInDifferentPackage() =
-    mkTestObj(additionOutsideOfPackage = """
+  def noAccessToPackageVisibilityInDifferentPackage() = {
+    val pkgName = "noAccessToPackageVisibilityInDifferentPackage"
+    mkTestObj(pkgName, additionOutsideOfPackage = s"""
       package other {
         class SomeChecsk {
-          def foo(o: accessibility.Foo) {
+          def foo(o: $pkgName.Foo) {
             o.secr^
           }
         }
       }
     """) becomes
-    mkTestObj(additionOutsideOfPackage = """
+    mkTestObj(pkgName, additionOutsideOfPackage = s"""
       package other {
         class SomeChecsk {
-          def foo(o: accessibility.Foo) {
+          def foo(o: $pkgName.Foo) {
             o.secretPublic()^
           }
         }
@@ -131,4 +141,5 @@ class AccessibilityTests {
       completionToApply = "secretPublic(): Unit",
       expectedCompletions = Seq(
         "secretPublic(): Unit"))
-}
+  }
+}