Menu
▾
▴
[jboss-cvs] container/src/tests/org/jboss/test/metadata/context/basic/test ...
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:48:32
|
User: adrian
Date: 06/07/10 08:18:47
Modified: src/tests/org/jboss/test/metadata/context/basic/test
BasicParentContextBasicMetaDataUnitTestCase.java
BasicContextBasicMetaDataUnitTestCase.java
BasicParentContextBasicAnnotationsUnitTestCase.java
BasicContextBasicAnnotationsUnitTestCase.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +19 -25 container/src/tests/org/jboss/test/metadata/context/basic/test/BasicParentContextBasicMetaDataUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BasicParentContextBasicMetaDataUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/context/basic/test/BasicParentContextBasicMetaDataUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicParentContextBasicMetaDataUnitTestCase.java 22 Jun 2006 14:57:28 -0000 1.1
+++ BasicParentContextBasicMetaDataUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -22,8 +22,9 @@
package org.jboss.test.metadata.context.basic.test;
import org.jboss.metadata.plugins.context.AbstractMetaDataContext;
-import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.loader.MetaDataLoader;
+import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.retrieval.MetaDataRetrievalToMetaDataBridge;
import org.jboss.test.metadata.shared.BasicMetaDataTest;
import org.jboss.test.metadata.shared.support.TestMetaData;
@@ -37,63 +38,56 @@
* BasicParentContextBasicMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class BasicParentContextBasicMetaDataUnitTestCase extends BasicMetaDataTest
{
public BasicParentContextBasicMetaDataUnitTestCase(String name)
{
- super(name);
+ super(name, false);
}
- protected MetaData setupEmpty()
+ protected MetaData setupMetaData(MetaDataLoader loader)
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
AbstractMetaDataContext parent = new AbstractMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
+ MutableMetaDataLoader empty = createTestMutableMetaDataLoader();
AbstractMetaDataContext context = new AbstractMetaDataContext(parent, empty);
return new MetaDataRetrievalToMetaDataBridge(context);
}
+ protected MetaData setupEmpty()
+ {
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
+ return setupMetaData(loader);
+ }
+
protected MetaData setupTestMetaData()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData(new TestMetaDataImpl(), TestMetaData.class);
- AbstractMetaDataContext parent = new AbstractMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- AbstractMetaDataContext context = new AbstractMetaDataContext(parent, empty);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
protected MetaData setupTestMetaData12()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData(new TestMetaData1Impl(), TestMetaData1.class);
loader.addMetaData(new TestMetaData2Impl(), TestMetaData2.class);
- AbstractMetaDataContext parent = new AbstractMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- AbstractMetaDataContext context = new AbstractMetaDataContext(parent, empty);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
protected MetaData setupTestMetaDataByName()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData("Test", new TestMetaDataImpl(), TestMetaData.class);
- AbstractMetaDataContext parent = new AbstractMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- AbstractMetaDataContext context = new AbstractMetaDataContext(parent, empty);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
protected MetaData setupTestMetaData12ByName()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData("Test1", new TestMetaData1Impl(), TestMetaData1.class);
loader.addMetaData("Test2", new TestMetaData2Impl(), TestMetaData2.class);
- AbstractMetaDataContext parent = new AbstractMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- AbstractMetaDataContext context = new AbstractMetaDataContext(parent, empty);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
}
1.2 +18 -16 container/src/tests/org/jboss/test/metadata/context/basic/test/BasicContextBasicMetaDataUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BasicContextBasicMetaDataUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/context/basic/test/BasicContextBasicMetaDataUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicContextBasicMetaDataUnitTestCase.java 22 Jun 2006 14:57:28 -0000 1.1
+++ BasicContextBasicMetaDataUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -22,8 +22,9 @@
package org.jboss.test.metadata.context.basic.test;
import org.jboss.metadata.plugins.context.AbstractMetaDataContext;
-import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.loader.MetaDataLoader;
+import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.retrieval.MetaDataRetrievalToMetaDataBridge;
import org.jboss.test.metadata.shared.BasicMetaDataTest;
import org.jboss.test.metadata.shared.support.TestMetaData;
@@ -37,53 +38,54 @@
* BasicContextBasicMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class BasicContextBasicMetaDataUnitTestCase extends BasicMetaDataTest
{
public BasicContextBasicMetaDataUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
- protected MetaData setupEmpty()
+ protected MetaData setupMetaData(MetaDataLoader loader)
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
AbstractMetaDataContext context = new AbstractMetaDataContext(null, loader);
return new MetaDataRetrievalToMetaDataBridge(context);
}
+ protected MetaData setupEmpty()
+ {
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
+ return setupMetaData(loader);
+ }
+
protected MetaData setupTestMetaData()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData(new TestMetaDataImpl(), TestMetaData.class);
- AbstractMetaDataContext context = new AbstractMetaDataContext(null, loader);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
protected MetaData setupTestMetaData12()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData(new TestMetaData1Impl(), TestMetaData1.class);
loader.addMetaData(new TestMetaData2Impl(), TestMetaData2.class);
- AbstractMetaDataContext context = new AbstractMetaDataContext(null, loader);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
protected MetaData setupTestMetaDataByName()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData("Test", new TestMetaDataImpl(), TestMetaData.class);
- AbstractMetaDataContext context = new AbstractMetaDataContext(null, loader);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
protected MetaData setupTestMetaData12ByName()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData("Test1", new TestMetaData1Impl(), TestMetaData1.class);
loader.addMetaData("Test2", new TestMetaData2Impl(), TestMetaData2.class);
- AbstractMetaDataContext context = new AbstractMetaDataContext(null, loader);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
}
1.2 +15 -15 container/src/tests/org/jboss/test/metadata/context/basic/test/BasicParentContextBasicAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BasicParentContextBasicAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/context/basic/test/BasicParentContextBasicAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicParentContextBasicAnnotationsUnitTestCase.java 22 Jun 2006 14:57:28 -0000 1.1
+++ BasicParentContextBasicAnnotationsUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -22,8 +22,9 @@
package org.jboss.test.metadata.context.basic.test;
import org.jboss.metadata.plugins.context.AbstractMetaDataContext;
-import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.loader.MetaDataLoader;
+import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.retrieval.MetaDataRetrievalToMetaDataBridge;
import org.jboss.test.metadata.shared.BasicAnnotationsTest;
import org.jboss.test.metadata.shared.support.TestAnnotation1Impl;
@@ -34,42 +35,41 @@
* BasicContextBasicAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class BasicParentContextBasicAnnotationsUnitTestCase extends BasicAnnotationsTest
{
public BasicParentContextBasicAnnotationsUnitTestCase(String name)
{
- super(name);
+ super(name, false);
}
- protected MetaData setupEmpty()
+ protected MetaData setupMetaData(MetaDataLoader loader)
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
AbstractMetaDataContext parent = new AbstractMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
+ MutableMetaDataLoader empty = createTestMutableMetaDataLoader();
AbstractMetaDataContext context = new AbstractMetaDataContext(parent, empty);
return new MetaDataRetrievalToMetaDataBridge(context);
}
+ protected MetaData setupEmpty()
+ {
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
+ return setupMetaData(loader);
+ }
+
protected MetaData setupTestAnnotation()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addAnnotation(new TestAnnotationImpl());
- AbstractMetaDataContext parent = new AbstractMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- AbstractMetaDataContext context = new AbstractMetaDataContext(parent, empty);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
protected MetaData setupTestAnnotation12()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addAnnotation(new TestAnnotation1Impl());
loader.addAnnotation(new TestAnnotation2Impl());
- AbstractMetaDataContext parent = new AbstractMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- AbstractMetaDataContext context = new AbstractMetaDataContext(parent, empty);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
}
1.2 +14 -10 container/src/tests/org/jboss/test/metadata/context/basic/test/BasicContextBasicAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BasicContextBasicAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/context/basic/test/BasicContextBasicAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicContextBasicAnnotationsUnitTestCase.java 22 Jun 2006 14:57:28 -0000 1.1
+++ BasicContextBasicAnnotationsUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -22,8 +22,9 @@
package org.jboss.test.metadata.context.basic.test;
import org.jboss.metadata.plugins.context.AbstractMetaDataContext;
-import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
import org.jboss.metadata.spi.MetaData;
+import org.jboss.metadata.spi.loader.MetaDataLoader;
+import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.retrieval.MetaDataRetrievalToMetaDataBridge;
import org.jboss.test.metadata.shared.BasicAnnotationsTest;
import org.jboss.test.metadata.shared.support.TestAnnotation1Impl;
@@ -34,36 +35,39 @@
* BasicContextBasicAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class BasicContextBasicAnnotationsUnitTestCase extends BasicAnnotationsTest
{
public BasicContextBasicAnnotationsUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
- protected MetaData setupEmpty()
+ protected MetaData setupMetaData(MetaDataLoader loader)
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
AbstractMetaDataContext context = new AbstractMetaDataContext(null, loader);
return new MetaDataRetrievalToMetaDataBridge(context);
}
+ protected MetaData setupEmpty()
+ {
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
+ return setupMetaData(loader);
+ }
+
protected MetaData setupTestAnnotation()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addAnnotation(new TestAnnotationImpl());
- AbstractMetaDataContext context = new AbstractMetaDataContext(null, loader);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
protected MetaData setupTestAnnotation12()
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addAnnotation(new TestAnnotation1Impl());
loader.addAnnotation(new TestAnnotation2Impl());
- AbstractMetaDataContext context = new AbstractMetaDataContext(null, loader);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
}
|