[jboss-cvs] container/src/tests/org/jboss/test/metadata/shared ...

[Adrian B. <adr...@jb...>]

  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();