Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish proxy tests

Browse Source
This commit is contained in:
Sam Brannen
2015-09-08 18:34:36 +02:00
parent ae8a341a55
commit 22e84a87f4
4 changed files with 54 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

37
spring-context/src/test/java/org/springframework/aop/framework/JdkDynamicProxyTests.java
View File

@@ -20,6 +20,7 @@ import java.io.Serializable;
import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInterceptor;
import org.aopalliance.intercept.MethodInvocation; import org.aopalliance.intercept.MethodInvocation;
import org.junit.Test; import org.junit.Test;
import org.springframework.aop.interceptor.ExposeInvocationInterceptor; import org.springframework.aop.interceptor.ExposeInvocationInterceptor;
@@ -53,15 +54,9 @@ public class JdkDynamicProxyTests extends AbstractAopProxyTests implements Seria
} }
@Test @Test(expected = IllegalArgumentException.class)
public void testNullConfig() { public void testNullConfig() {
try { new JdkDynamicAopProxy(null);
new JdkDynamicAopProxy(null);
fail("Shouldn't allow null interceptors");
}
catch (IllegalArgumentException ex) {
// Ok
}
} }
@Test @Test
@@ -74,13 +69,13 @@ public class JdkDynamicProxyTests extends AbstractAopProxyTests implements Seria
Object proxy = aop.getProxy(); Object proxy = aop.getProxy();
assertTrue(proxy instanceof ITestBean); assertTrue(proxy instanceof ITestBean);
assertTrue(!(proxy instanceof TestBean)); assertFalse(proxy instanceof TestBean);
} }
@Test @Test
public void testInterceptorIsInvokedWithNoTarget() throws Throwable { public void testInterceptorIsInvokedWithNoTarget() throws Throwable {
// Test return value // Test return value
final Integer age = 25; final int age = 25;
MethodInterceptor mi = (invocation -> age); MethodInterceptor mi = (invocation -> age);
AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class}); AdvisedSupport pc = new AdvisedSupport(new Class<?>[] {ITestBean.class});
@@ -88,7 +83,7 @@ public class JdkDynamicProxyTests extends AbstractAopProxyTests implements Seria
AopProxy aop = createAopProxy(pc); AopProxy aop = createAopProxy(pc);
ITestBean tb = (ITestBean) aop.getProxy(); ITestBean tb = (ITestBean) aop.getProxy();
assertTrue("correct return value", tb.getAge() == age); assertEquals("correct return value", age, tb.getAge());
} }
@Test @Test
@@ -96,9 +91,9 @@ public class JdkDynamicProxyTests extends AbstractAopProxyTests implements Seria
final ExposedInvocationTestBean expectedTarget = new ExposedInvocationTestBean() { final ExposedInvocationTestBean expectedTarget = new ExposedInvocationTestBean() {
@Override @Override
protected void assertions(MethodInvocation invocation) { protected void assertions(MethodInvocation invocation) {
assertTrue(invocation.getThis() == this); assertEquals(this, invocation.getThis());
assertTrue("Invocation should be on ITestBean: " + invocation.getMethod(), assertEquals("Invocation should be on ITestBean: " + invocation.getMethod(),
invocation.getMethod().getDeclaringClass() == ITestBean.class); ITestBean.class, invocation.getMethod().getDeclaringClass());
} }
}; };
@@ -118,15 +113,6 @@ public class JdkDynamicProxyTests extends AbstractAopProxyTests implements Seria
ITestBean tb = (ITestBean) aop.getProxy(); ITestBean tb = (ITestBean) aop.getProxy();
tb.getName(); 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);
} }
@Test @Test
@@ -139,7 +125,6 @@ public class JdkDynamicProxyTests extends AbstractAopProxyTests implements Seria
Foo proxy = (Foo) createProxy(as); Foo proxy = (Foo) createProxy(as);
assertSame("Target should be returned when return types are incompatible", bean, proxy.getBarThis()); assertSame("Target should be returned when return types are incompatible", bean, proxy.getBarThis());
assertSame("Proxy should be returned when return types are compatible", proxy, proxy.getFooThis()); assertSame("Proxy should be returned when return types are compatible", proxy, proxy.getFooThis());
} }
@Test @Test
@@ -149,8 +134,8 @@ public class JdkDynamicProxyTests extends AbstractAopProxyTests implements Seria
JdkDynamicAopProxy aopProxy = new JdkDynamicAopProxy(as); JdkDynamicAopProxy aopProxy = new JdkDynamicAopProxy(as);
Named proxy = (Named) aopProxy.getProxy(); Named proxy = (Named) aopProxy.getProxy();
Named named = new Person(); Named named = new Person();
assertEquals("equals() returned false", proxy, named); assertEquals("equals()", proxy, named);
assertEquals("hashCode() not equal", proxy.hashCode(), named.hashCode()); assertEquals("hashCode()", proxy.hashCode(), named.hashCode());
} }

1
spring-context/src/test/java/org/springframework/aop/framework/ObjenesisProxyTests.java
View File

@@ -34,6 +34,7 @@ public class ObjenesisProxyTests {
@Test @Test
public void appliesAspectToClassWithComplexConstructor() { public void appliesAspectToClassWithComplexConstructor() {
@SuppressWarnings("resource")
ApplicationContext context = new ClassPathXmlApplicationContext("ObjenesisProxyTests-context.xml", getClass()); ApplicationContext context = new ClassPathXmlApplicationContext("ObjenesisProxyTests-context.xml", getClass());
ClassWithComplexConstructor bean = context.getBean(ClassWithComplexConstructor.class); ClassWithComplexConstructor bean = context.getBean(ClassWithComplexConstructor.class);