Polish proxy tests

Author: sbrannen

spring-context/src/test/java/org/springframework/aop/framework/AbstractAopProxyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,17 +28,13 @@
 import java.util.List;
 import java.util.Map;
 
-import junit.framework.TestCase;
 import org.aopalliance.aop.Advice;
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import test.mixin.LockMixin;
-import test.mixin.LockMixinAdvisor;
-import test.mixin.Lockable;
-import test.mixin.LockedException;
 
 import org.springframework.aop.Advisor;
 import org.springframework.aop.AfterReturningAdvice;
@@ -76,6 +72,11 @@
 import org.springframework.util.SerializationTestUtils;
 import org.springframework.util.StopWatch;
 
+import test.mixin.LockMixin;
+import test.mixin.LockMixinAdvisor;
+import test.mixin.Lockable;
+import test.mixin.LockedException;
+
 import static org.junit.Assert.*;
 
 /**
@@ -120,18 +121,12 @@ protected boolean requiresTarget() {
 	}
 
 
-	@Test
+	@Test(expected = AopConfigException.class)
 	public void testNoInterceptorsAndNoTarget() {
-		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] { ITestBean.class });
 		// Add no interceptors
-		try {
-			AopProxy aop = createAopProxy(pc);
-			aop.getProxy();
-			fail("Shouldn't allow no interceptors");
-		}
-		catch (AopConfigException ex) {
-			// Ok
-		}
+		AopProxy aop = createAopProxy(pc);
+		aop.getProxy();
 	}
 
 	/**
@@ -171,7 +166,6 @@ public void testManyProxies() {
 		sw.start("Create " + howMany + " proxies");
 		testManyProxies(howMany);
 		sw.stop();
-		System.out.println(sw.getTotalTimeMillis());
 		assertTrue("Proxy creation was too slow",  sw.getTotalTimeMillis() < 5000);
 	}
 
@@ -243,7 +237,7 @@ public void testSerializationSerializableTargetAndAdvice() throws Throwable {
 			p.echo(new IOException());
 		}
 		catch (IOException ex) {
-
+			/* expected */
 		}
 		assertEquals(1, cta.getCalls());
 
@@ -281,7 +275,6 @@ public void testSerializationSerializableTargetAndAdvice() throws Throwable {
 
 		}
 		assertEquals(2, cta.getCalls());
