Menu
▾
▴
[jboss-cvs] container/src/tests/org/jboss/test/metadata/loader ...
|
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();
|
