Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing up UnitTests #64

Closed
wants to merge 2 commits into from
Closed

Fixing up UnitTests #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49bf238
Fix UnitTests, make it declare ScalaTest tests
dwijnand Sep 30, 2020
cd7c78f
Fix unit test expectations
dwijnand Sep 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 6 additions & 14 deletions testProjects/unitTestProject/src/main/scala/scalaclean/test/akka/Timeout.scala.expected
View file
Open in desktop
Expand Up @@ -5,24 +5,16 @@ import scala.language.implicitConversions
@SerialVersionUID(1L)
case class Timeout(a: String, b: String) {

/**
* Construct a Timeout from the given time unit and factor.
*/
/** Construct a Timeout from the given time unit and factor. */
def this(length: Long, unit: Int) = this(length.toString, unit.toString)
}

/**
* A Timeout is a wrapper on top of Duration to be more specific about what the duration means.
*/
/** A Timeout is a wrapper on top of Duration to be more specific about what the duration means. */
object Timeout {

/**
* A timeout with zero duration, will cause most requests to always timeout.
*/
val zero: Timeout = new Timeout("a","b")
/** A timeout with zero duration, will cause most requests to always timeout. */
val zero: Timeout = new Timeout("a", "b")

/**
* Construct a Timeout from the given time unit and factor.
*/
/** Construct a Timeout from the given time unit and factor. */
def apply(length: Long, unit: Int): Timeout = new Timeout(length, unit)
}
}
2 changes: 2 additions & 0 deletions ...ojects/unitTestProject/src/main/scala/scalaclean/test/annotation/Annotated.scala.expected
View file
Open in desktop
Expand Up @@ -5,9 +5,11 @@ package scalaclean.test.annotation
@BasicScala
@ComplexScala(1, 2, "yy", true)
class annotated {

@BasicJava
@ComplexJava(intValue = 1, doubleValue = 2, stringValue = "XX", booleanValue = true, intValueWithDefault = 99)
@BasicScala
@ComplexScala(1, 2, "yy", true, 99)
def foo = 0/* annotations(C:scalaclean.test.annotation.annotated/M:foo()) - AnnotationData[-164,-55,scalaclean.test.annotation.ComplexJava,Map(booleanValue -> true, doubleValue -> 2.0, intValue -> 1, intValueWithDefault -> 99, stringValue -> XX)] :: AnnotationData[-177,-168,scalaclean.test.annotation.BasicJava,Map()] :: AnnotationData[-37,-3,scalaclean.test.annotation.ComplexScala,Map(0 -> 1, 1 -> 2.0, 2 -> yy, 3 -> true, 4 -> 99)] :: AnnotationData[-51,-41,scalaclean.test.annotation.BasicScala,Map()] */

}/* annotations(C:scalaclean.test.annotation.annotated) - AnnotationData[-128,-45,scalaclean.test.annotation.ComplexJava,Map(booleanValue -> true, doubleValue -> 2.0, intValue -> 1, stringValue -> XX)] :: AnnotationData[-139,-130,scalaclean.test.annotation.BasicJava,Map()] :: AnnotationData[-31,-1,scalaclean.test.annotation.ComplexScala,Map(0 -> 1, 1 -> 2.0, 2 -> yy, 3 -> true, 4 -> <<<TODO>>>)] :: AnnotationData[-43,-33,scalaclean.test.annotation.BasicScala,Map()] */
98 changes: 51 additions & 47 deletions testProjects/unitTestProject/src/main/scala/scalaclean/test/nodes/nodes.scala.expected
View file
Open in desktop

Large diffs are not rendered by default.

36 changes: 20 additions & 16 deletions ...an/test/overriddenBy/internalDirectOverriddenBy/internalDirectOverriddenBy.scala.expected
View file
Open in desktop
@@ -1,20 +1,23 @@
package scalaclean.test.overriddenBy.internalDirectOverriddenBy

