From 6f65116a34ad2ab11a89cc088d320015a733a701 Mon Sep 17 00:00:00 2001 From: Ramnivas Laddad Date: Wed, 28 Oct 2009 01:23:43 +0000 Subject: [PATCH] Renamed static_mock package to staticmock git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@2211 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../AbstractMethodMockingControl.aj | 2 +- .../JUnitStaticEntityMockingControl.aj | 2 +- .../{static_mock => staticmock}/MockStaticEntityMethods.java | 2 +- .../mock/{static_mock => staticmock}/Delegate.java | 4 +++- .../JUnitStaticEntityMockingControlTest.java | 4 +++- .../mock/{static_mock => staticmock}/Person.java | 2 +- .../mock/{static_mock => staticmock}/Person_Roo_Entity.aj | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) rename org.springframework.aspects/src/main/java/org/springframework/mock/{static_mock => staticmock}/AbstractMethodMockingControl.aj (95%) rename org.springframework.aspects/src/main/java/org/springframework/mock/{static_mock => staticmock}/JUnitStaticEntityMockingControl.aj (95%) rename org.springframework.aspects/src/main/java/org/springframework/mock/{static_mock => staticmock}/MockStaticEntityMethods.java (87%) rename org.springframework.aspects/src/test/java/org/springframework/mock/{static_mock => staticmock}/Delegate.java (91%) rename org.springframework.aspects/src/test/java/org/springframework/mock/{static_mock => staticmock}/JUnitStaticEntityMockingControlTest.java (95%) rename org.springframework.aspects/src/test/java/org/springframework/mock/{static_mock => staticmock}/Person.java (59%) rename org.springframework.aspects/src/test/java/org/springframework/mock/{static_mock => staticmock}/Person_Roo_Entity.aj (98%) diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/AbstractMethodMockingControl.aj b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj similarity index 95% rename from org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/AbstractMethodMockingControl.aj rename to org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj index ffdaa6b047a..30bf1ab8f69 100644 --- a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/AbstractMethodMockingControl.aj +++ b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/AbstractMethodMockingControl.aj @@ -1,4 +1,4 @@ -package org.springframework.mock.static_mock; +package org.springframework.mock.staticmock; import java.util.Arrays; import java.util.LinkedList; diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControl.aj b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControl.aj similarity index 95% rename from org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControl.aj rename to org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControl.aj index c732d7800be..397cbcda690 100644 --- a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControl.aj +++ b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControl.aj @@ -1,4 +1,4 @@ -package org.springframework.mock.static_mock; +package org.springframework.mock.staticmock; import javax.persistence.Entity; import org.junit.Test; diff --git a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/MockStaticEntityMethods.java b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java similarity index 87% rename from org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/MockStaticEntityMethods.java rename to org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java index b2efe668d2a..d98e75d953d 100644 --- a/org.springframework.aspects/src/main/java/org/springframework/mock/static_mock/MockStaticEntityMethods.java +++ b/org.springframework.aspects/src/main/java/org/springframework/mock/staticmock/MockStaticEntityMethods.java @@ -1,4 +1,4 @@ -package org.springframework.mock.static_mock; +package org.springframework.mock.staticmock; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Delegate.java b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java similarity index 91% rename from org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Delegate.java rename to org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java index 81a37a77f94..12280148c5f 100644 --- a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Delegate.java +++ b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Delegate.java @@ -1,4 +1,4 @@ -package org.springframework.mock.static_mock; +package org.springframework.mock.staticmock; import java.rmi.RemoteException; @@ -8,6 +8,8 @@ import junit.framework.Assert; import org.junit.Ignore; import org.junit.Test; +import org.springframework.mock.staticmock.JUnitStaticEntityMockingControl; +import org.springframework.mock.staticmock.MockStaticEntityMethods; //Used because verification failures occur after method returns, //so we can't test for them in the test case itself diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControlTest.java b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControlTest.java similarity index 95% rename from org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControlTest.java rename to org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControlTest.java index bfb2ce800b2..f409d3c5765 100644 --- a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/JUnitStaticEntityMockingControlTest.java +++ b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/JUnitStaticEntityMockingControlTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.mock.static_mock; +package org.springframework.mock.staticmock; import java.rmi.RemoteException; @@ -25,6 +25,8 @@ import junit.framework.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import org.springframework.mock.staticmock.JUnitStaticEntityMockingControl; +import org.springframework.mock.staticmock.MockStaticEntityMethods; import org.springframework.remoting.RemoteAccessException; diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person.java b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java similarity index 59% rename from org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person.java rename to org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java index 65f112cd094..c0d82c59c33 100644 --- a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person.java +++ b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person.java @@ -1,4 +1,4 @@ -package org.springframework.mock.static_mock; +package org.springframework.mock.staticmock; import javax.persistence.Entity; diff --git a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person_Roo_Entity.aj b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj similarity index 98% rename from org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person_Roo_Entity.aj rename to org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj index aadad7ce0f1..b911cee1b21 100644 --- a/org.springframework.aspects/src/test/java/org/springframework/mock/static_mock/Person_Roo_Entity.aj +++ b/org.springframework.aspects/src/test/java/org/springframework/mock/staticmock/Person_Roo_Entity.aj @@ -1,4 +1,4 @@ -package org.springframework.mock.static_mock; +package org.springframework.mock.staticmock; privileged aspect Person_Roo_Entity {