Menu
▾
▴
jboss-cvs-commits — CVS commits for JBoss
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
| 2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
| 2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
| 2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
| 2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:48:08
|
User: adrian
Date: 06/07/10 08:18:51
Modified: src/main/org/jboss/metadata/spi/retrieval/cummulative
CummulativeMetaDatasItem.java
CummulativeAnnotationsItem.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +13 -2 container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CummulativeMetaDatasItem.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CummulativeMetaDatasItem.java 22 Jun 2006 14:57:29 -0000 1.1
+++ CummulativeMetaDatasItem.java 10 Jul 2006 12:18:51 -0000 1.2
@@ -35,13 +35,16 @@
* CummulativeMetaDatasItem.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CummulativeMetaDatasItem extends SimpleMetaDatasItem
{
/** The context */
private MetaDataContext context;
+ /** Whether to include the parent */
+ private boolean includeParent;
+
/** The valid time */
private long validTime;
@@ -49,13 +52,15 @@
* Create a new CummulativeMetaDatasItem.
*
* @param context the context
+ * @param includeParent whether to include the parent
*/
- public CummulativeMetaDatasItem(MetaDataContext context)
+ public CummulativeMetaDatasItem(MetaDataContext context, boolean includeParent)
{
if (context == null)
throw new IllegalArgumentException("Null context");
this.context = context;
+ this.includeParent = includeParent;
init(context.getValidTime().getValidTime());
}
@@ -115,7 +120,13 @@
{
Set<MetaDataItem> temp = null;
- List<MetaDataRetrieval> retrievals = context.getRetrievals();
+ List<MetaDataRetrieval> retrievals = null;
+
+ if (includeParent)
+ retrievals = context.getRetrievals();
+ else
+ retrievals = context.getLocalRetrievals();
+
for (MetaDataRetrieval retrieval : retrievals)
{
MetaDatasItem item = retrieval.retrieveMetaData();
1.2 +13 -2 container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CummulativeAnnotationsItem.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CummulativeAnnotationsItem.java 22 Jun 2006 14:57:29 -0000 1.1
+++ CummulativeAnnotationsItem.java 10 Jul 2006 12:18:51 -0000 1.2
@@ -36,13 +36,16 @@
* CummulativeAnnotationsItem.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CummulativeAnnotationsItem extends SimpleAnnotationsItem
{
/** The context */
private MetaDataContext context;
+ /** Whether to include the parent */
+ private boolean includeParent;
+
/** The valid time */
private long validTime;
@@ -50,13 +53,15 @@
* Create a new CummulativeAnnotationsItem.
*
* @param context the context
+ * @param includeParent whether to include the parent
*/
- public CummulativeAnnotationsItem(MetaDataContext context)
+ public CummulativeAnnotationsItem(MetaDataContext context, boolean includeParent)
{
if (context == null)
throw new IllegalArgumentException("Null context");
this.context = context;
+ this.includeParent = includeParent;
init(context.getValidTime().getValidTime());
}
@@ -116,7 +121,13 @@
{
Set<AnnotationItem> temp = null;
- List<MetaDataRetrieval> retrievals = context.getRetrievals();
+ List<MetaDataRetrieval> retrievals = null;
+
+ if (includeParent)
+ retrievals = context.getRetrievals();
+ else
+ retrievals = context.getLocalRetrievals();
+
for (MetaDataRetrieval retrieval : retrievals)
{
AnnotationsItem item = retrieval.retrieveAnnotations();
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:48:08
|
User: adrian
Date: 06/07/10 08:18:48
Modified: src/tests/org/jboss/test/metadata/loader/reflection/test
ReflectionMetaDataLoaderTestSuite.java
AnnotatedElementLoaderBasicAnnotationsUnitTestCase.java
Added: src/tests/org/jboss/test/metadata/loader/reflection/test
AnnotatedElementLoaderScopeUnitTestCase.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +2 -1 container/src/tests/org/jboss/test/metadata/loader/reflection/test/ReflectionMetaDataLoaderTestSuite.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ReflectionMetaDataLoaderTestSuite.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/reflection/test/ReflectionMetaDataLoaderTestSuite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ReflectionMetaDataLoaderTestSuite.java 22 Jun 2006 14:57:30 -0000 1.1
+++ ReflectionMetaDataLoaderTestSuite.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -29,7 +29,7 @@
* ReflectionMetaDataLoader Test Suite.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ReflectionMetaDataLoaderTestSuite extends TestSuite
{
@@ -43,6 +43,7 @@
TestSuite suite = new TestSuite("Reflection MetaDataLoader Tests");
suite.addTest(new TestSuite(AnnotatedElementLoaderBasicAnnotationsUnitTestCase.class));
+ suite.addTest(new TestSuite(AnnotatedElementLoaderScopeUnitTestCase.class));
return suite;
}
1.2 +1 -1 container/src/tests/org/jboss/test/metadata/loader/reflection/test/AnnotatedElementLoaderBasicAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AnnotatedElementLoaderBasicAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/reflection/test/AnnotatedElementLoaderBasicAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AnnotatedElementLoaderBasicAnnotationsUnitTestCase.java 22 Jun 2006 14:57:30 -0000 1.1
+++ AnnotatedElementLoaderBasicAnnotationsUnitTestCase.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -33,13 +33,13 @@
* AnnotatedElementLoaderBasicAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class AnnotatedElementLoaderBasicAnnotationsUnitTestCase extends BasicAnnotationsTest
{
public AnnotatedElementLoaderBasicAnnotationsUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
protected MetaData setupEmpty()
1.1 date: 2006/07/10 12:18:48; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/loader/reflection/test/AnnotatedElementLoaderScopeUnitTestCase.java
Index: AnnotatedElementLoaderScopeUnitTestCase.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.loader.reflection.test;
import java.lang.reflect.AnnotatedElement;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.util.Collection;
import org.jboss.metadata.plugins.loader.reflection.AnnotatedElementMetaDataLoader;
import org.jboss.metadata.spi.scope.CommonLevels;
import org.jboss.metadata.spi.scope.Scope;
import org.jboss.metadata.spi.scope.ScopeKey;
import org.jboss.test.metadata.AbstractMetaDataTest;
import org.jboss.test.metadata.loader.reflection.support.TestAnnotationScopeBean;
/**
* AnnotatedElementLoaderScopeUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class AnnotatedElementLoaderScopeUnitTestCase extends AbstractMetaDataTest
{
public AnnotatedElementLoaderScopeUnitTestCase(String name)
{
super(name);
}
public void testClassScope() throws Exception
{
AnnotatedElementMetaDataLoader loader = new AnnotatedElementMetaDataLoader(TestAnnotationScopeBean.class);
ScopeKey scopeKey = loader.getScope();
assertNotNull(scopeKey);
Collection<Scope> scopes = scopeKey.getScopes();
assertEquals(1, scopes.size());
Scope scope = scopes.iterator().next();
assertEquals(CommonLevels.CLASS, scope.getScopeLevel());
assertEquals(TestAnnotationScopeBean.class.getName(), scope.getQualifier());
}
public void testFieldScope() throws Exception
{
Field field = TestAnnotationScopeBean.class.getField("something");
testMember(field);
}
public void testConstructorScope() throws Exception
{
Constructor<TestAnnotationScopeBean> constructor = TestAnnotationScopeBean.class.getConstructor(null);
testMember(constructor);
}
public void testMethodScope() throws Exception
{
Method method = TestAnnotationScopeBean.class.getMethod("doSomething", null);
testMember(method);
}
protected void testMember(Member member) throws Exception
{
assertNotNull(member);
AnnotatedElementMetaDataLoader loader = new AnnotatedElementMetaDataLoader((AnnotatedElement) member);
ScopeKey scopeKey = loader.getScope();
assertNotNull(scopeKey);
Collection<Scope> scopes = scopeKey.getScopes();
assertEquals(1, scopes.size());
Scope scope = scopes.iterator().next();
assertEquals(CommonLevels.JOINPOINT, scope.getScopeLevel());
assertEquals(member.getName(), scope.getQualifier());
}
}
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:47:59
|
User: adrian
Date: 06/07/10 08:18:48
Modified: src/tests/org/jboss/test/metadata/loader
MutableMetaDataLoaderAnnotationsInvalidationTest.java
MutableMetaDataTest.java
MutableAnnotationsTest.java
MutableMetaDataLoaderMetaDataInvalidationTest.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +17 -34 container/src/tests/org/jboss/test/metadata/loader/MutableMetaDataLoaderAnnotationsInvalidationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MutableMetaDataLoaderAnnotationsInvalidationTest.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/MutableMetaDataLoaderAnnotationsInvalidationTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MutableMetaDataLoaderAnnotationsInvalidationTest.java 22 Jun 2006 14:57:28 -0000 1.1
+++ MutableMetaDataLoaderAnnotationsInvalidationTest.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -36,7 +36,7 @@
* MutableAnnotationsTest.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class MutableMetaDataLoaderAnnotationsInvalidationTest extends AbstractMetaDataTest
{
@@ -52,8 +52,7 @@
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertValidTimeUnchanged(metaData, last);
}
@@ -66,20 +65,17 @@
assertNoAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotationImpl(), expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertRemoveAnnotation(metaData, TestAnnotation.class, expectedAnnotations, last);
assertNoAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testTestAnnotation12() throws Exception
@@ -91,36 +87,31 @@
assertNoAnnotation(metaData, TestAnnotation1.class);
assertNoAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotation1Impl(), expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation1.class);
assertNoAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotation2Impl(), expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation1.class);
assertAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertRemoveAnnotation(metaData, TestAnnotation1.class, expectedAnnotations, last);
assertNoAnnotation(metaData, TestAnnotation1.class);
assertAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertRemoveAnnotation(metaData, TestAnnotation2.class, expectedAnnotations, last);
assertNoAnnotation(metaData, TestAnnotation1.class);
assertNoAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testAddTwice() throws Exception
@@ -131,20 +122,17 @@
assertNoAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotationImpl(), expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationWithPrevious(metaData, new TestAnnotationImpl(), last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testAddTwiceSameObject() throws Exception
@@ -155,21 +143,18 @@
assertNoAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
TestAnnotation annotation = new TestAnnotationImpl();
last = assertAddAnnotationNoPrevious(metaData, annotation, expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertAddAnnotationWithPreviousSameObject(metaData, annotation, last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testRemoveDoesNotExist() throws Exception
@@ -179,8 +164,7 @@
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
assertNotRemovedAnnotation(metaData, TestAnnotation.class, last);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testRemoveTwice() throws Exception
@@ -192,8 +176,7 @@
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotationImpl(), expectedAnnotations, last);
assertRemoveAnnotation(metaData, TestAnnotation.class, expectedAnnotations, last);
assertNotRemovedAnnotation(metaData, TestAnnotation.class, last);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
protected abstract MutableMetaDataLoader setupEmpty();
1.2 +48 -48 container/src/tests/org/jboss/test/metadata/loader/MutableMetaDataTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MutableMetaDataTest.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/MutableMetaDataTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MutableMetaDataTest.java 22 Jun 2006 14:57:28 -0000 1.1
+++ MutableMetaDataTest.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -23,7 +23,7 @@
import org.jboss.test.metadata.AbstractMetaDataTest;
import org.jboss.test.metadata.shared.support.ExpectedMetaData;
-import org.jboss.test.metadata.shared.support.MutableMetaDataLoaderToMetaDataBridge;
+import org.jboss.test.metadata.shared.support.MetaDataAndMutableMetaData;
import org.jboss.test.metadata.shared.support.NotPresentType;
import org.jboss.test.metadata.shared.support.TestMetaData;
import org.jboss.test.metadata.shared.support.TestMetaData1;
@@ -36,7 +36,7 @@
* MutableMetaDataTest.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class MutableMetaDataTest extends AbstractMetaDataTest
{
@@ -47,259 +47,259 @@
public void testEmpty() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertValidTimeUnchanged(metaData, last);
}
public void testTestMetaData() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), TestMetaData.class, expected, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, TestMetaData.class, expected, last);
assertNoMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testTestMetaData12() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, TestMetaData1.class);
assertNoMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaData1Impl(), TestMetaData1.class, expected, last);
assertMetaData(metaData, TestMetaData1.class);
assertNoMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaData2Impl(), TestMetaData2.class, expected, last);
assertMetaData(metaData, TestMetaData1.class);
assertMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, TestMetaData1.class, expected, last);
assertNoMetaData(metaData, TestMetaData1.class);
assertMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, TestMetaData2.class, expected, last);
assertNoMetaData(metaData, TestMetaData1.class);
assertNoMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testAddTwice() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), TestMetaData.class, expected, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataWithPrevious(metaData, new TestMetaDataImpl(), TestMetaData.class, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testAddTwiceSameObject() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
TestMetaData object = new TestMetaDataImpl();
last = assertAddMetaDataNoPrevious(metaData, object, TestMetaData.class, expected, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertAddMetaDataWithPreviousSameObject(metaData, object, TestMetaData.class, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testRemoveDoesNotExist() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNotRemovedMetaData(metaData, TestMetaData.class, last);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testRemoveTwice() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), TestMetaData.class, expected, last);
assertRemoveMetaData(metaData, TestMetaData.class, expected, last);
assertNotRemovedMetaData(metaData, TestMetaData.class, last);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testTestMetaDataByName() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), "Test", TestMetaData.class, expected, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, "Test", TestMetaData.class, expected, last);
assertNoMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testTestMetaData12ByName() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, "Test1", TestMetaData1.class);
assertNoMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaData1Impl(), "Test1", TestMetaData1.class, expected, last);
assertMetaData(metaData, "Test1", TestMetaData1.class);
assertNoMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaData2Impl(), "Test2", TestMetaData2.class, expected, last);
assertMetaData(metaData, "Test1", TestMetaData1.class);
assertMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, "Test1", TestMetaData1.class, expected, last);
assertNoMetaData(metaData, "Test1", TestMetaData1.class);
assertMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, "Test2", TestMetaData2.class, expected, last);
assertNoMetaData(metaData, "Test1", TestMetaData1.class);
assertNoMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testAddTwiceByName() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), "Test", TestMetaData.class, expected, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataWithPrevious(metaData, new TestMetaDataImpl(), "Test", TestMetaData.class, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testAddTwiceSameObjectByName() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
TestMetaData object = new TestMetaDataImpl();
last = assertAddMetaDataNoPrevious(metaData, object, "Test", TestMetaData.class, expected, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertAddMetaDataWithPreviousSameObject(metaData, object, "Test", TestMetaData.class, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testRemoveDoesNotExistByName() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
assertNotRemovedMetaData(metaData, "Test", TestMetaData.class, last);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testRemoveTwiceByName() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedMetaData expected = emptyExpectedMetaData();
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), "Test", TestMetaData.class, expected, last);
assertRemoveMetaData(metaData, "Test", TestMetaData.class, expected, last);
assertNotRemovedMetaData(metaData, "Test", TestMetaData.class, last);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
- protected abstract MutableMetaDataLoaderToMetaDataBridge setupEmpty();
+ protected abstract MetaDataAndMutableMetaData setupEmpty();
}
1.2 +26 -43 container/src/tests/org/jboss/test/metadata/loader/MutableAnnotationsTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MutableAnnotationsTest.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/MutableAnnotationsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MutableAnnotationsTest.java 22 Jun 2006 14:57:28 -0000 1.1
+++ MutableAnnotationsTest.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -23,7 +23,7 @@
import org.jboss.test.metadata.AbstractMetaDataTest;
import org.jboss.test.metadata.shared.support.ExpectedAnnotations;
-import org.jboss.test.metadata.shared.support.MutableMetaDataLoaderToMetaDataBridge;
+import org.jboss.test.metadata.shared.support.MetaDataAndMutableMetaData;
import org.jboss.test.metadata.shared.support.NotPresentAnnotation;
import org.jboss.test.metadata.shared.support.TestAnnotation;
import org.jboss.test.metadata.shared.support.TestAnnotation1;
@@ -36,7 +36,7 @@
* MutableAnnotationsTest.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class MutableAnnotationsTest extends AbstractMetaDataTest
{
@@ -47,154 +47,137 @@
public void testEmpty() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertValidTimeUnchanged(metaData, last);
}
public void testTestAnnotation() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
assertNoAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotationImpl(), expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertRemoveAnnotation(metaData, TestAnnotation.class, expectedAnnotations, last);
assertNoAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testTestAnnotation12() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
assertNoAnnotation(metaData, TestAnnotation1.class);
assertNoAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotation1Impl(), expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation1.class);
assertNoAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotation2Impl(), expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation1.class);
assertAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertRemoveAnnotation(metaData, TestAnnotation1.class, expectedAnnotations, last);
assertNoAnnotation(metaData, TestAnnotation1.class);
assertAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertRemoveAnnotation(metaData, TestAnnotation2.class, expectedAnnotations, last);
assertNoAnnotation(metaData, TestAnnotation1.class);
assertNoAnnotation(metaData, TestAnnotation2.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testAddTwice() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
assertNoAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotationImpl(), expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
last = assertAddAnnotationWithPrevious(metaData, new TestAnnotationImpl(), last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testAddTwiceSameObject() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
assertNoAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
TestAnnotation annotation = new TestAnnotationImpl();
last = assertAddAnnotationNoPrevious(metaData, annotation, expectedAnnotations, last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
assertAddAnnotationWithPreviousSameObject(metaData, annotation, last);
assertAnnotation(metaData, TestAnnotation.class);
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testRemoveDoesNotExist() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
assertNotRemovedAnnotation(metaData, TestAnnotation.class, last);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
public void testRemoveTwice() throws Exception
{
- MutableMetaDataLoaderToMetaDataBridge metaData = setupEmpty();
+ MetaDataAndMutableMetaData metaData = setupEmpty();
long last = metaData.getValidTime();
ExpectedAnnotations expectedAnnotations = emptyExpectedAnnotations();
last = assertAddAnnotationNoPrevious(metaData, new TestAnnotationImpl(), expectedAnnotations, last);
assertRemoveAnnotation(metaData, TestAnnotation.class, expectedAnnotations, last);
assertNotRemovedAnnotation(metaData, TestAnnotation.class, last);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations);
}
- protected abstract MutableMetaDataLoaderToMetaDataBridge setupEmpty();
+ protected abstract MetaDataAndMutableMetaData setupEmpty();
}
1.2 +33 -33 container/src/tests/org/jboss/test/metadata/loader/MutableMetaDataLoaderMetaDataInvalidationTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MutableMetaDataLoaderMetaDataInvalidationTest.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/MutableMetaDataLoaderMetaDataInvalidationTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MutableMetaDataLoaderMetaDataInvalidationTest.java 22 Jun 2006 14:57:28 -0000 1.1
+++ MutableMetaDataLoaderMetaDataInvalidationTest.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -36,7 +36,7 @@
* MutableMetaDataLoaderMetaDataInvalidationTest.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class MutableMetaDataLoaderMetaDataInvalidationTest extends AbstractMetaDataTest
{
@@ -52,7 +52,7 @@
ExpectedMetaData expected = emptyExpectedMetaData();
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertValidTimeUnchanged(metaData, last);
}
@@ -65,17 +65,17 @@
assertNoMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), TestMetaData.class, expected, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, TestMetaData.class, expected, last);
assertNoMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testTestMetaData12() throws Exception
@@ -87,31 +87,31 @@
assertNoMetaData(metaData, TestMetaData1.class);
assertNoMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaData1Impl(), TestMetaData1.class, expected, last);
assertMetaData(metaData, TestMetaData1.class);
assertNoMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaData2Impl(), TestMetaData2.class, expected, last);
assertMetaData(metaData, TestMetaData1.class);
assertMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, TestMetaData1.class, expected, last);
assertNoMetaData(metaData, TestMetaData1.class);
assertMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, TestMetaData2.class, expected, last);
assertNoMetaData(metaData, TestMetaData1.class);
assertNoMetaData(metaData, TestMetaData2.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testAddTwice() throws Exception
@@ -122,17 +122,17 @@
assertNoMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), TestMetaData.class, expected, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataWithPrevious(metaData, new TestMetaDataImpl(), TestMetaData.class, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testAddTwiceSameObject() throws Exception
@@ -143,18 +143,18 @@
assertNoMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
TestMetaData object = new TestMetaDataImpl();
last = assertAddMetaDataNoPrevious(metaData, object, TestMetaData.class, expected, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertAddMetaDataWithPreviousSameObject(metaData, object, TestMetaData.class, last);
assertMetaData(metaData, TestMetaData.class);
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testRemoveDoesNotExist() throws Exception
@@ -164,7 +164,7 @@
ExpectedMetaData expected = emptyExpectedMetaData();
assertNotRemovedMetaData(metaData, TestMetaData.class, last);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testRemoveTwice() throws Exception
@@ -176,7 +176,7 @@
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), TestMetaData.class, expected, last);
assertRemoveMetaData(metaData, TestMetaData.class, expected, last);
assertNotRemovedMetaData(metaData, TestMetaData.class, last);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testTestMetaDataByName() throws Exception
@@ -187,17 +187,17 @@
assertNoMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), "Test", TestMetaData.class, expected, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, "Test", TestMetaData.class, expected, last);
assertNoMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testTestMetaData12ByName() throws Exception
@@ -209,31 +209,31 @@
assertNoMetaData(metaData, "Test1", TestMetaData1.class);
assertNoMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaData1Impl(), "Test1", TestMetaData1.class, expected, last);
assertMetaData(metaData, "Test1", TestMetaData1.class);
assertNoMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaData2Impl(), "Test2", TestMetaData2.class, expected, last);
assertMetaData(metaData, "Test1", TestMetaData1.class);
assertMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, "Test1", TestMetaData1.class, expected, last);
assertNoMetaData(metaData, "Test1", TestMetaData1.class);
assertMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertRemoveMetaData(metaData, "Test2", TestMetaData2.class, expected, last);
assertNoMetaData(metaData, "Test1", TestMetaData1.class);
assertNoMetaData(metaData, "Test2", TestMetaData2.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testAddTwiceByName() throws Exception
@@ -244,17 +244,17 @@
assertNoMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), "Test", TestMetaData.class, expected, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
last = assertAddMetaDataWithPrevious(metaData, new TestMetaDataImpl(), "Test", TestMetaData.class, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testAddTwiceSameObjectByName() throws Exception
@@ -265,18 +265,18 @@
assertNoMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
TestMetaData object = new TestMetaDataImpl();
last = assertAddMetaDataNoPrevious(metaData, object, "Test", TestMetaData.class, expected, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
assertAddMetaDataWithPreviousSameObject(metaData, object, "Test", TestMetaData.class, last);
assertMetaData(metaData, "Test", TestMetaData.class);
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testRemoveDoesNotExistByName() throws Exception
@@ -286,7 +286,7 @@
ExpectedMetaData expected = emptyExpectedMetaData();
assertNotRemovedMetaData(metaData, "Test", TestMetaData.class, last);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
public void testRemoveTwiceByName() throws Exception
@@ -298,7 +298,7 @@
last = assertAddMetaDataNoPrevious(metaData, new TestMetaDataImpl(), "Test", TestMetaData.class, expected, last);
assertRemoveMetaData(metaData, "Test", TestMetaData.class, expected, last);
assertNotRemovedMetaData(metaData, "Test", TestMetaData.class, last);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected);
}
protected abstract MutableMetaDataLoader setupEmpty();
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:47:49
|
User: adrian
Date: 06/07/10 08:18:51
Modified: src/tests/org/jboss/test/metadata/retrieval/test
HelpersUnitTestCase.java
CummulativeUnitTestCase.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +6 -0 container/src/tests/org/jboss/test/metadata/retrieval/test/HelpersUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HelpersUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/retrieval/test/HelpersUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- HelpersUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ HelpersUnitTestCase.java 10 Jul 2006 12:18:51 -0000 1.2
@@ -46,7 +46,7 @@
* HelpersUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class HelpersUnitTestCase extends AbstractMetaDataTest
{
@@ -83,9 +83,15 @@
metaData.getAnnotations();
assertEquals("retrieveAnnotations", test.lastMethod);
+ metaData.getLocalAnnotations();
+ assertEquals("retrieveLocalAnnotations", test.lastMethod);
+
metaData.getMetaData();
assertEquals("retrieveMetaData", test.lastMethod);
+ metaData.getLocalMetaData();
+ assertEquals("retrieveLocalMetaData", test.lastMethod);
+
metaData.getMetaData(Object.class);
assertEquals("retrieveMetaData(Class)", test.lastMethod);
1.2 +7 -7 container/src/tests/org/jboss/test/metadata/retrieval/test/CummulativeUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CummulativeUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/retrieval/test/CummulativeUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CummulativeUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ CummulativeUnitTestCase.java 10 Jul 2006 12:18:51 -0000 1.2
@@ -24,7 +24,7 @@
import java.lang.annotation.Annotation;
import org.jboss.metadata.plugins.context.AbstractMetaDataContext;
-import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
+import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.retrieval.AnnotationItem;
import org.jboss.metadata.spi.retrieval.AnnotationsItem;
import org.jboss.metadata.spi.retrieval.MetaDataItem;
@@ -39,7 +39,7 @@
* CummulativeUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CummulativeUnitTestCase extends AbstractMetaDataTest
{
@@ -50,10 +50,10 @@
public void testCummulativeAnnotationsItem() throws Exception
{
- MemoryMetaDataLoader parentLoader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader parentLoader = createTestMutableMetaDataLoader();
AbstractMetaDataContext parent = new AbstractMetaDataContext(parentLoader);
- MemoryMetaDataLoader childLoader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader childLoader = createTestMutableMetaDataLoader();
AbstractMetaDataContext child = new AbstractMetaDataContext(parent, childLoader);
AnnotationsItem item = child.retrieveAnnotations();
@@ -112,10 +112,10 @@
public void testCummulativeMetaDatasItem() throws Exception
{
- MemoryMetaDataLoader parentLoader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader parentLoader = createTestMutableMetaDataLoader();
AbstractMetaDataContext parent = new AbstractMetaDataContext(parentLoader);
- MemoryMetaDataLoader childLoader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader childLoader = createTestMutableMetaDataLoader();
AbstractMetaDataContext child = new AbstractMetaDataContext(parent, childLoader);
MetaDatasItem item = child.retrieveMetaData();
@@ -174,10 +174,10 @@
public void testCummulativeMetaDatasItemByName() throws Exception
{
- MemoryMetaDataLoader parentLoader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader parentLoader = createTestMutableMetaDataLoader();
AbstractMetaDataContext parent = new AbstractMetaDataContext(parentLoader);
- MemoryMetaDataLoader childLoader = new MemoryMetaDataLoader();
+ MutableMetaDataLoader childLoader = createTestMutableMetaDataLoader();
AbstractMetaDataContext child = new AbstractMetaDataContext(parent, childLoader);
MetaDatasItem item = child.retrieveMetaData();
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:47:48
|
User: adrian
Date: 06/07/10 08:18:50
Added: src/main/org/jboss/metadata/plugins/repository/basic
BasicMetaDataRepository.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.1 date: 2006/07/10 12:18:50; author: adrian; state: Exp;container/src/main/org/jboss/metadata/plugins/repository/basic/BasicMetaDataRepository.java
Index: BasicMetaDataRepository.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.metadata.plugins.repository.basic;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.jboss.metadata.plugins.repository.AbstractMetaDataRepository;
import org.jboss.metadata.plugins.repository.visitor.ChildrenMetaDataRepositoryVisitor;
import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
import org.jboss.metadata.spi.repository.visitor.MetaDataRepositoryVisitor;
import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
import org.jboss.metadata.spi.scope.ScopeKey;
/**
* BasicMetaDataRepository.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class BasicMetaDataRepository extends AbstractMetaDataRepository implements MutableMetaDataRepository
{
/** The retrievals */
private Map<ScopeKey, MetaDataRetrieval> retrievals = new ConcurrentHashMap<ScopeKey, MetaDataRetrieval>();
public MetaDataRetrieval getMetaDataRetrieval(ScopeKey key)
{
return retrievals.get(key);
}
public Set<ScopeKey> getChildren(ScopeKey key)
{
if (key == null)
return retrievals.keySet();
ChildrenMetaDataRepositoryVisitor visitor = new ChildrenMetaDataRepositoryVisitor(key);
return matchScopes(visitor);
}
public Set<ScopeKey> matchScopes(MetaDataRepositoryVisitor visitor)
{
Set<ScopeKey> result = new HashSet<ScopeKey>();
for (ScopeKey repositoryKey : retrievals.keySet())
{
if (visitor.matchScope(this, repositoryKey))
result.add(repositoryKey);
}
return result;
}
public MetaDataRetrieval addMetaDataRetrieval(MetaDataRetrieval retrieval)
{
if (retrieval == null)
throw new IllegalArgumentException("Null retrieval");
ScopeKey key = retrieval.getScope();
key.freeze();
return retrievals.put(key, retrieval);
}
public MetaDataRetrieval removeMetaDataRetrieval(ScopeKey key)
{
if (key == null)
throw new IllegalArgumentException("Null key");
return retrievals.remove(key);
}
}
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:47:46
|
User: adrian
Date: 06/07/10 08:18:47
Modified: src/tests/org/jboss/test/metadata/loader/threadlocal/test
ThreadLocalLoaderBasicMetaDataUnitTestCase.java
ThreadLocalMetaDataLoaderTestSuite.java
ThreadLocalLoaderBasicAnnotationsUnitTestCase.java
ThreadLocalLoaderMutableMetaDataUnitTestCase.java
ThreadLocalLoaderMutableAnnotationsUnitTestCase.java
Added: src/tests/org/jboss/test/metadata/loader/threadlocal/test
ThreadLocalLoaderScopeUnitTestCase.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +1 -1 container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderBasicMetaDataUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ThreadLocalLoaderBasicMetaDataUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderBasicMetaDataUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ThreadLocalLoaderBasicMetaDataUnitTestCase.java 22 Jun 2006 14:57:28 -0000 1.1
+++ ThreadLocalLoaderBasicMetaDataUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -36,7 +36,7 @@
* ThreadLocalLoaderBasicMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ThreadLocalLoaderBasicMetaDataUnitTestCase extends BasicMetaDataTest
{
@@ -44,7 +44,7 @@
public ThreadLocalLoaderBasicMetaDataUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
protected void tearDown() throws Exception
1.2 +1 -0 container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalMetaDataLoaderTestSuite.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ThreadLocalMetaDataLoaderTestSuite.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalMetaDataLoaderTestSuite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ThreadLocalMetaDataLoaderTestSuite.java 22 Jun 2006 14:57:28 -0000 1.1
+++ ThreadLocalMetaDataLoaderTestSuite.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -29,7 +29,7 @@
* ThreadLocalMetaDataLoaderTestSuite.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ThreadLocalMetaDataLoaderTestSuite extends TestSuite
{
@@ -50,6 +50,7 @@
suite.addTest(new TestSuite(ThreadLocalLoaderMutableMetaDataInvalidationUnitTestCase.class));
suite.addTest(new TestSuite(ThreadLocalLoaderUnitTestCase.class));
suite.addTest(new TestSuite(ThreadLocalLoaderRestrictedUnitTestCase.class));
+ suite.addTest(new TestSuite(ThreadLocalLoaderScopeUnitTestCase.class));
return suite;
}
1.2 +1 -1 container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderBasicAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ThreadLocalLoaderBasicAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderBasicAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ThreadLocalLoaderBasicAnnotationsUnitTestCase.java 22 Jun 2006 14:57:28 -0000 1.1
+++ ThreadLocalLoaderBasicAnnotationsUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -33,7 +33,7 @@
* ThreadLocalLoaderBasicAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ThreadLocalLoaderBasicAnnotationsUnitTestCase extends BasicAnnotationsTest
{
@@ -41,7 +41,7 @@
public ThreadLocalLoaderBasicAnnotationsUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
protected void tearDown() throws Exception
1.2 +2 -1 container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderMutableMetaDataUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ThreadLocalLoaderMutableMetaDataUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderMutableMetaDataUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ThreadLocalLoaderMutableMetaDataUnitTestCase.java 22 Jun 2006 14:57:28 -0000 1.1
+++ ThreadLocalLoaderMutableMetaDataUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -23,13 +23,14 @@
import org.jboss.metadata.plugins.loader.thread.ThreadLocalMetaDataLoader;
import org.jboss.test.metadata.loader.MutableMetaDataTest;
+import org.jboss.test.metadata.shared.support.MetaDataAndMutableMetaData;
import org.jboss.test.metadata.shared.support.MutableMetaDataLoaderToMetaDataBridge;
/**
* ThreadLocalLoaderMutableMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ThreadLocalLoaderMutableMetaDataUnitTestCase extends MutableMetaDataTest
{
@@ -46,7 +47,7 @@
super.tearDown();
}
- protected MutableMetaDataLoaderToMetaDataBridge setupEmpty()
+ protected MetaDataAndMutableMetaData setupEmpty()
{
return new MutableMetaDataLoaderToMetaDataBridge(loader);
}
1.2 +2 -1 container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderMutableAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ThreadLocalLoaderMutableAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderMutableAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ThreadLocalLoaderMutableAnnotationsUnitTestCase.java 22 Jun 2006 14:57:28 -0000 1.1
+++ ThreadLocalLoaderMutableAnnotationsUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -23,13 +23,14 @@
import org.jboss.metadata.plugins.loader.thread.ThreadLocalMetaDataLoader;
import org.jboss.test.metadata.loader.MutableAnnotationsTest;
+import org.jboss.test.metadata.shared.support.MetaDataAndMutableMetaData;
import org.jboss.test.metadata.shared.support.MutableMetaDataLoaderToMetaDataBridge;
/**
* ThreadLocalLoaderMutableAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ThreadLocalLoaderMutableAnnotationsUnitTestCase extends MutableAnnotationsTest
{
@@ -46,7 +47,7 @@
super.tearDown();
}
- protected MutableMetaDataLoaderToMetaDataBridge setupEmpty()
+ protected MetaDataAndMutableMetaData setupEmpty()
{
return new MutableMetaDataLoaderToMetaDataBridge(loader);
}
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderScopeUnitTestCase.java
Index: ThreadLocalLoaderScopeUnitTestCase.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.loader.threadlocal.test;
import java.util.Collection;
import java.util.concurrent.CountDownLatch;
import org.jboss.metadata.plugins.loader.thread.ThreadLocalMetaDataLoader;
import org.jboss.metadata.spi.scope.CommonLevels;
import org.jboss.metadata.spi.scope.Scope;
import org.jboss.metadata.spi.scope.ScopeKey;
import org.jboss.test.metadata.AbstractMetaDataTest;
/**
* AnnotatedElementLoaderScopeUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class ThreadLocalLoaderScopeUnitTestCase extends AbstractMetaDataTest
{
ThreadLocalMetaDataLoader loader = ThreadLocalMetaDataLoader.INSTANCE;
CountDownLatch entryLatch;
public ThreadLocalLoaderScopeUnitTestCase(String name)
{
super(name);
}
public void testThreadScope() throws Exception
{
TestScopeRunnable[] runnables = new TestScopeRunnable[5];
Thread[] threads = new Thread[runnables.length];
entryLatch = new CountDownLatch(runnables.length);
for (int i = 0; i < 5; ++i)
{
runnables[i] = new TestScopeRunnable();
threads[i] = new Thread(runnables[i], "Thread" + i);
threads[i].start();
}
for (int i = 0; i< 5; ++i)
{
threads[i].join();
assertNull(runnables[i].error);
}
}
public class TestScopeRunnable implements Runnable
{
Throwable error;
public void run()
{
try
{
entryLatch.countDown();
entryLatch.await();
ScopeKey scopeKey = loader.getScope();
assertNotNull(scopeKey);
Collection<Scope> scopes = scopeKey.getScopes();
assertEquals(1, scopes.size());
Scope scope = scopes.iterator().next();
assertEquals(CommonLevels.THREAD, scope.getScopeLevel());
assertEquals(Thread.currentThread().getName(), scope.getQualifier());
}
catch (Throwable t)
{
log.error("Error", t);
error = t;
}
}
}
}
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:47:43
|
User: adrian
Date: 06/07/10 08:18:51
Added: src/main/org/jboss/metadata/spi/repository/visitor
MetaDataRepositoryVisitor.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.1 date: 2006/07/10 12:18:51; author: adrian; state: Exp;container/src/main/org/jboss/metadata/spi/repository/visitor/MetaDataRepositoryVisitor.java
Index: MetaDataRepositoryVisitor.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.metadata.spi.repository.visitor;
import org.jboss.metadata.spi.repository.MetaDataRepository;
import org.jboss.metadata.spi.scope.ScopeKey;
/**
* MetaDataRepositoryVisitor.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public interface MetaDataRepositoryVisitor
{
/**
* Decide whether the scope matches
*
* @param repository the repository
* @param key the scope key
* @return true when it matches
*/
boolean matchScope(MetaDataRepository repository, ScopeKey key);
}
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian Date: 06/07/10 08:18:41 Log: Directory /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/repository/visitor added to the repository |
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian
Date: 06/07/10 08:18:48
Modified: src/main/org/jboss/metadata/spi/context
MetaDataContext.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +12 -0 container/src/main/org/jboss/metadata/spi/context/MetaDataContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MetaDataContext.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/context/MetaDataContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MetaDataContext.java 22 Jun 2006 14:57:30 -0000 1.1
+++ MetaDataContext.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -29,11 +29,16 @@
* MetaDataContext.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface MetaDataContext extends MetaDataRetrieval
{
/**
+ * Get the parent
+ */
+ MetaDataContext getParent();
+
+ /**
* Get the retrievals
*
* @return the retrievals
@@ -41,6 +46,13 @@
List<MetaDataRetrieval> getRetrievals();
/**
+ * Get the local retrievals
+ *
+ * @return the local retrievals
+ */
+ List<MetaDataRetrieval> getLocalRetrievals();
+
+ /**
* Append a meta data retrieval
*
* @param retrieval the meta data retrieval
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian Date: 06/07/10 08:18:42 Log: Directory /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/scope/test added to the repository |
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian Date: 06/07/10 08:18:41 Log: Directory /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/repository added to the repository |
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian
Date: 06/07/10 08:18:47
Modified: src/main/org/jboss/metadata/plugins/loader/thread
ThreadLocalMetaDataLoader.java
Added: src/main/org/jboss/metadata/plugins/loader/thread
GetThreadName.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +31 -4 container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ThreadLocalMetaDataLoader.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ThreadLocalMetaDataLoader.java 22 Jun 2006 14:57:26 -0000 1.1
+++ ThreadLocalMetaDataLoader.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -22,6 +22,7 @@
package org.jboss.metadata.plugins.loader.thread;
import java.lang.annotation.Annotation;
+import java.security.AccessController;
import org.jboss.metadata.plugins.loader.AbstractMutableMetaDataLoader;
import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
@@ -33,18 +34,23 @@
import org.jboss.metadata.spi.retrieval.ValidTime;
import org.jboss.metadata.spi.retrieval.basic.BasicAnnotationsItem;
import org.jboss.metadata.spi.retrieval.basic.BasicMetaDatasItem;
+import org.jboss.metadata.spi.scope.CommonLevels;
+import org.jboss.metadata.spi.scope.Scope;
+import org.jboss.metadata.spi.scope.ScopeKey;
/**
* ThreadLocalMetaDataLoader.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ThreadLocalMetaDataLoader extends AbstractMutableMetaDataLoader
{
/** The singleton instance */
public static final ThreadLocalMetaDataLoader INSTANCE = new ThreadLocalMetaDataLoader();
+ private static final GetThreadName GET_THREAD_NAME = new GetThreadName();
+
/** The thread local */
private ThreadLocal<MemoryMetaDataLoader> threadLocal = new ThreadLocal<MemoryMetaDataLoader>();
@@ -55,6 +61,18 @@
private final BasicMetaDatasItem NO_META_DATA = new BasicMetaDatasItem(this, BasicMetaDatasItem.NO_META_DATA_ITEMS);
/**
+ * Get the thread scope key
+ *
+ * @return the scope key
+ */
+ private static final ScopeKey getThreadScopeKey()
+ {
+ String name = AccessController.doPrivileged(GET_THREAD_NAME);
+ Scope scope = new Scope(CommonLevels.THREAD, name);
+ return new ScopeKey(scope);
+ }
+
+ /**
* Singleton
*/
private ThreadLocalMetaDataLoader()
@@ -70,6 +88,15 @@
threadLocal.set(null);
}
+ public ScopeKey getScope()
+ {
+ MemoryMetaDataLoader delegate = threadLocal.get();
+ if (delegate == null)
+ return getThreadScopeKey();
+ else
+ return delegate.getScope();
+ }
+
// The only items we produce are the no annotations and no metadata
// these should not be cached
public <T> boolean isCachable(Item<T> item)
@@ -115,7 +142,7 @@
MemoryMetaDataLoader delegate = threadLocal.get();
if (delegate == null)
{
- delegate = new MemoryMetaDataLoader(false, true);
+ delegate = new MemoryMetaDataLoader(getThreadScopeKey(), false, true);
threadLocal.set(delegate);
}
return delegate.addAnnotation(annotation);
@@ -158,7 +185,7 @@
MemoryMetaDataLoader delegate = threadLocal.get();
if (delegate == null)
{
- delegate = new MemoryMetaDataLoader(false, true);
+ delegate = new MemoryMetaDataLoader(getThreadScopeKey(), false, true);
threadLocal.set(delegate);
}
return delegate.addMetaData(metaData, type);
@@ -177,7 +204,7 @@
MemoryMetaDataLoader delegate = threadLocal.get();
if (delegate == null)
{
- delegate = new MemoryMetaDataLoader(false, true);
+ delegate = new MemoryMetaDataLoader(getThreadScopeKey(), false, true);
threadLocal.set(delegate);
}
return delegate.addMetaData(name, metaData, type);
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/main/org/jboss/metadata/plugins/loader/thread/GetThreadName.java
Index: GetThreadName.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.metadata.plugins.loader.thread;
import java.security.PrivilegedAction;
/**
* GetThreadName.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
class GetThreadName implements PrivilegedAction<String>
{
public String run()
{
Thread thread = Thread.currentThread();
return thread.getName();
}
}
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian Date: 06/07/10 08:18:42 Log: Directory /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/repository added to the repository |
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian Date: 06/07/10 08:18:41 Log: Directory /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/scope added to the repository |
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian Date: 06/07/10 08:18:42 Log: Directory /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/scope added to the repository |
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian
Date: 06/07/10 08:18:48
Modified: src/tests/org/jboss/test/metadata/shared
BasicAnnotationsTest.java BasicMetaDataTest.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +7 -7 container/src/tests/org/jboss/test/metadata/shared/BasicAnnotationsTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BasicAnnotationsTest.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/shared/BasicAnnotationsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicAnnotationsTest.java 22 Jun 2006 14:57:27 -0000 1.1
+++ BasicAnnotationsTest.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -33,13 +33,16 @@
* BasicAnnotationsTest.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class BasicAnnotationsTest extends AbstractMetaDataTest
{
- public BasicAnnotationsTest(String name)
+ protected boolean local;
+
+ public BasicAnnotationsTest(String name, boolean local)
{
super(name);
+ this.local = local;
}
public void testEmpty() throws Exception
@@ -49,8 +52,7 @@
assertNoAnnotation(metaData, NotPresentAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations, local);
}
protected abstract MetaData setupEmpty();
@@ -64,8 +66,7 @@
assertNoAnnotation(metaData, NotPresentAnnotation.class);
expectedAnnotations.add(TestAnnotation.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations, local);
}
protected abstract MetaData setupTestAnnotation();
@@ -81,8 +82,7 @@
expectedAnnotations.add(TestAnnotation1.class);
expectedAnnotations.add(TestAnnotation2.class);
- assertAnnotations(metaData, expectedAnnotations);
- assertAnnotationMetaDatas(metaData, expectedAnnotations);
+ assertAllAnnotations(metaData, expectedAnnotations, local);
}
protected abstract MetaData setupTestAnnotation12();
1.2 +9 -6 container/src/tests/org/jboss/test/metadata/shared/BasicMetaDataTest.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BasicMetaDataTest.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/shared/BasicMetaDataTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicMetaDataTest.java 22 Jun 2006 14:57:27 -0000 1.1
+++ BasicMetaDataTest.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -33,13 +33,16 @@
* BasicMetaDataTest.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class BasicMetaDataTest extends AbstractMetaDataTest
{
- public BasicMetaDataTest(String name)
+ protected boolean local;
+
+ public BasicMetaDataTest(String name, boolean local)
{
super(name);
+ this.local = local;
}
public void testEmpty() throws Exception
@@ -49,7 +52,7 @@
assertNoMetaData(metaData, NotPresentType.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected, local);
}
protected abstract MetaData setupEmpty();
@@ -63,7 +66,7 @@
assertNoMetaData(metaData, NotPresentType.class);
expected.add(TestMetaData.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected, local);
}
protected abstract MetaData setupTestMetaData();
@@ -79,7 +82,7 @@
expected.add(TestMetaData1.class);
expected.add(TestMetaData2.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected, local);
}
protected abstract MetaData setupTestMetaData12();
@@ -93,7 +96,7 @@
assertNoMetaData(metaData, "NotPresent", NotPresentType.class);
expected.add(TestMetaData.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected, local);
}
protected abstract MetaData setupTestMetaDataByName();
@@ -109,7 +112,7 @@
expected.add(TestMetaData1.class);
expected.add(TestMetaData2.class);
- assertMetaData(metaData, expected);
+ assertAllMetaData(metaData, expected, local);
}
protected abstract MetaData setupTestMetaData12ByName();
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:57
|
User: adrian
Date: 06/07/10 08:18:48
Modified: src/main/org/jboss/metadata/spi/retrieval
MetaDataRetrieval.java
MetaDataRetrievalToMetaDataBridge.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +22 -0 container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MetaDataRetrieval.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MetaDataRetrieval.java 22 Jun 2006 14:57:27 -0000 1.1
+++ MetaDataRetrieval.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -23,16 +23,24 @@
import java.lang.annotation.Annotation;
+import org.jboss.metadata.spi.scope.ScopeKey;
/**
* MetaDataRetrieval.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public interface MetaDataRetrieval
{
/**
+ * Return the scope key
+ *
+ * @return the scope key
+ */
+ ScopeKey getScope();
+
+ /**
* The valid time
*
* @return the valid time
@@ -47,6 +55,13 @@
AnnotationsItem retrieveAnnotations();
/**
+ * Get all the local annotations
+ *
+ * @return the annotations
+ */
+ AnnotationsItem retrieveLocalAnnotations();
+
+ /**
* Get annotation
*
* @param annotationType the annotation type
@@ -62,6 +77,13 @@
MetaDatasItem retrieveMetaData();
/**
+ * Get all the local metadata
+ *
+ * @return the metadata
+ */
+ MetaDatasItem retrieveLocalMetaData();
+
+ /**
* Get metadata
*
* @param type the type
1.2 +16 -0 container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MetaDataRetrievalToMetaDataBridge.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MetaDataRetrievalToMetaDataBridge.java 22 Jun 2006 14:57:27 -0000 1.1
+++ MetaDataRetrievalToMetaDataBridge.java 10 Jul 2006 12:18:48 -0000 1.2
@@ -29,7 +29,7 @@
* MetaDataRetrievalToMetaDataBridge.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class MetaDataRetrievalToMetaDataBridge implements MetaData
{
@@ -67,6 +67,14 @@
return item.getValue();
}
+ public Annotation[] getLocalAnnotations()
+ {
+ AnnotationsItem item = retrieval.retrieveLocalAnnotations();
+ if (item == null)
+ return NO_ANNOTATIONS;
+ return item.getValue();
+ }
+
public Object[] getMetaData()
{
MetaDatasItem item = retrieval.retrieveMetaData();
@@ -75,6 +83,14 @@
return item.getValue();
}
+ public Object[] getLocalMetaData()
+ {
+ MetaDatasItem item = retrieval.retrieveLocalMetaData();
+ if (item == null)
+ return NO_METADATA;
+ return item.getValue();
+ }
+
public <T> T getMetaData(Class<T> type)
{
if (type == null)
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:56
|
User: adrian Date: 06/07/10 08:18:42 Log: Directory /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/repository/test added to the repository |
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:56
|
User: adrian
Date: 06/07/10 08:18:47
Modified: src/tests/org/jboss/test/metadata/shared/support
MutableMetaDataLoaderToMetaDataBridge.java
Added: src/tests/org/jboss/test/metadata/shared/support
MetaDataAndMutableMetaData.java
MetaDataAndMutableMetaDataImpl.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +1 -2 container/src/tests/org/jboss/test/metadata/shared/support/MutableMetaDataLoaderToMetaDataBridge.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MutableMetaDataLoaderToMetaDataBridge.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/shared/support/MutableMetaDataLoaderToMetaDataBridge.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MutableMetaDataLoaderToMetaDataBridge.java 22 Jun 2006 14:57:25 -0000 1.1
+++ MutableMetaDataLoaderToMetaDataBridge.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -23,11 +23,10 @@
import java.lang.annotation.Annotation;
-import org.jboss.metadata.spi.MutableMetaData;
import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.retrieval.MetaDataRetrievalToMetaDataBridge;
-public class MutableMetaDataLoaderToMetaDataBridge extends MetaDataRetrievalToMetaDataBridge implements MutableMetaData
+public class MutableMetaDataLoaderToMetaDataBridge extends MetaDataRetrievalToMetaDataBridge implements MetaDataAndMutableMetaData
{
/**
* Create a new MutableMetaDataLoaderToMetaDataBridge.
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/shared/support/MetaDataAndMutableMetaData.java
Index: MetaDataAndMutableMetaData.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.shared.support;
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.MutableMetaData;
/**
* MetaDataAndMutable.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public interface MetaDataAndMutableMetaData extends MetaData, MutableMetaData
{
}
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/shared/support/MetaDataAndMutableMetaDataImpl.java
Index: MetaDataAndMutableMetaDataImpl.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.shared.support;
import java.lang.annotation.Annotation;
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.MutableMetaData;
/**
* MetaDataAndMutableMetaDataImpl.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class MetaDataAndMutableMetaDataImpl implements MetaDataAndMutableMetaData
{
private MetaData metaData;
private MutableMetaData mutable;
public MetaDataAndMutableMetaDataImpl(MetaData metaData, MutableMetaData mutable)
{
this.metaData = metaData;
this.mutable = mutable;
}
public <T extends Annotation> T getAnnotation(Class<T> annotationType)
{
return metaData.getAnnotation(annotationType);
}
public Annotation[] getAnnotations()
{
return metaData.getAnnotations();
}
public Annotation[] getLocalAnnotations()
{
return metaData.getLocalAnnotations();
}
public Object[] getLocalMetaData()
{
return metaData.getLocalMetaData();
}
public Object[] getMetaData()
{
return metaData.getMetaData();
}
public <T> T getMetaData(Class<T> type)
{
return metaData.getMetaData(type);
}
public <T> T getMetaData(String name, Class<T> type)
{
return metaData.getMetaData(name, type);
}
public Object getMetaData(String name)
{
return metaData.getMetaData(name);
}
public long getValidTime()
{
return metaData.getValidTime();
}
public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
{
return metaData.isAnnotationPresent(annotationType);
}
public boolean isMetaDataPresent(Class<?> type)
{
return metaData.isMetaDataPresent(type);
}
public boolean isMetaDataPresent(String name, Class<?> type)
{
return metaData.isMetaDataPresent(name, type);
}
public boolean isMetaDataPresent(String name)
{
return metaData.isMetaDataPresent(name);
}
public <T extends Annotation> T addAnnotation(T annotation)
{
return mutable.addAnnotation(annotation);
}
public <T> T addMetaData(String name, T metaData, Class<T> type)
{
return mutable.addMetaData(name, metaData, type);
}
public <T> T addMetaData(T metaData, Class<T> type)
{
return mutable.addMetaData(metaData, type);
}
public <T extends Annotation> T removeAnnotation(Class<T> annotationType)
{
return mutable.removeAnnotation(annotationType);
}
public <T> T removeMetaData(Class<T> type)
{
return mutable.removeMetaData(type);
}
public <T> T removeMetaData(String name, Class<T> type)
{
return mutable.removeMetaData(name, type);
}
}
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:56
|
User: adrian
Date: 06/07/10 08:18:47
Modified: src/tests/org/jboss/test/metadata/loader/memory/test
MemoryLoaderBasicMetaDataUnitTestCase.java
MemoryLoaderBasicAnnotationsUnitTestCase.java
MemoryLoaderMutableMetaDataUnitTestCase.java
MemoryLoaderMutableAnnotationsUnitTestCase.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +1 -1 container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderBasicMetaDataUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MemoryLoaderBasicMetaDataUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderBasicMetaDataUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MemoryLoaderBasicMetaDataUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ MemoryLoaderBasicMetaDataUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -36,13 +36,13 @@
* MemoryLoaderBasicMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class MemoryLoaderBasicMetaDataUnitTestCase extends BasicMetaDataTest
{
public MemoryLoaderBasicMetaDataUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
protected MetaData setupEmpty()
1.2 +1 -1 container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderBasicAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MemoryLoaderBasicAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderBasicAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MemoryLoaderBasicAnnotationsUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ MemoryLoaderBasicAnnotationsUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -33,13 +33,13 @@
* MemoryLoaderBasicAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class MemoryLoaderBasicAnnotationsUnitTestCase extends BasicAnnotationsTest
{
public MemoryLoaderBasicAnnotationsUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
protected MetaData setupEmpty()
1.2 +2 -1 container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderMutableMetaDataUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MemoryLoaderMutableMetaDataUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderMutableMetaDataUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MemoryLoaderMutableMetaDataUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ MemoryLoaderMutableMetaDataUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -23,13 +23,14 @@
import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
import org.jboss.test.metadata.loader.MutableMetaDataTest;
+import org.jboss.test.metadata.shared.support.MetaDataAndMutableMetaData;
import org.jboss.test.metadata.shared.support.MutableMetaDataLoaderToMetaDataBridge;
/**
* MemoryLoaderMutableMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class MemoryLoaderMutableMetaDataUnitTestCase extends MutableMetaDataTest
{
@@ -38,7 +39,7 @@
super(name);
}
- protected MutableMetaDataLoaderToMetaDataBridge setupEmpty()
+ protected MetaDataAndMutableMetaData setupEmpty()
{
MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
return new MutableMetaDataLoaderToMetaDataBridge(loader);
1.2 +2 -1 container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderMutableAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MemoryLoaderMutableAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderMutableAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- MemoryLoaderMutableAnnotationsUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ MemoryLoaderMutableAnnotationsUnitTestCase.java 10 Jul 2006 12:18:47 -0000 1.2
@@ -23,13 +23,14 @@
import org.jboss.metadata.plugins.loader.memory.MemoryMetaDataLoader;
import org.jboss.test.metadata.loader.MutableAnnotationsTest;
+import org.jboss.test.metadata.shared.support.MetaDataAndMutableMetaData;
import org.jboss.test.metadata.shared.support.MutableMetaDataLoaderToMetaDataBridge;
/**
* MemoryLoaderMutableAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class MemoryLoaderMutableAnnotationsUnitTestCase extends MutableAnnotationsTest
{
@@ -38,7 +39,7 @@
super(name);
}
- protected MutableMetaDataLoaderToMetaDataBridge setupEmpty()
+ protected MetaDataAndMutableMetaData setupEmpty()
{
MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
return new MutableMetaDataLoaderToMetaDataBridge(loader);
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:56
|
User: adrian
Date: 06/07/10 08:18:47
Modified: src/tests/org/jboss/test/metadata/context/cache/test
CacheParentContextBasicAnnotationsUnitTestCase.java
CacheParentContextBasicMetaDataUnitTestCase.java
CacheContextBasicAnnotationsUnitTestCase.java
CacheContextBasicMetaDataUnitTestCase.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +15 -15 container/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextBasicAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheParentContextBasicAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextBasicAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheParentContextBasicAnnotationsUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ CacheParentContextBasicAnnotationsUnitTestCase.java 10 Jul 2006 12:18:46 -0000 1.2
@@ -22,8 +22,9 @@
package org.jboss.test.metadata.context.cache.test;
import org.jboss.metadata.plugins.context.CachingMetaDataContext;
-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 @@
* CacheContextBasicAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CacheParentContextBasicAnnotationsUnitTestCase extends BasicAnnotationsTest
{
public CacheParentContextBasicAnnotationsUnitTestCase(String name)
{
- super(name);
+ super(name, false);
}
- protected MetaData setupEmpty()
+ protected MetaData setupMetaData(MetaDataLoader loader)
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
CachingMetaDataContext parent = new CachingMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
+ MutableMetaDataLoader empty = createTestMutableMetaDataLoader();
CachingMetaDataContext context = new CachingMetaDataContext(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());
- CachingMetaDataContext parent = new CachingMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- CachingMetaDataContext context = new CachingMetaDataContext(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());
- CachingMetaDataContext parent = new CachingMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- CachingMetaDataContext context = new CachingMetaDataContext(parent, empty);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
}
1.2 +19 -25 container/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextBasicMetaDataUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheParentContextBasicMetaDataUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextBasicMetaDataUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheParentContextBasicMetaDataUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ CacheParentContextBasicMetaDataUnitTestCase.java 10 Jul 2006 12:18:46 -0000 1.2
@@ -22,8 +22,9 @@
package org.jboss.test.metadata.context.cache.test;
import org.jboss.metadata.plugins.context.CachingMetaDataContext;
-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 @@
* CacheParentContextBasicMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CacheParentContextBasicMetaDataUnitTestCase extends BasicMetaDataTest
{
public CacheParentContextBasicMetaDataUnitTestCase(String name)
{
- super(name);
+ super(name, false);
}
- protected MetaData setupEmpty()
+ protected MetaData setupMetaData(MetaDataLoader loader)
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
CachingMetaDataContext parent = new CachingMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
+ MutableMetaDataLoader empty = createTestMutableMetaDataLoader();
CachingMetaDataContext context = new CachingMetaDataContext(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);
- CachingMetaDataContext parent = new CachingMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- CachingMetaDataContext context = new CachingMetaDataContext(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);
- CachingMetaDataContext parent = new CachingMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- CachingMetaDataContext context = new CachingMetaDataContext(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);
- CachingMetaDataContext parent = new CachingMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- CachingMetaDataContext context = new CachingMetaDataContext(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);
- CachingMetaDataContext parent = new CachingMetaDataContext(null, loader);
- MemoryMetaDataLoader empty = new MemoryMetaDataLoader();
- CachingMetaDataContext context = new CachingMetaDataContext(parent, empty);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
}
1.2 +14 -10 container/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextBasicAnnotationsUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheContextBasicAnnotationsUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextBasicAnnotationsUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheContextBasicAnnotationsUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ CacheContextBasicAnnotationsUnitTestCase.java 10 Jul 2006 12:18:46 -0000 1.2
@@ -22,8 +22,9 @@
package org.jboss.test.metadata.context.cache.test;
import org.jboss.metadata.plugins.context.CachingMetaDataContext;
-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 @@
* CacheContextBasicAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CacheContextBasicAnnotationsUnitTestCase extends BasicAnnotationsTest
{
public CacheContextBasicAnnotationsUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
- protected MetaData setupEmpty()
+ protected MetaData setupMetaData(MetaDataLoader loader)
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
CachingMetaDataContext context = new CachingMetaDataContext(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());
- CachingMetaDataContext context = new CachingMetaDataContext(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());
- CachingMetaDataContext context = new CachingMetaDataContext(null, loader);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
}
1.2 +18 -16 container/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextBasicMetaDataUnitTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheContextBasicMetaDataUnitTestCase.java
===================================================================
RCS file: /cvsroot/jboss/container/src/tests/org/jboss/test/metadata/context/cache/test/CacheContextBasicMetaDataUnitTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheContextBasicMetaDataUnitTestCase.java 22 Jun 2006 14:57:26 -0000 1.1
+++ CacheContextBasicMetaDataUnitTestCase.java 10 Jul 2006 12:18:46 -0000 1.2
@@ -22,8 +22,9 @@
package org.jboss.test.metadata.context.cache.test;
import org.jboss.metadata.plugins.context.CachingMetaDataContext;
-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 @@
* CacheContextBasicMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class CacheContextBasicMetaDataUnitTestCase extends BasicMetaDataTest
{
public CacheContextBasicMetaDataUnitTestCase(String name)
{
- super(name);
+ super(name, true);
}
- protected MetaData setupEmpty()
+ protected MetaData setupMetaData(MetaDataLoader loader)
{
- MemoryMetaDataLoader loader = new MemoryMetaDataLoader();
CachingMetaDataContext context = new CachingMetaDataContext(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);
- CachingMetaDataContext context = new CachingMetaDataContext(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);
- CachingMetaDataContext context = new CachingMetaDataContext(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);
- CachingMetaDataContext context = new CachingMetaDataContext(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);
- CachingMetaDataContext context = new CachingMetaDataContext(null, loader);
- return new MetaDataRetrievalToMetaDataBridge(context);
+ return setupMetaData(loader);
}
}
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:56
|
User: adrian
Date: 06/07/10 08:18:47
Added: src/tests/org/jboss/test/metadata/repository/test
BasicMetaDataRepositoryBasicAnnotationsUnitTestCase.java
MutableMetaDataRepositoryMatchingTest.java
BasicMetaDataRepositoryBasicMetaDataUnitTestCase.java
BasicMutableMetaDataRepositoryMatchingUnitTestCase.java
RepositoryTestSuite.java
MutableMetaDataRepositoryTest.java
BasicMutableMetaDataRepositoryUnitTestCase.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/repository/test/BasicMetaDataRepositoryBasicAnnotationsUnitTestCase.java
Index: BasicMetaDataRepositoryBasicAnnotationsUnitTestCase.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.repository.test;
import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.loader.MetaDataLoader;
import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.test.metadata.shared.BasicAnnotationsTest;
import org.jboss.test.metadata.shared.support.TestAnnotation1Impl;
import org.jboss.test.metadata.shared.support.TestAnnotation2Impl;
import org.jboss.test.metadata.shared.support.TestAnnotationImpl;
/**
* BasicMetaDataRepositoryBasicAnnotationsUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class BasicMetaDataRepositoryBasicAnnotationsUnitTestCase extends BasicAnnotationsTest
{
public BasicMetaDataRepositoryBasicAnnotationsUnitTestCase(String name)
{
super(name, true);
}
protected MetaData setupMetaData(MetaDataLoader loader)
{
BasicMetaDataRepository repository = new BasicMetaDataRepository();
repository.addMetaDataRetrieval(loader);
return repository.getMetaData(loader.getScope());
}
protected MetaData setupEmpty()
{
MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
return setupMetaData(loader);
}
protected MetaData setupTestAnnotation()
{
MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addAnnotation(new TestAnnotationImpl());
return setupMetaData(loader);
}
protected MetaData setupTestAnnotation12()
{
MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addAnnotation(new TestAnnotation1Impl());
loader.addAnnotation(new TestAnnotation2Impl());
return setupMetaData(loader);
}
}
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/repository/test/MutableMetaDataRepositoryMatchingTest.java
Index: MutableMetaDataRepositoryMatchingTest.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.repository.test;
import java.util.HashSet;
import java.util.Set;
import org.jboss.metadata.plugins.repository.visitor.FuzzyMetaDataRepositoryVisitor;
import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
import org.jboss.metadata.spi.scope.Scope;
import org.jboss.metadata.spi.scope.ScopeKey;
import org.jboss.metadata.spi.scope.ScopeLevel;
import org.jboss.test.metadata.AbstractMetaDataTest;
/**
* MutableMetaDataRepositoryMatchingTest.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public abstract class MutableMetaDataRepositoryMatchingTest extends AbstractMetaDataTest
{
private static ScopeLevel testLevel1 = new ScopeLevel(1, "ONE");
private static ScopeLevel testLevel2 = new ScopeLevel(2, "TWO");
private static ScopeLevel testLevel3 = new ScopeLevel(3, "THREE");
private static ScopeLevel testLevel4 = new ScopeLevel(4, "FOUR");
private static ScopeLevel testLevel5 = new ScopeLevel(5, "FIVE");
private static ScopeLevel testLevel6 = new ScopeLevel(6, "FIVE");
private static String testQualifier1 = "qualifier1";
private static String testQualifier1x = "qualifier1x";
private static String testQualifier2 = "qualifier2";
private static String testQualifier2x = "qualifier2x";
private static String testQualifier3 = "qualifier3";
private static String testQualifier4 = "qualifier4";
private static String testQualifier5 = "qualifier5";
private static String testQualifier6 = "qualifier6";
private static Scope testLevel1Qual1 = new Scope(testLevel1, testQualifier1);
private static Scope testLevel1Qual1x = new Scope(testLevel1, testQualifier1x);
private static Scope testLevel2Qual2 = new Scope(testLevel2, testQualifier2);
private static Scope testLevel2Qual2x = new Scope(testLevel2, testQualifier2x);
private static Scope testLevel3Qual3 = new Scope(testLevel3, testQualifier3);
private static Scope testLevel4Qual4 = new Scope(testLevel4, testQualifier4);
private static Scope testLevel5Qual5 = new Scope(testLevel5, testQualifier5);
private static Scope testLevel6Qual6 = new Scope(testLevel6, testQualifier6);
private static ScopeKey testKey1 = new ScopeKey(testLevel1Qual1);
private static ScopeKey testKey1x = new ScopeKey(testLevel1Qual1x);
private static ScopeKey testKey2 = new ScopeKey(testLevel2Qual2);
private static ScopeKey testKey3 = new ScopeKey(testLevel3Qual3);
private static ScopeKey testKey12 = new ScopeKey(new Scope[] { testLevel1Qual1, testLevel2Qual2 });
private static ScopeKey testKey13 = new ScopeKey(new Scope[] { testLevel1Qual1, testLevel3Qual3 });
private static ScopeKey testKey14 = new ScopeKey(new Scope[] { testLevel1Qual1, testLevel4Qual4 });
private static ScopeKey testKey15 = new ScopeKey(new Scope[] { testLevel1Qual1, testLevel5Qual5 });
private static ScopeKey testKey16 = new ScopeKey(new Scope[] { testLevel1Qual1, testLevel6Qual6 });
private static ScopeKey testKey23 = new ScopeKey(new Scope[] { testLevel2Qual2, testLevel3Qual3 });
private static ScopeKey testKey2x3 = new ScopeKey(new Scope[] { testLevel2Qual2x, testLevel3Qual3 });
public MutableMetaDataRepositoryMatchingTest(String name)
{
super(name);
}
protected abstract MutableMetaDataRepository setupEmpty();
public void testNoMatchEmpty() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey1);
Set<ScopeKey> result = repository.matchScopes(visitor);
assertNotNull(result);
assertEquals(0, result.size());
}
public void testSimpleMatch() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
repository.addMetaDataRetrieval(loader1);
MutableMetaDataLoader loader2 = createTestMutableMetaDataLoader(testKey2);
repository.addMetaDataRetrieval(loader2);
MutableMetaDataLoader loader3 = createTestMutableMetaDataLoader(testKey3);
repository.addMetaDataRetrieval(loader3);
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey1);
Set<ScopeKey> result = repository.matchScopes(visitor);
HashSet<ScopeKey> expected = new HashSet<ScopeKey>();
expected.add(testKey1);
assertEquals(expected, result);
}
public void testNotSimpleMatch() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
repository.addMetaDataRetrieval(loader1);
MutableMetaDataLoader loader2 = createTestMutableMetaDataLoader(testKey2);
repository.addMetaDataRetrieval(loader2);
MutableMetaDataLoader loader3 = createTestMutableMetaDataLoader(testKey3);
repository.addMetaDataRetrieval(loader3);
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey1x);
Set<ScopeKey> result = repository.matchScopes(visitor);
assertNotNull(result);
assertEquals(0, result.size());
}
public void testNoMatchAgainstSimple() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
repository.addMetaDataRetrieval(loader1);
MutableMetaDataLoader loader2 = createTestMutableMetaDataLoader(testKey2);
repository.addMetaDataRetrieval(loader2);
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey3);
Set<ScopeKey> result = repository.matchScopes(visitor);
assertNotNull(result);
assertEquals(0, result.size());
}
public void testCompositeMatch() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader23 = createTestMutableMetaDataLoader(testKey23);
repository.addMetaDataRetrieval(loader23);
MutableMetaDataLoader loader14 = createTestMutableMetaDataLoader(testKey14);
repository.addMetaDataRetrieval(loader14);
MutableMetaDataLoader loader15 = createTestMutableMetaDataLoader(testKey15);
repository.addMetaDataRetrieval(loader15);
MutableMetaDataLoader loader16 = createTestMutableMetaDataLoader(testKey16);
repository.addMetaDataRetrieval(loader16);
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey2);
Set<ScopeKey> result = repository.matchScopes(visitor);
HashSet<ScopeKey> expected = new HashSet<ScopeKey>();
expected.add(testKey23);
assertEquals(expected, result);
}
public void testNotCompositeMatch() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader23 = createTestMutableMetaDataLoader(testKey23);
repository.addMetaDataRetrieval(loader23);
MutableMetaDataLoader loader14 = createTestMutableMetaDataLoader(testKey14);
repository.addMetaDataRetrieval(loader14);
MutableMetaDataLoader loader15 = createTestMutableMetaDataLoader(testKey15);
repository.addMetaDataRetrieval(loader15);
MutableMetaDataLoader loader16 = createTestMutableMetaDataLoader(testKey16);
repository.addMetaDataRetrieval(loader16);
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey2x3);
Set<ScopeKey> result = repository.matchScopes(visitor);
assertNotNull(result);
assertEquals(0, result.size());
}
public void testNoMatchEmptyAgainstComposite() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader12 = createTestMutableMetaDataLoader(testKey12);
repository.addMetaDataRetrieval(loader12);
MutableMetaDataLoader loader14 = createTestMutableMetaDataLoader(testKey14);
repository.addMetaDataRetrieval(loader14);
MutableMetaDataLoader loader15 = createTestMutableMetaDataLoader(testKey15);
repository.addMetaDataRetrieval(loader15);
MutableMetaDataLoader loader16 = createTestMutableMetaDataLoader(testKey16);
repository.addMetaDataRetrieval(loader16);
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey3);
Set<ScopeKey> result = repository.matchScopes(visitor);
assertNotNull(result);
assertEquals(0, result.size());
}
public void testPartialMatch() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader12 = createTestMutableMetaDataLoader(testKey12);
repository.addMetaDataRetrieval(loader12);
MutableMetaDataLoader loader13 = createTestMutableMetaDataLoader(testKey13);
repository.addMetaDataRetrieval(loader13);
MutableMetaDataLoader loader23 = createTestMutableMetaDataLoader(testKey23);
repository.addMetaDataRetrieval(loader23);
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey1);
Set<ScopeKey> result = repository.matchScopes(visitor);
HashSet<ScopeKey> expected = new HashSet<ScopeKey>();
expected.add(testKey12);
expected.add(testKey13);
assertEquals(expected, result);
}
public void testNotPartialMatch() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader12 = createTestMutableMetaDataLoader(testKey12);
repository.addMetaDataRetrieval(loader12);
MutableMetaDataLoader loader13 = createTestMutableMetaDataLoader(testKey13);
repository.addMetaDataRetrieval(loader13);
MutableMetaDataLoader loader23 = createTestMutableMetaDataLoader(testKey23);
repository.addMetaDataRetrieval(loader23);
FuzzyMetaDataRepositoryVisitor visitor = new FuzzyMetaDataRepositoryVisitor(testKey1x);
Set<ScopeKey> result = repository.matchScopes(visitor);
assertNotNull(result);
assertEquals(0, result.size());
}
}
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/repository/test/BasicMetaDataRepositoryBasicMetaDataUnitTestCase.java
Index: BasicMetaDataRepositoryBasicMetaDataUnitTestCase.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.repository.test;
import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.loader.MetaDataLoader;
import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.test.metadata.shared.BasicMetaDataTest;
import org.jboss.test.metadata.shared.support.TestMetaData;
import org.jboss.test.metadata.shared.support.TestMetaData1;
import org.jboss.test.metadata.shared.support.TestMetaData1Impl;
import org.jboss.test.metadata.shared.support.TestMetaData2;
import org.jboss.test.metadata.shared.support.TestMetaData2Impl;
import org.jboss.test.metadata.shared.support.TestMetaDataImpl;
/**
* BasicMetaDataRepositoryBasicMetaDataUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class BasicMetaDataRepositoryBasicMetaDataUnitTestCase extends BasicMetaDataTest
{
public BasicMetaDataRepositoryBasicMetaDataUnitTestCase(String name)
{
super(name, true);
}
protected MetaData setupMetaData(MetaDataLoader loader)
{
BasicMetaDataRepository repository = new BasicMetaDataRepository();
repository.addMetaDataRetrieval(loader);
return repository.getMetaData(loader.getScope());
}
protected MetaData setupEmpty()
{
MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
return setupMetaData(loader);
}
protected MetaData setupTestMetaData()
{
MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData(new TestMetaDataImpl(), TestMetaData.class);
return setupMetaData(loader);
}
protected MetaData setupTestMetaData12()
{
MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData(new TestMetaData1Impl(), TestMetaData1.class);
loader.addMetaData(new TestMetaData2Impl(), TestMetaData2.class);
return setupMetaData(loader);
}
protected MetaData setupTestMetaDataByName()
{
MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData("Test", new TestMetaDataImpl(), TestMetaData.class);
return setupMetaData(loader);
}
protected MetaData setupTestMetaData12ByName()
{
MutableMetaDataLoader loader = createTestMutableMetaDataLoader();
loader.addMetaData("Test1", new TestMetaData1Impl(), TestMetaData1.class);
loader.addMetaData("Test2", new TestMetaData2Impl(), TestMetaData2.class);
return setupMetaData(loader);
}
}
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/repository/test/BasicMutableMetaDataRepositoryMatchingUnitTestCase.java
Index: BasicMutableMetaDataRepositoryMatchingUnitTestCase.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.repository.test;
import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
/**
* BasicMutableMetaDataRepositoryMatchingUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class BasicMutableMetaDataRepositoryMatchingUnitTestCase extends MutableMetaDataRepositoryMatchingTest
{
public BasicMutableMetaDataRepositoryMatchingUnitTestCase(String name)
{
super(name);
}
protected MutableMetaDataRepository setupEmpty()
{
return new BasicMetaDataRepository();
}
}
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/repository/test/RepositoryTestSuite.java
Index: RepositoryTestSuite.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2005, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.repository.test;
import junit.framework.Test;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
/**
* RepositoryTestSuite.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class RepositoryTestSuite extends TestSuite
{
public static void main(String[] args)
{
TestRunner.run(suite());
}
public static Test suite()
{
TestSuite suite = new TestSuite("Repository Tests");
suite.addTest(new TestSuite(BasicMutableMetaDataRepositoryUnitTestCase.class));
suite.addTest(new TestSuite(BasicMetaDataRepositoryBasicAnnotationsUnitTestCase.class));
suite.addTest(new TestSuite(BasicMetaDataRepositoryBasicMetaDataUnitTestCase.class));
suite.addTest(new TestSuite(BasicMutableMetaDataRepositoryMatchingUnitTestCase.class));
return suite;
}
}
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/repository/test/MutableMetaDataRepositoryTest.java
Index: MutableMetaDataRepositoryTest.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.repository.test;
import java.util.HashSet;
import java.util.Set;
import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
import org.jboss.metadata.spi.retrieval.MetaDataRetrieval;
import org.jboss.metadata.spi.scope.Scope;
import org.jboss.metadata.spi.scope.ScopeKey;
import org.jboss.metadata.spi.scope.ScopeLevel;
import org.jboss.test.metadata.AbstractMetaDataTest;
/**
* MutableMetaDataRepositoryTest.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public abstract class MutableMetaDataRepositoryTest extends AbstractMetaDataTest
{
private static ScopeLevel testLevel1 = new ScopeLevel(1, "ONE");
private static ScopeLevel testLevel2 = new ScopeLevel(2, "TWO");
private static ScopeLevel testLevel3 = new ScopeLevel(3, "THREE");
private static String testQualifier1 = "qualifier1";
private static String testQualifier1Different = "qualifier1Different";
private static String testQualifier2 = "qualifier2";
private static String testQualifier2Different = "qualifier2Different";
private static String testQualifier3 = "qualifier3";
private static Scope testScope1 = new Scope(testLevel1, testQualifier1);
private static Scope testScope1Different = new Scope(testLevel1, testQualifier1Different);
private static Scope testScope2 = new Scope(testLevel2, testQualifier2);
private static Scope testScope2Different = new Scope(testLevel2, testQualifier2Different);
private static Scope testScope3 = new Scope(testLevel3, testQualifier3);
private static ScopeKey testKey1 = new ScopeKey(testScope1);
private static ScopeKey testKey1Different = new ScopeKey(testScope1Different);
private static ScopeKey testKey12 = new ScopeKey(new Scope[] { testScope1, testScope2 });
private static ScopeKey testKey12Different = new ScopeKey(new Scope[] { testScope1, testScope2Different });
private static ScopeKey testKey123 = new ScopeKey(new Scope[] { testScope1, testScope2, testScope3 });
private static ScopeKey testKey123Different = new ScopeKey(new Scope[] { testScope1Different, testScope2, testScope3 });
public MutableMetaDataRepositoryTest(String name)
{
super(name);
}
protected abstract MutableMetaDataRepository setupEmpty();
public void testAddOneScope() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey1);
assertTrue(loader == retrieval);
}
public void testAddOneScopeDifferent() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader1, null);
MutableMetaDataLoader loader1Different = createTestMutableMetaDataLoader(testKey1Different);
assertAddMetaDataRetrieval(repository, loader1Different, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey1);
assertTrue(loader1 == retrieval);
retrieval = repository.getMetaDataRetrieval(testKey1Different);
assertTrue(loader1Different == retrieval);
}
public void testReplaceOneScope() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader1, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey1);
assertTrue(loader1 == retrieval);
MutableMetaDataLoader loader2 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader2, loader1);
retrieval = repository.getMetaDataRetrieval(testKey1);
assertTrue(loader2 == retrieval);
}
public void testRemoveOneScope() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader1, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey1);
assertTrue(loader1 == retrieval);
assertRemoveMetaDataRetrieval(repository, testKey1, loader1);
retrieval = repository.getMetaDataRetrieval(testKey1);
assertNull(retrieval);
}
public void testRemoveOneScopeDifferent() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader1, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey1);
assertTrue(loader1 == retrieval);
assertRemoveMetaDataRetrieval(repository, testKey1Different, null);
retrieval = repository.getMetaDataRetrieval(testKey1);
assertTrue(loader1 == retrieval);
}
public void testAddMutlipleScope() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader = createTestMutableMetaDataLoader(testKey123);
assertAddMetaDataRetrieval(repository, loader, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey123);
assertTrue(loader == retrieval);
}
public void testAddMultipleScopeDifferent() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey123);
assertAddMetaDataRetrieval(repository, loader1, null);
MutableMetaDataLoader loader1Different = createTestMutableMetaDataLoader(testKey123Different);
assertAddMetaDataRetrieval(repository, loader1Different, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey123);
assertTrue(loader1 == retrieval);
retrieval = repository.getMetaDataRetrieval(testKey123Different);
assertTrue(loader1Different == retrieval);
}
public void testReplaceMultipleScope() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey123);
assertAddMetaDataRetrieval(repository, loader1, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey123);
assertTrue(loader1 == retrieval);
MutableMetaDataLoader loader2 = createTestMutableMetaDataLoader(testKey123);
assertAddMetaDataRetrieval(repository, loader2, loader1);
retrieval = repository.getMetaDataRetrieval(testKey123);
assertTrue(loader2 == retrieval);
}
public void testRemoveMultipleScope() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey123);
assertAddMetaDataRetrieval(repository, loader1, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey123);
assertTrue(loader1 == retrieval);
assertRemoveMetaDataRetrieval(repository, testKey123, loader1);
retrieval = repository.getMetaDataRetrieval(testKey1);
assertNull(retrieval);
}
public void testRemoveMultipleScopeDifferent() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey123);
assertAddMetaDataRetrieval(repository, loader1, null);
MetaDataRetrieval retrieval = repository.getMetaDataRetrieval(testKey123);
assertTrue(loader1 == retrieval);
assertRemoveMetaDataRetrieval(repository, testKey123Different, null);
retrieval = repository.getMetaDataRetrieval(testKey123);
assertTrue(loader1 == retrieval);
}
public void testGetChildrenEmpty() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
Set<ScopeKey> result = repository.getChildren(testKey1);
assertNotNull(result);
assertEquals(0, result.size());
}
public void testGetNoChildren() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader1, null);
Set<ScopeKey> result = repository.getChildren(testKey1);
assertNotNull(result);
assertEquals(0, result.size());
}
public void testOneChild() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader1, null);
MutableMetaDataLoader loader12 = createTestMutableMetaDataLoader(testKey12);
assertAddMetaDataRetrieval(repository, loader12, null);
Set<ScopeKey> result = repository.getChildren(testKey1);
assertNotNull(result);
Set<ScopeKey> expected = new HashSet<ScopeKey>();
expected.add(testKey12);
assertEquals(expected, result);
}
public void testTwoChild() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader1, null);
MutableMetaDataLoader loader12 = createTestMutableMetaDataLoader(testKey12);
assertAddMetaDataRetrieval(repository, loader12, null);
MutableMetaDataLoader loader12Different = createTestMutableMetaDataLoader(testKey12Different);
assertAddMetaDataRetrieval(repository, loader12Different, null);
Set<ScopeKey> result = repository.getChildren(testKey1);
assertNotNull(result);
Set<ScopeKey> expected = new HashSet<ScopeKey>();
expected.add(testKey12);
expected.add(testKey12Different);
assertEquals(expected, result);
}
public void testTooManyScopes() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader1 = createTestMutableMetaDataLoader(testKey1);
assertAddMetaDataRetrieval(repository, loader1, null);
MutableMetaDataLoader loader123 = createTestMutableMetaDataLoader(testKey123);
assertAddMetaDataRetrieval(repository, loader123, null);
Set<ScopeKey> result = repository.getChildren(testKey1);
assertNotNull(result);
assertEquals(0, result.size());
}
public void testManyScopes() throws Exception
{
MutableMetaDataRepository repository = setupEmpty();
MutableMetaDataLoader loader12 = createTestMutableMetaDataLoader(testKey12);
assertAddMetaDataRetrieval(repository, loader12, null);
MutableMetaDataLoader loader123 = createTestMutableMetaDataLoader(testKey123);
assertAddMetaDataRetrieval(repository, loader123, null);
Set<ScopeKey> result = repository.getChildren(testKey12);
assertNotNull(result);
Set<ScopeKey> expected = new HashSet<ScopeKey>();
expected.add(testKey123);
assertEquals(expected, result);
}
protected void assertAddMetaDataRetrieval(MutableMetaDataRepository repository, MetaDataRetrieval add, MetaDataRetrieval expected) throws Exception
{
MetaDataRetrieval previous = repository.addMetaDataRetrieval(add);
assertEquals(expected, previous);
}
protected void assertRemoveMetaDataRetrieval(MutableMetaDataRepository repository, ScopeKey key, MetaDataRetrieval expected) throws Exception
{
MetaDataRetrieval previous = repository.removeMetaDataRetrieval(key);
assertEquals(expected, previous);
}
}
1.1 date: 2006/07/10 12:18:47; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/repository/test/BasicMutableMetaDataRepositoryUnitTestCase.java
Index: BasicMutableMetaDataRepositoryUnitTestCase.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.repository.test;
import org.jboss.metadata.plugins.repository.basic.BasicMetaDataRepository;
import org.jboss.metadata.spi.repository.MutableMetaDataRepository;
/**
* BasicMutableMetaDataRepositoryUnitTestCase.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
public class BasicMutableMetaDataRepositoryUnitTestCase extends MutableMetaDataRepositoryTest
{
public BasicMutableMetaDataRepositoryUnitTestCase(String name)
{
super(name);
}
protected MutableMetaDataRepository setupEmpty()
{
return new BasicMetaDataRepository();
}
}
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:56
|
User: adrian
Date: 06/07/10 08:18:49
Modified: src/main/org/jboss/metadata/plugins/loader
AbstractMutableMetaDataLoader.java
BasicMetaDataLoader.java
AbstractMetaDataLoader.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.2 +23 -0 container/src/main/org/jboss/metadata/plugins/loader/AbstractMutableMetaDataLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractMutableMetaDataLoader.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/plugins/loader/AbstractMutableMetaDataLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractMutableMetaDataLoader.java 22 Jun 2006 14:57:31 -0000 1.1
+++ AbstractMutableMetaDataLoader.java 10 Jul 2006 12:18:49 -0000 1.2
@@ -25,6 +25,7 @@
import org.jboss.metadata.spi.Restricted;
import org.jboss.metadata.spi.loader.MutableMetaDataLoader;
+import org.jboss.metadata.spi.scope.ScopeKey;
/**
* AbstractMutableMetaDataLoader.
@@ -34,7 +35,7 @@
* methods interprets as annotation types and class names.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class AbstractMutableMetaDataLoader extends BasicMetaDataLoader implements MutableMetaDataLoader
{
@@ -60,6 +61,28 @@
}
/**
+ * Create a new AbstractMutableMetaDataLoader.
+ *
+ * @param key the scope key
+ */
+ public AbstractMutableMetaDataLoader(ScopeKey key)
+ {
+ this(key, false);
+ }
+
+ /**
+ * Create a new AbstractMutableMetaDataLoader.
+ *
+ * @param key the scope key
+ * @param restricted whether the context is restricted
+ */
+ public AbstractMutableMetaDataLoader(ScopeKey key, boolean restricted)
+ {
+ super(key);
+ this.restricted = restricted;
+ }
+
+ /**
* Check whether an annotation is retricted
*
* @param annotation the annotation
1.2 +18 -0 container/src/main/org/jboss/metadata/plugins/loader/BasicMetaDataLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BasicMetaDataLoader.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/plugins/loader/BasicMetaDataLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BasicMetaDataLoader.java 22 Jun 2006 14:57:31 -0000 1.1
+++ BasicMetaDataLoader.java 10 Jul 2006 12:18:49 -0000 1.2
@@ -27,15 +27,33 @@
import org.jboss.metadata.generic.GenericMatcher;
import org.jboss.metadata.spi.retrieval.AnnotationItem;
import org.jboss.metadata.spi.retrieval.MetaDataItem;
+import org.jboss.metadata.spi.scope.ScopeKey;
/**
* BasicMetaDataLoader.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class BasicMetaDataLoader extends AbstractMetaDataLoader
{
+ /**
+ * Create a new BasicMetaDataLoader.
+ */
+ public BasicMetaDataLoader()
+ {
+ }
+
+ /**
+ * Create a new BasicMetaDataLoader.
+ *
+ * @param key the scope key
+ */
+ public BasicMetaDataLoader(ScopeKey key)
+ {
+ super(key);
+ }
+
public <T extends Annotation> AnnotationItem<T> retrieveAnnotation(Class<T> annotationType)
{
AnnotationItem[] annotations = retrieveAnnotations().getAnnotations();
1.2 +30 -0 container/src/main/org/jboss/metadata/plugins/loader/AbstractMetaDataLoader.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: AbstractMetaDataLoader.java
===================================================================
RCS file: /cvsroot/jboss/container/src/main/org/jboss/metadata/plugins/loader/AbstractMetaDataLoader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- AbstractMetaDataLoader.java 22 Jun 2006 14:57:31 -0000 1.1
+++ AbstractMetaDataLoader.java 10 Jul 2006 12:18:49 -0000 1.2
@@ -32,6 +32,7 @@
import org.jboss.metadata.spi.retrieval.ValidTime;
import org.jboss.metadata.spi.retrieval.helper.AnnotationToMetaDataBridge;
import org.jboss.metadata.spi.retrieval.helper.AnnotationsToMetaDatasBridge;
+import org.jboss.metadata.spi.scope.ScopeKey;
/**
* AbstractMetaDataLoader.
@@ -41,21 +42,40 @@
* methods interpreted as annotation types and class names.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public abstract class AbstractMetaDataLoader implements MetaDataLoader
{
/** The valid time */
private ValidTime validTime;
+ /** The scope key */
+ private ScopeKey scopeKey;
+
/**
* Create a new AbstractMetaDataLoader.
*/
public AbstractMetaDataLoader()
{
+ this(ScopeKey.DEFAULT_SCOPE);
+ }
+
+ /**
+ * Create a new AbstractMetaDataLoader.
+ *
+ * @param key the scope
+ */
+ public AbstractMetaDataLoader(ScopeKey key)
+ {
+ this.scopeKey = key;
validTime = new ValidTime();
}
+ public ScopeKey getScope()
+ {
+ return scopeKey;
+ }
+
public ValidTime getValidTime()
{
return validTime;
@@ -66,6 +86,11 @@
return true;
}
+ public AnnotationsItem retrieveLocalAnnotations()
+ {
+ return retrieveAnnotations();
+ }
+
@SuppressWarnings("unchecked")
public <T> MetaDataItem<T> retrieveMetaData(Class<T> type)
{
@@ -77,6 +102,11 @@
return new AnnotationToMetaDataBridge<T>(annotation);
}
+ public MetaDatasItem retrieveLocalMetaData()
+ {
+ return retrieveMetaData();
+ }
+
public MetaDatasItem retrieveMetaData()
{
AnnotationsItem annotations = retrieveAnnotations();
|
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:56
|
User: adrian Date: 06/07/10 08:18:41 Log: Directory /cvsroot/jboss/container/src/main/org/jboss/metadata/plugins/repository/basic added to the repository |
|
From: Adrian B. <adr...@jb...> - 2006-07-10 12:18:56
|
User: adrian
Date: 06/07/10 08:18:49
Added: src/tests/org/jboss/test/metadata/loader/reflection/support
TestAnnotationScopeBean.java
Log:
[JBMICROCONT-70] - Scoped metadata and basic repository
Revision Changes Path
1.1 date: 2006/07/10 12:18:49; author: adrian; state: Exp;container/src/tests/org/jboss/test/metadata/loader/reflection/support/TestAnnotationScopeBean.java
Index: TestAnnotationScopeBean.java
===================================================================
/*
* JBoss, Home of Professional Open Source
* Copyright 2006, JBoss Inc., and individual contributors as indicated
* by the @authors tag. See the copyright.txt in the distribution for a
* full listing of individual contributors.
*
* This is free software; you can redistribute it and/or modify it
* under the terms of the GNU Lesser General Public License as
* published by the Free Software Foundation; either version 2.1 of
* the License, or (at your option) any later version.
*
* This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this software; if not, write to the Free
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.jboss.test.metadata.loader.reflection.support;
import org.jboss.test.metadata.shared.support.TestAnnotation;
/**
* TestAnnotationBean.
*
* @author <a href="ad...@jb...">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
@TestAnnotation
public class TestAnnotationScopeBean
{
@TestAnnotation
public boolean something;
@TestAnnotation
public TestAnnotationScopeBean()
{
}
@TestAnnotation
public void doSomething()
{
}
}
|
185 messages has been excluded from this view by a project administrator.