trait GrandParentTrait {
def d1: Int/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.GrandParentTrait/M:d1()) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Class_ChildTrait/M:d1() :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d1() :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Trait_ChildTrait/M:d1() :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d1()##12 */
def d2(a:Int): Int/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.GrandParentTrait/M:d2(scala.Int)) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Class_ChildTrait/M:d2(scala.Int) :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2(scala.Int) :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Trait_ChildTrait/M:d2(scala.Int) :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2(scala.Int)##7 */
def d2a(a:Int)(b:Int): Int/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.GrandParentTrait/M:d2a(scala.Intscala.Int)) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Class_ChildTrait/M:d2a(scala.Intscala.Int) :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2a(scala.Intscala.Int) :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Trait_ChildTrait/M:d2a(scala.Intscala.Int) :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2a(scala.Intscala.Int)##8 */
def d3()(): Int/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.GrandParentTrait/M:d3()) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Class_ChildTrait/M:d3() :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d3() :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Trait_ChildTrait/M:d3() :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d3()##9 */
def d1: Int/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.GrandParentTrait/M:d1()) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Class_ChildTrait/M:d1() :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d1() :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Trait_ChildTrait/M:d1() :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d1()##7 */
def d2(a: Int): Int/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.GrandParentTrait/M:d2(scala.Int)) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Class_ChildTrait/M:d2(scala.Int) :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2(scala.Int) :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Trait_ChildTrait/M:d2(scala.Int) :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2(scala.Int)##1 */
def d2a(a: Int)(b: Int): Int/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.GrandParentTrait/M:d2a(scala.Intscala.Int)) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Class_ChildTrait/M:d2a(scala.Intscala.Int) :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2a(scala.Intscala.Int) :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Trait_ChildTrait/M:d2a(scala.Intscala.Int) :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2a(scala.Intscala.Int)##10 */
def d3()(): Int/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.GrandParentTrait/M:d3()) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Class_ChildTrait/M:d3() :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d3() :: C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Trait_ChildTrait/M:d3() :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d3()##4 */

}

trait ParentTrait extends GrandParentTrait {
def d3(): () => Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.ParentTrait/M:d3()) - C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.ChildTrait/M:d3() */
}

trait ChildTrait extends ParentTrait {
override def d3(): () => Int = ???
def d2a(a:Int) = d2 _
def d2a(a: Int) = d2 _

}

trait Trait_ChildTrait extends ParentTrait {
override def equals(obj: Any): Boolean = super.equals(obj)

Expand All @@ -34,6 +37,7 @@ trait Trait_ChildTrait extends ParentTrait {

override def d3()(): Int = ???
}

class Class_ChildTrait extends ParentTrait {
override def equals(obj: Any): Boolean = super.equals(obj)

Expand All @@ -53,27 +57,27 @@ class Class_ChildTrait extends ParentTrait {

override def d3()(): Int = ???
}

object Object_ChildTrait extends ParentTrait {
override def equals(obj: Any): Boolean = super.equals(obj)/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:equals(scala.Any)) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:equals(scala.Any)##1 :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:equals(scala.Any)##6 */
override def equals(obj: Any): Boolean = super.equals(obj)/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:equals(scala.Any)) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:equals(scala.Any)##3 :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:equals(scala.Any)##6 */

override def clone(): AnyRef = super.clone()/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:clone()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:clone()##11 */
override def clone(): AnyRef = super.clone()/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:clone()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:clone()##5 */

override def toString: String = super.toString/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:toString()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:toString()##3 :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:toString()##5 */
override def toString: String = super.toString/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:toString()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:toString()##12 :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:toString()##2 */

override def finalize(): Unit = super.finalize()/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:finalize()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:finalize()##10 */
override def finalize(): Unit = super.finalize()/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:finalize()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:finalize()##11 */

override def hashCode(): Int = super.hashCode()/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:hashCode()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:hashCode()##2 :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:hashCode()##4 */
override def hashCode(): Int = super.hashCode()/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:hashCode()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:hashCode()##8 :: O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:hashCode()##9 */

override def d1: Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d1()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d1()##12 */
override def d1: Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d1()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d1()##7 */

override def d2(a: Int): Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2(scala.Int)) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2(scala.Int)##7 */
override def d2(a: Int): Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2(scala.Int)) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2(scala.Int)##1 */

override def d2a(a: Int)(b: Int): Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2a(scala.Intscala.Int)) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2a(scala.Intscala.Int)##8 */
override def d2a(a: Int)(b: Int): Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2a(scala.Intscala.Int)) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d2a(scala.Intscala.Int)##10 */

override def d3()(): Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d3()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d3()##9 */
override def d3()(): Int = ???/* internalTransitiveOverriddenBy(C:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d3()) - O:scalaclean.test.overriddenBy.internalDirectOverriddenBy.Object_ChildTrait/M:d3()##4 */
}


//class GrandParentClass {
//
// def foo: Unit = ()
Expand All @@ -87,4 +91,4 @@ object Object_ChildTrait extends ParentTrait {
//object ClildObject extends ChildClass {
// new Child().foo
// new Child().bar(1)
//}
//}