geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r816993 - in /geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation: AnnotationHelperTest.java ResourceAnnotationExample.java ResourceAnnotationTest.java
Date Sun, 20 Sep 2009 08:30:08 GMT
Author: djencks
Date: Sun Sep 20 08:30:08 2009
New Revision: 816993

URL: http://svn.apache.org/viewvc?rev=816993&view=rev
Log:
try to fix build, apparent junit 4 confusion with non test class ending in 'Test'

Added:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationExample.java
  (contents, props changed)
      - copied, changed from r816941, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationTest.java
Removed:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationTest.java
Modified:
    geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java

Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java?rev=816993&r1=816992&r2=816993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/AnnotationHelperTest.java
Sun Sep 20 08:30:08 2009
@@ -21,7 +21,6 @@
 import java.lang.reflect.Method;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -42,7 +41,7 @@
  */
 public class AnnotationHelperTest extends XmlBeansTestSupport {
 
-    private Class[] classes = {ResourceAnnotationTest.class};
+    private Class[] classes = {ResourceAnnotationExample.class};
 
     private ClassFinder classFinder = new ClassFinder(classes);
     private ClassLoader classLoader = this.getClass().getClassLoader();
@@ -56,19 +55,19 @@
         List<Class> annotatedClasses = classFinder.findAnnotatedClasses(Resources.class);
         assertNotNull(annotatedClasses);
         assertEquals(1, annotatedClasses.size());
-        assertTrue(annotatedClasses.contains(ResourceAnnotationTest.class));
+        assertTrue(annotatedClasses.contains(ResourceAnnotationExample.class));
 
         List<Method> annotatedMethods = classFinder.findAnnotatedMethods(Resource.class);
         assertNotNull(annotatedMethods);
         assertEquals(2, annotatedMethods.size());
-        assertTrue(annotatedMethods.contains(ResourceAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod1",
new Class[]{String.class})));
-        assertTrue(annotatedMethods.contains(ResourceAnnotationTest.class.getDeclaredMethod("setAnnotatedMethod2",
new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(ResourceAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod1",
new Class[]{String.class})));
+        assertTrue(annotatedMethods.contains(ResourceAnnotationExample.class.getDeclaredMethod("setAnnotatedMethod2",
new Class[]{String.class})));
 
         List<Field> annotatedFields = classFinder.findAnnotatedFields(Resource.class);
         assertNotNull(annotatedFields);
         assertEquals(2, annotatedFields.size());
-        assertTrue(annotatedFields.contains(ResourceAnnotationTest.class.getDeclaredField("annotatedField1")));
-        assertTrue(annotatedFields.contains(ResourceAnnotationTest.class.getDeclaredField("annotatedField2")));
+        assertTrue(annotatedFields.contains(ResourceAnnotationExample.class.getDeclaredField("annotatedField1")));
+        assertTrue(annotatedFields.contains(ResourceAnnotationExample.class.getDeclaredField("annotatedField2")));
 
         //-------------------------------------------------
         // Ensure annotations are processed correctly

Copied: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationExample.java
(from r816941, geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationTest.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationExample.java?p2=geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationExample.java&p1=geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationTest.java&r1=816941&r2=816993&rev=816993&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationTest.java
(original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationExample.java
Sun Sep 20 08:30:08 2009
@@ -33,7 +33,7 @@
                           type = javax.xml.ws.Service.class,
                           authenticationType = Resource.AuthenticationType.APPLICATION)
             })
-public class ResourceAnnotationTest {
+public class ResourceAnnotationExample {
 
     @Resource(name = "Resource3",
               type = java.lang.Object.class,

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationExample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationExample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/src/test/java/org/apache/geronimo/connector/deployment/annotation/ResourceAnnotationExample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message