-
 	}
 
 	/**
@@ -317,7 +310,6 @@ public void testOneAdvisedObjectCallsAnother() {
 		pf2.addAdvice(2, new CheckMethodInvocationIsSameInAndOutInterceptor());
 		pf2.addAdvice(1, new CheckMethodInvocationViaThreadLocalIsSameInAndOutInterceptor());
 		pf2.addAdvice(0, ExposeInvocationInterceptor.INSTANCE);
-		//System.err.println(pf2.toProxyConfigString());
 		ITestBean advised2 = (ITestBean) createProxy(pf2);
 		advised2.setAge(age2);
 		advised1.setSpouse(advised2); // = 2 invocations
@@ -379,20 +371,14 @@ public void testTargetCanGetProxy() {
 		assertEquals("3 more invocations via AOP as the first call was reentrant through the proxy", 4, di.getCount());
 	}
 
-
-	@Test
+	@Test(expected = IllegalStateException.class)
+	// Should fail to get proxy as exposeProxy wasn't set to true
 	public void testTargetCantGetProxyByDefault() {
 		NeedsToSeeProxy et = new NeedsToSeeProxy();
 		ProxyFactory pf1 = new ProxyFactory(et);
 		assertFalse(pf1.isExposeProxy());
 		INeedsToSeeProxy proxied = (INeedsToSeeProxy) createProxy(pf1);
-		try {
-			proxied.incrementViaProxy();
-			fail("Should have failed to get proxy as exposeProxy wasn't set to true");
-		}
-		catch (IllegalStateException ex) {
-			// Ok
-		}
+		proxied.incrementViaProxy();
 	}
 
 	@Test
@@ -417,7 +403,7 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 				if (!context) {
 					assertNoInvocationContext();
 				} else {
-					assertTrue("have context", ExposeInvocationInterceptor.currentInvocation() != null);
+					assertNotNull("have context", ExposeInvocationInterceptor.currentInvocation());
 				}
 				return s;
 			}
@@ -436,7 +422,7 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 		assertNoInvocationContext();
 		ITestBean tb = (ITestBean) aop.getProxy();
 		assertNoInvocationContext();
-		assertTrue("correct return value", tb.getName() == s);
+		assertSame("correct return value", s, tb.getName());
 	}
 
 	/**
@@ -453,7 +439,7 @@ public void testTargetReturnsThis() throws Throwable {
 		pc.setTarget(raw);
 
 		ITestBean tb = (ITestBean) createProxy(pc);
-		assertTrue("this return is wrapped in proxy", tb.getSpouse() == tb);
+		assertSame("this return is wrapped in proxy", tb, tb.getSpouse());
 	}
 
 	@Test
@@ -593,15 +579,6 @@ public Object invoke(MethodInvocation invocation) throws Throwable {
 
 		ITestBean tb = (ITestBean) aop.getProxy();
 		tb.getName();
-		// Not safe to trap invocation
-		//assertTrue(tii.invocation == target.invocation);
-
-		//assertTrue(target.invocation.getProxy() == tb);
-
-	//	((IOther) tb).absquatulate();
-		//MethodInvocation minv =  tii.invocation;
-		//assertTrue("invoked on iother, not " + minv.getMethod().getDeclaringClass(), minv.getMethod().getDeclaringClass() == IOther.class);
-		//assertTrue(target.invocation == tii.invocation);
 	}
 
 	/**
@@ -645,30 +622,29 @@ private void testTestBeanIntroduction(ProxyFactory pc) {
 		int newAge = 65;
 		ITestBean itb = (ITestBean) createProxy(pc);
 		itb.setAge(newAge);
-		assertTrue(itb.getAge() == newAge);
+		assertEquals(newAge, itb.getAge());
 
 		Lockable lockable = (Lockable) itb;
 		assertFalse(lockable.locked());
 		lockable.lock();
 
-		assertTrue(itb.getAge() == newAge);
+		assertEquals(newAge, itb.getAge());
 		try {
 			itb.setAge(1);
 			fail("Setters should fail when locked");
 		}
 		catch (LockedException ex) {
 			// ok
 		}
-		assertTrue(itb.getAge() == newAge);
+		assertEquals(newAge, itb.getAge());
 
 		// Unlock
 		assertTrue(lockable.locked());
 		lockable.unlock();
 		itb.setAge(1);
-		assertTrue(itb.getAge() == 1);
+		assertEquals(1, itb.getAge());
 	}
 
-
 	@Test
 	public void testReplaceArgument() throws Throwable {
 		TestBean tb = new TestBean();
@@ -679,14 +655,14 @@ public void testReplaceArgument() throws Throwable {
 		ITestBean t = (ITestBean) pc.getProxy();
 		int newAge = 5;
 		t.setAge(newAge);
-		assertTrue(t.getAge() == newAge);
+		assertEquals(newAge, t.getAge());
 		String newName = "greg";
 		t.setName(newName);
 		assertEquals(newName, t.getName());
 
 		t.setName(null);
 		// Null replacement magic should work
-		assertTrue(t.getName().equals(""));
+		assertEquals("", t.getName());
 	}
 
 	@Test
@@ -1310,9 +1286,9 @@ public void testEquals() {
 		IOther proxyB = (IOther) createProxy(pfb);
 
 		assertEquals(pfa.getAdvisors().length, pfb.getAdvisors().length);
-		assertTrue(a.equals(b));
-		assertTrue(i1.equals(i2));
-		assertTrue(proxyA.equals(proxyB));
+		assertEquals(a, b);
+		assertEquals(i1, i2);
+		assertEquals(proxyA, proxyB);
 		assertEquals(proxyA.hashCode(), proxyB.hashCode());
 		assertFalse(proxyA.equals(a));
 
@@ -1682,9 +1658,7 @@ private static class ProxyMatcherInterceptor implements MethodInterceptor {
 		public Object invoke(MethodInvocation mi) throws Throwable {
 			Object proxy = AopContext.currentProxy();
 			Object ret = mi.proceed();
-			// TODO why does this cause stack overflow?
-			//assertEquals(proxy, AopContext.currentProxy());
-			assertTrue(proxy == AopContext.currentProxy());
+			assertEquals(proxy, AopContext.currentProxy());
 			return ret;
 		}
 	}
@@ -1785,7 +1759,7 @@ public boolean matches(Method m, Class<?> targetClass) {
 	 * Note that trapping the Invocation as in previous version of this test
 	 * isn't safe, as invocations may be reused
 	 * and hence cleared at the end of each invocation.
-	 * So we trap only the targe.
+	 * So we trap only the target.
 	 */
 	protected static class TrapTargetInterceptor implements MethodInterceptor {
 
@@ -2105,11 +2079,10 @@ public void absquatulate() {
 	static class InvocationCheckExposedInvocationTestBean extends ExposedInvocationTestBean {
 		@Override
 		protected void assertions(MethodInvocation invocation) {
-			TestCase.assertTrue(invocation.getThis() == this);
-			TestCase.assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(),
-					ITestBean.class.isAssignableFrom(invocation.getMethod().getDeclaringClass()));
+			assertSame(this, invocation.getThis());
+			assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(),
+				ITestBean.class.isAssignableFrom(invocation.getMethod().getDeclaringClass()));
 		}
 	}
 
 }
