From 93a89b865f66ff8e6eeef65ef4c48017a6ac7429 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Zieli=C5=84ski?= <tomek.j2ee@gmail.com>
Date: Mon, 30 Jul 2018 22:33:36 +0200
Subject: [PATCH] test(refactor): remove commented code from tests (#2297)

* refactor: remove commented code

* refactor: remove comment - it is fixed in https://github.com/INRIA/spoon/pull/1416

* refactor: remove commented code

* fix typo

* restore deleted assertion
---
 src/test/java/spoon/test/exceptions/ExceptionTest.java      | 6 +-----
 src/test/java/spoon/test/generics/GenericsTest.java         | 3 +--
 .../java/spoon/test/replace/ReplaceParametrizedTest.java    | 5 -----
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/test/java/spoon/test/exceptions/ExceptionTest.java b/src/test/java/spoon/test/exceptions/ExceptionTest.java
index 4406f7fa7b1..ec1fa824ce4 100644
--- a/src/test/java/spoon/test/exceptions/ExceptionTest.java
+++ b/src/test/java/spoon/test/exceptions/ExceptionTest.java
@@ -123,10 +123,6 @@ public void testUnionCatchExceptionInsideLambdaInNoClasspath() {
 		CtCatchVariable variable2 = catches.get(1).getParameter(); // outside the lambda
 
 		assertEquals(variable1.getMultiTypes(), variable2.getMultiTypes());
-
-		// for now the type of CtCatchVariable is not the same
-		// this should be fix in the future (see: https://github.com/INRIA/spoon/issues/1420)
-		//assertEquals(variable2, variable1);
+		assertEquals(variable2, variable1);
 	}
-
 }
diff --git a/src/test/java/spoon/test/generics/GenericsTest.java b/src/test/java/spoon/test/generics/GenericsTest.java
index 9cde8b715d9..0b5a5d6ab1a 100644
--- a/src/test/java/spoon/test/generics/GenericsTest.java
+++ b/src/test/java/spoon/test/generics/GenericsTest.java
@@ -659,7 +659,6 @@ public void testGenericTypeReference() throws Exception {
 
 		CtType<Tacos> aTacos = buildNoClasspath(Tacos.class).Type().get(Tacos.class);
 		//this returns a type reference with uninitialized actual type arguments.
-//		CtTypeReference<?> genericTypeRef = aTacos.getReference();
 		CtTypeReference<?> genericTypeRef = aTacos.getFactory().Type().createReference(aTacos, true);
 		
 		assertTrue(genericTypeRef.getActualTypeArguments().size()>0);
@@ -667,7 +666,7 @@ public void testGenericTypeReference() throws Exception {
 		for(int i=0; i<aTacos.getFormalCtTypeParameters().size(); i++) {
 			assertSame("TypeParameter reference idx="+i+" is different", aTacos.getFormalCtTypeParameters().get(i), genericTypeRef.getActualTypeArguments().get(i).getTypeParameterDeclaration());
 
-			// contract: getTypeParameterDeclaration goes back to the declaration, eevn without context
+			// contract: getTypeParameterDeclaration goes back to the declaration, even without context
 			assertSame(aTacos.getFormalCtTypeParameters().get(i), genericTypeRef.getActualTypeArguments().get(i).getTypeParameterDeclaration());
 
 		}
diff --git a/src/test/java/spoon/test/replace/ReplaceParametrizedTest.java b/src/test/java/spoon/test/replace/ReplaceParametrizedTest.java
index 9a3f060cca2..f3e1365b58e 100644
--- a/src/test/java/spoon/test/replace/ReplaceParametrizedTest.java
+++ b/src/test/java/spoon/test/replace/ReplaceParametrizedTest.java
@@ -140,11 +140,6 @@ public void scan(CtRole role, CtElement e) {
 							found = true;
 							return;
 						}
-//						if (rh.getRole()==CtRole.TYPE && role == CtRole.MULTI_TYPE) {
-//							//CtCatchVaraible#type sets CtCatchVaraible#multiType - OK 
-//							found = true;
-//							return;
-//						}
 						problems.add("Argument was set into " + rh.getRole() + " but was found in " + role);
 					}
 				}