[webbeans-commits] Webbeans SVN: r1555 - in tck/trunk: impl/src/main/java/org/jboss/jsr299/tck/impl and 2 other directories.

webbeans-commits at lists.jboss.org webbeans-commits at lists.jboss.org
Mon Feb 16 20:35:31 EST 2009


Author: pete.muir at jboss.org
Date: 2009-02-16 20:35:31 -0500 (Mon, 16 Feb 2009)
New Revision: 1555

Modified:
   tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java
   tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java
   tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java
Log:
Remove nonsense about package names

Modified: tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java
===================================================================
--- tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java	2009-02-16 23:56:49 UTC (rev 1554)
+++ tck/trunk/api/src/main/java/org/jboss/jsr299/tck/api/Configuration.java	2009-02-17 01:35:31 UTC (rev 1555)
@@ -1,7 +1,5 @@
 package org.jboss.jsr299.tck.api;
 
-import java.util.List;
-
 import javax.context.Context;
 
 import org.jboss.jsr299.tck.spi.Beans;
@@ -139,13 +137,12 @@
    public void setRunIntegrationTests(boolean runIntegrationTests);
    
    @Deprecated
-   public List<String> getInContainerTestPackageNames();
-   
    public void setEl(EL el);
    
    /**
     * The implementation of {@link EL} in use.
     */
