Skip to content

Commit

Permalink
Fix packaging of some tests, WBRI-279
Browse files Browse the repository at this point in the history
git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@2897 1c488680-804c-0410-94cd-c6b725194a0e
  • Loading branch information
pmuir committed Jun 26, 2009
1 parent f28688f commit 5a2a190
Show file tree
Hide file tree
Showing 66 changed files with 204 additions and 103 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities;
package org.jboss.webbeans.test.unit.activities;

import java.lang.annotation.Annotation;
import java.lang.reflect.Member;
Expand All @@ -19,11 +19,11 @@
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionPoint;

import org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle.MockCreationalContext;
import org.jboss.testharness.impl.packaging.Artifact;
import org.jboss.webbeans.bean.ForwardingBean;
import org.jboss.webbeans.literal.CurrentLiteral;
import org.jboss.webbeans.test.AbstractWebBeansTest;
import org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle.MockCreationalContext;
import org.testng.annotations.Test;


Expand Down
@@ -0,0 +1,6 @@
package org.jboss.webbeans.test.unit.activities;

class Cow
{

}
@@ -1,7 +1,7 @@
/**
*
*/
package org.jboss.jsr299.tck.tests.activities;
package org.jboss.webbeans.test.unit.activities;

import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities;
package org.jboss.webbeans.test.unit.activities;

import javax.enterprise.inject.Instance;
import javax.inject.Obtains;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities;
package org.jboss.webbeans.test.unit.activities;

import javax.enterprise.event.Observes;

Expand Down
@@ -0,0 +1,6 @@
package org.jboss.webbeans.test.unit.activities;

class NightTime
{

}
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities;
package org.jboss.webbeans.test.unit.activities;

import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.child;
package org.jboss.webbeans.test.unit.activities.child;

class BeanWithInjection
{
Expand Down
@@ -0,0 +1,7 @@
package org.jboss.webbeans.test.unit.activities.child;

@SpecialBindingType
class MyBean
{

}
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.child;
package org.jboss.webbeans.test.unit.activities.child;

import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Expand Down Expand Up @@ -99,15 +99,15 @@ public void destroy(MyBean instance, CreationalContext<MyBean> creationalContext
return bean;
}

@Test(groups = { "ri-broken" }, expectedExceptions = { InjectionException.class })
@Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
public void testSameBeanTypeInChildAsParentInjection()
{
BeanManager childActivity = getCurrentManager().createActivity();
Bean<?> anotherMyBean = createDummyBean(childActivity);
childActivity.addBean(anotherMyBean);
}

@Test(groups = { "ri-broken" }, expectedExceptions = { InjectionException.class })
@Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
public void testSameBeanTypeInChildAsIndirectParentInjection()
{
WebBeansManager childActivity = getCurrentManager().createActivity();
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.child;
package org.jboss.webbeans.test.unit.activities.child;

import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Expand Down
@@ -0,0 +1,6 @@
package org.jboss.webbeans.test.unit.activities.current;

class Cow
{

}
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import javax.enterprise.inject.spi.BeanManager;
import javax.naming.InitialContext;
Expand Down
@@ -1,7 +1,7 @@
/**
*
*/
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import javax.enterprise.event.Event;
import javax.enterprise.inject.Any;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import java.lang.annotation.Annotation;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import javax.enterprise.inject.Instance;
import javax.inject.Obtains;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import javax.enterprise.inject.Current;
import javax.enterprise.inject.spi.BeanManager;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import java.lang.annotation.Annotation;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import java.lang.annotation.Annotation;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import java.lang.annotation.Annotation;
import java.lang.reflect.Type;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import java.lang.annotation.Annotation;

Expand Down
@@ -0,0 +1,6 @@
package org.jboss.webbeans.test.unit.activities.current;

class NightTime
{

}
@@ -1,7 +1,7 @@
/**
*
*/
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import java.lang.annotation.Annotation;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.activities.current;
package org.jboss.webbeans.test.unit.activities.current;

import static java.lang.annotation.ElementType.FIELD;
import static java.lang.annotation.ElementType.METHOD;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Local;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Stateful;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Local;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import java.util.Arrays;
import java.util.HashSet;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Remove;
import javax.ejb.Stateful;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Local;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

public class Giessen implements NeueStadt, GeschichtslosStadt
{
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Local;

Expand Down
@@ -0,0 +1,6 @@
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

public class GutenbergMuseum
{

}
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Stateful;

Expand Down
@@ -0,0 +1,6 @@
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

class IntermediateOrderProcessor extends OrderProcessor
{

}
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Local;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.annotation.PreDestroy;
import javax.ejb.Remove;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.annotation.PostConstruct;
import javax.ejb.Stateless;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Remove;
import javax.ejb.Stateful;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.enterprise.context.spi.CreationalContext;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Local;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

import javax.ejb.Local;

Expand Down
@@ -1,4 +1,4 @@
package org.jboss.jsr299.tck.tests.implementation.enterprise.lifecycle;
package org.jboss.webbeans.test.unit.implementation.enterprise.lifecycle;

class RoemerPassage
{
Expand Down

0 comments on commit 5a2a190

Please sign in to comment.