-

spring-context/src/test/java/org/springframework/aop/framework/CglibProxyTests.java

@@ -21,6 +21,7 @@
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
 import org.junit.Test;
+
 import test.mixin.LockMixinAdvisor;
 
 import org.springframework.aop.ClassFilter;
@@ -74,30 +75,17 @@ protected boolean requiresTarget() {
 		return true;
 	}
 
-
-	@Test
+	@Test(expected = IllegalArgumentException.class)
 	public void testNullConfig() {
-		try {
-			new CglibAopProxy(null);
-			fail("Shouldn't allow null interceptors");
-		}
-		catch (IllegalArgumentException ex) {
-			// Ok
-		}
+		new CglibAopProxy(null);
 	}
 
-	@Test
+	@Test(expected = AopConfigException.class)
 	public void testNoTarget() {
-		AdvisedSupport pc = new AdvisedSupport(new Class<?>[]{ITestBean.class});
+		AdvisedSupport pc = new AdvisedSupport(new Class<?>[] { ITestBean.class });
 		pc.addAdvice(new NopInterceptor());
-		try {
-			AopProxy aop = createAopProxy(pc);
-			aop.getProxy();
-			fail("Shouldn't allow no target with CGLIB proxy");
-		}
-		catch (AopConfigException ex) {
-			// Ok
-		}
+		AopProxy aop = createAopProxy(pc);
+		aop.getProxy();
 	}
 
 	@Test
@@ -210,7 +198,7 @@ public void testMultipleProxies() {
 
 		ITestBean proxy1 = getAdvisedProxy(target);
 		ITestBean proxy2 = getAdvisedProxy(target2);
-		assertTrue(proxy1.getClass() == proxy2.getClass());
+		assertSame(proxy1.getClass(), proxy2.getClass());
 		assertEquals(target.getAge(), proxy1.getAge());
 		assertEquals(target2.getAge(), proxy2.getAge());
 	}
@@ -256,7 +244,7 @@ public void testMultipleProxiesForIntroductionAdvisor() {
 
 		ITestBean proxy1 = getIntroductionAdvisorProxy(target);
 		ITestBean proxy2 = getIntroductionAdvisorProxy(target2);
-		assertTrue("Incorrect duplicate creation of proxy classes", proxy1.getClass() == proxy2.getClass());
+		assertSame("Incorrect duplicate creation of proxy classes", proxy1.getClass(), proxy2.getClass());
 	}
 
 	private ITestBean getIntroductionAdvisorProxy(TestBean target) {
@@ -427,6 +415,7 @@ protected int add(int x, int y) {
 			return x + y;
 		}
 
+		@SuppressWarnings("unchecked")
 		public <V extends MyInterface> boolean doWithVarargs(V... args) {
 			return true;
 		}