From 678d56847ac20b1e45e409d1b173266d285cbd4c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 14 Aug 2015 16:04:34 +0000 Subject: [PATCH] Refactor unit tests git-svn-id: https://svn.argeo.org/commons/trunk@8321 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- .../test/org/argeo/jcr/{ => spring}/CollectionsObject.java | 2 +- .../ext/test/org/argeo/jcr/{ => spring}/MapperTest.java | 6 ++++-- .../ext/test/org/argeo/jcr/{ => spring}/OtherObject.java | 2 +- .../ext/test/org/argeo/jcr/{ => spring}/SimpleObject.java | 2 +- .../ext/test/org/argeo/jcr/tabular/JcrTabularTest.java | 4 ++-- .../test/org/argeo/server/jcr/JcrResourceAdapterTest.java | 4 ++-- .../argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java} | 4 ++-- 7 files changed, 13 insertions(+), 11 deletions(-) rename org.argeo.server.jcr/ext/test/org/argeo/jcr/{ => spring}/CollectionsObject.java (98%) rename org.argeo.server.jcr/ext/test/org/argeo/jcr/{ => spring}/MapperTest.java (87%) rename org.argeo.server.jcr/ext/test/org/argeo/jcr/{ => spring}/OtherObject.java (96%) rename org.argeo.server.jcr/ext/test/org/argeo/jcr/{ => spring}/SimpleObject.java (98%) rename org.argeo.server.jcr/{ext/test/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java => src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java} (93%) diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/CollectionsObject.java b/org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/CollectionsObject.java similarity index 98% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/CollectionsObject.java rename to org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/CollectionsObject.java index 1cbb931a7..eadabfdad 100644 --- a/org.argeo.server.jcr/ext/test/org/argeo/jcr/CollectionsObject.java +++ b/org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/CollectionsObject.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.jcr; +package org.argeo.jcr.spring; import java.util.ArrayList; import java.util.HashMap; diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/MapperTest.java b/org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/MapperTest.java similarity index 87% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/MapperTest.java rename to org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/MapperTest.java index 8f4599cd6..e4bccd9ff 100644 --- a/org.argeo.server.jcr/ext/test/org/argeo/jcr/MapperTest.java +++ b/org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/MapperTest.java @@ -13,14 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.jcr; +package org.argeo.jcr.spring; import javax.jcr.Node; +import org.argeo.jackrabbit.unit.AbstractJackrabbitTestCase; +import org.argeo.jcr.JcrUtils; import org.argeo.jcr.spring.BeanNodeMapper; @Deprecated -public class MapperTest extends AbstractInternalJackrabbitTestCase { +public class MapperTest extends AbstractJackrabbitTestCase { public void testSimpleObject() throws Exception { SimpleObject mySo = new SimpleObject(); mySo.setInteger(100); diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/OtherObject.java b/org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/OtherObject.java similarity index 96% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/OtherObject.java rename to org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/OtherObject.java index 5cce8ffaa..d6fb699b2 100644 --- a/org.argeo.server.jcr/ext/test/org/argeo/jcr/OtherObject.java +++ b/org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/OtherObject.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.jcr; +package org.argeo.jcr.spring; public class OtherObject { private String key; diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/SimpleObject.java b/org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/SimpleObject.java similarity index 98% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/SimpleObject.java rename to org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/SimpleObject.java index cdc32fc99..d18dd04f6 100644 --- a/org.argeo.server.jcr/ext/test/org/argeo/jcr/SimpleObject.java +++ b/org.argeo.server.jcr/ext/test/org/argeo/jcr/spring/SimpleObject.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.jcr; +package org.argeo.jcr.spring; import java.util.UUID; diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java b/org.argeo.server.jcr/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java index 2045f9ae5..8896b2f4b 100644 --- a/org.argeo.server.jcr/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java +++ b/org.argeo.server.jcr/ext/test/org/argeo/jcr/tabular/JcrTabularTest.java @@ -25,7 +25,7 @@ import javax.jcr.PropertyType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.jackrabbit.commons.cnd.CndImporter; -import org.argeo.jcr.AbstractInternalJackrabbitTestCase; +import org.argeo.jackrabbit.unit.AbstractJackrabbitTestCase; import org.argeo.jcr.ArgeoNames; import org.argeo.jcr.ArgeoTypes; import org.argeo.util.tabular.TabularColumn; @@ -33,7 +33,7 @@ import org.argeo.util.tabular.TabularRow; import org.argeo.util.tabular.TabularRowIterator; import org.argeo.util.tabular.TabularWriter; -public class JcrTabularTest extends AbstractInternalJackrabbitTestCase { +public class JcrTabularTest extends AbstractJackrabbitTestCase { private final static Log log = LogFactory.getLog(JcrTabularTest.class); public void testWriteReadCsv() throws Exception { diff --git a/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java b/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java index b691572e9..3ce499af8 100644 --- a/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java +++ b/org.argeo.server.jcr/ext/test/org/argeo/server/jcr/JcrResourceAdapterTest.java @@ -23,12 +23,12 @@ import java.util.List; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.argeo.jcr.AbstractInternalJackrabbitTestCase; +import org.argeo.jackrabbit.unit.AbstractJackrabbitTestCase; import org.argeo.jcr.JcrResourceAdapter; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -public class JcrResourceAdapterTest extends AbstractInternalJackrabbitTestCase { +public class JcrResourceAdapterTest extends AbstractJackrabbitTestCase { private static SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMdd:hhmmss.SSS"); diff --git a/org.argeo.server.jcr/ext/test/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java b/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java similarity index 93% rename from org.argeo.server.jcr/ext/test/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java rename to org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java index 23281d075..1f3ff307a 100644 --- a/org.argeo.server.jcr/ext/test/org/argeo/jcr/AbstractInternalJackrabbitTestCase.java +++ b/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.argeo.jcr; +package org.argeo.jackrabbit.unit; import java.io.File; @@ -25,7 +25,7 @@ import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; /** Factorizes configuration of an in memory transient repository */ -public abstract class AbstractInternalJackrabbitTestCase extends +public abstract class AbstractJackrabbitTestCase extends AbstractJcrTestCase { protected File getRepositoryFile() throws Exception { Resource res = new ClassPathResource( -- 2.30.2