+   @Deprecated
    public EL getEl();
    
    /**

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java	2009-02-16 23:56:49 UTC (rev 1554)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/ConfigurationImpl.java	2009-02-17 01:35:31 UTC (rev 1555)
@@ -1,9 +1,5 @@
 package org.jboss.jsr299.tck.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 import javax.context.Context;
 
 import org.jboss.jsr299.tck.api.Configuration;
@@ -43,13 +39,10 @@
    private Containers containers;
    private StandaloneContainers standaloneContainers;
    private EL el;
-   private List<String> inContainerPackageNames;
-   private List<String> unitTestPackageNames;
    private String host;
    
    protected ConfigurationImpl()
    {
-      // TODO Auto-generated constructor stub
    }
    
    public ConfigurationImpl(Configuration configuration)
@@ -87,8 +80,6 @@
    public void setStandalone(boolean standalone)
    {
       this.standalone = standalone;
-      this.inContainerPackageNames = null;
-      this.unitTestPackageNames = null;
    }
 
    public int getConnectTimeout()
@@ -172,25 +163,13 @@
       this.runIntegrationTests = runIntegrationTests;
    }
    
-   public List<String> getInContainerTestPackageNames()
-   {
-      if (inContainerPackageNames == null)
-      {
-         inContainerPackageNames = new ArrayList<String>();
-         inContainerPackageNames.add(INTEGRATION_TEST_PACKAGE_NAME);
-         if (!isStandalone())
-         {
-            inContainerPackageNames.add(UNIT_TEST_PACKAGE_NAME);
-         }
-      }
-      return Collections.unmodifiableList(inContainerPackageNames);
-   }
-   
+   @Deprecated
    public EL getEl()
    {
       return el;
    }
    
+   @Deprecated
    public void setEl(EL el)
    {
       this.el = el;
@@ -238,7 +217,6 @@
       configuration.append("\tConnect Timeout: ").append(getConnectTimeout()).append("\n");
       configuration.append("\tEL: ").append(getEl()).append("\n");
       configuration.append("\tHost: ").append(getHost()).append("\n");
-      configuration.append("\tIn Container Tests Package Names: ").append(getInContainerTestPackageNames()).append("\n");
       configuration.append("\tLibrary Directory: ").append(getLibraryDirectory()).append("\n");
       configuration.append("\tManagers: ").append(getManagers()).append("\n");
       configuration.append("\tOutput Directory: ").append(getOutputDirectory()).append("\n");

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java	2009-02-16 23:56:49 UTC (rev 1554)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactGenerator.java	2009-02-17 01:35:31 UTC (rev 1555)
@@ -16,6 +16,7 @@
 import java.util.Set;
 
 import org.apache.log4j.Logger;
+import org.jboss.jsr299.tck.AbstractTest;
 import org.jboss.jsr299.tck.api.Configuration;
 import org.jboss.jsr299.tck.impl.packaging.ear.EarArtifactDescriptor;
 import org.jboss.jsr299.tck.impl.packaging.jsr299.BeansXml;
@@ -239,13 +240,10 @@
       this.configuration = configuration;
    }
 
-   public List<ArtifactDescriptor> createArtifacts()
+   public List<ArtifactDescriptor> createArtifacts(String packageName)
    {
       Set<Class<?>> classes = new HashSet<Class<?>>();
-      for (String packageName : configuration.getInContainerTestPackageNames())
-      {
-         classes.addAll(new ArtifactScanner(packageName).getClasses());
-      }
+      classes.addAll(new ArtifactScanner(packageName, null).getClasses());
       List<ArtifactDescriptor> artifacts = new ArrayList<ArtifactDescriptor>();
       for (Class<?> clazz : classes)
       {
@@ -256,7 +254,7 @@
    
    public void dumpArtifacts() 
    {
-      List<ArtifactDescriptor> artifacts = createArtifacts();
+      List<ArtifactDescriptor> artifacts = createArtifacts(AbstractTest.class.getPackage().getName());
       File file = new File(configuration.getOutputDirectory());
       if (!file.exists())
       {

Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java	2009-02-16 23:56:49 UTC (rev 1554)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/packaging/ArtifactScanner.java	2009-02-17 01:35:31 UTC (rev 1555)
@@ -7,6 +7,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.net.URL;
 import java.net.URLDecoder;
 import java.util.Enumeration;
@@ -25,13 +26,15 @@
 
    private final String packageName;
    private final String packageNameAsPath;
+   private final Class<? extends Annotation> annotationType;
    
    private final Set<Class<?>> classes = new HashSet<Class<?>>();
    
-   public ArtifactScanner(String packageName)
+   public ArtifactScanner(String packageName, Class<? extends Annotation> annotation)
    {
       this.packageName = packageName;
       this.packageNameAsPath = packageName.replace(".", "/");
+      this.annotationType = annotation;
    }
    
    private void scan()
@@ -121,7 +124,14 @@
       Class<?> clazz = Reflections.loadClass(className);
       if (clazz != null && clazz.isAnnotationPresent(Artifact.class) || clazz.isAnnotationPresent(EjbArtifact.class))
       {
-         classes.add(clazz);
+         if (annotationType != null && clazz.isAnnotationPresent(annotationType))
+         {
+            classes.add(clazz);
+         }
+         else
+         {
+            classes.add(clazz);
+         }
       }
       else if (clazz == null)
       {

Modified: tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java
===================================================================
--- tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java	2009-02-16 23:56:49 UTC (rev 1554)
+++ tck/trunk/impl/src/test/java/org/jboss/jsr299/tck/test/impl/packaging/scanner/ArtifactScannerTest.java	2009-02-17 01:35:31 UTC (rev 1555)
@@ -1,11 +1,9 @@
 package org.jboss.jsr299.tck.test.impl.packaging.scanner;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
 import org.jboss.jsr299.tck.api.Configuration;
-import org.jboss.jsr299.tck.impl.ConfigurationImpl;
 import org.jboss.jsr299.tck.impl.packaging.ArtifactDescriptor;
 import org.jboss.jsr299.tck.impl.packaging.ArtifactGenerator;
 import org.jboss.jsr299.tck.impl.packaging.ArtifactScanner;
@@ -20,7 +18,7 @@
    @Test
    public void testScanner()
    {
-      ArtifactScanner scanner = new ArtifactScanner(ArtifactScannerTest.class.getPackage().getName());
+      ArtifactScanner scanner = new ArtifactScanner(ArtifactScannerTest.class.getPackage().getName(), null);
       Set<Class<?>> classes = scanner.getClasses();
       assert classes.contains(DummyArtifact.class);
       assert classes.contains(AnotherDummyArtifact.class);
@@ -30,18 +28,9 @@
    @Test
    public void testMockArtifactGenerator() throws Exception
    {
-      Configuration configuration = new MockConfiguration()
-      {
-         
-         @Override
-         public List<String> getInContainerTestPackageNames()
-         {
-            return Arrays.asList("org.jboss.jsr299.tck.test.impl.packaging.scanner");
-         }
-         
-      };
+      Configuration configuration = new MockConfiguration();
       ArtifactGenerator generator = new ArtifactGenerator(configuration);
-      List<ArtifactDescriptor> artifacts = generator.createArtifacts();
+      List<ArtifactDescriptor> artifacts = generator.createArtifacts(DummyArtifact.class.getPackage().getName());
       assert artifacts.size() == 2;
       for (ArtifactDescriptor artifact : artifacts)
       {
@@ -62,27 +51,4 @@
       }
    }
    
-   @Test
-   public void testConfiguration() throws Exception
-   {
-      Configuration configuration = new MockConfiguration();
-      configuration.setStandalone(false);
-      assert configuration.getInContainerTestPackageNames().size() == 2;
-      assert configuration.getInContainerTestPackageNames().contains(ConfigurationImpl.INTEGRATION_TEST_PACKAGE_NAME);
-      assert configuration.getInContainerTestPackageNames().contains(ConfigurationImpl.UNIT_TEST_PACKAGE_NAME);
-      
-      configuration.setStandalone(true);
-      assert configuration.getInContainerTestPackageNames().size() == 1;
-      assert configuration.getInContainerTestPackageNames().contains(ConfigurationImpl.INTEGRATION_TEST_PACKAGE_NAME);
-   }
-   
-   @Test
-   public void testArtifactGenerator() throws Exception
-   {
-      Configuration configuration = new MockConfiguration();
-      assert new ArtifactGenerator(configuration).createArtifacts().size() > 0;
-      configuration.setStandalone(true);
-      //assert new ArtifactGenerator(configuration).createArtifacts().size() > 0;
-   }
-   
 }




More information about the weld-commits mailing list