svn commit: r1796357 [1/2] - in /openwebbeans/trunk: webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ webbeans-impl/src/main/java/org/apache/webbeans/portable/ webbeans-impl/src/test/java/org/apache/webbeans/tes...

Fri, 26 May 2017 15:36:07 -0700 

Author: struberg
Date: Fri May 26 22:35:32 2017
New Revision: 1796357

URL: http://svn.apache.org/viewvc?rev=1796357&view=rev
Log:
move to proper junit Assert

Modified:
    
openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java
    
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeProducerMethodTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/typeliterals/TypeLiteralTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/session/tests/SessionContextTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/constructor/DecoratorConstructorInjectionTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/AbstractDecoratorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DecoratorAndInterceptorStackTests.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DependentDecoratorDestroyTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedMulitpleGenericDecoratorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/GenericDecoratorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/MultipleDecoratorStackTests.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/RepeatedGenericTypeDecoratorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DependentMethodBeanTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DisposerMethodBeanTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/StaticProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/extensionevents/ExtensionEventTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/injectiontarget/ProcessInjectionTargetTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionIntoConstructorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/GenericsTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/noncontextual/InjectNonContextualTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/serialization/DependentPassivationCriteriaTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/typed/TypedProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/instance/InstanceIteratorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/DependingInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InheritedBeanInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InterceptorPerformanceTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/MultiRequestProxyTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedBindingTypeTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithStereoTypeInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentLifecycleTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/ejb/EjbInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/inheritance/InheritedInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/LifecycleTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritedOverridenTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/ProxyFactoryTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/instance/InjectedInstanceComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeanManagerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeforeBeanDiscoveryTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/ExtensionTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/PortableTests.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/ExtensionTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddObserverMethodTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableEventTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageReceiverExtension.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageSenderExtension.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/InjectionTargetTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/supportInjections/SupportInjectionTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/javaee/JavaEeInjectionTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ListProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerPassivationTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/GetterStringInjectorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/InnerClassInjectStringProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/ProductProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/MethodProducer1Test.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/PersonProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/AlternativeSpecializesProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializationTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializedProducerMethodsTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/DependentProducerMethodInjectionPointTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/DependentProducerMethodMultipleInjectionPointTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/binding/BrokenBindingComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/config/WebBeansScannerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/Decorator1Test.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/decorator/DecoratorExceptionTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/definition/BeanTypesTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/DependentComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/dependent/MultipleDependentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/BrokenComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/event/component/ObserversComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ExceptionComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/exception/ScopeTypeExceptionComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/CurrentInjectedComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/InjectedComponentWithMemberTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/PaymentProcessorComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/TypedInjectedComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/UserComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/inject/alternative/AlternativeTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/EJBInterceptorExceptionComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructDoubleInterceptorComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PostConstructInterceptorComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/PreDestroyComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureAndTransactionalInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/SecureInterceptorComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/ShoppingCardInterceptorTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/intercept/webbeans/WebBeansInterceptComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/library/LibraryComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/Producer1ConsumerComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/ProducerComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/producer/primitive/PrimitiveProducerTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/resolution/ManagerResolutionTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/scopes/SingletonComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/specializes/logger/LoggerSpecializationTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypeLiteralTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/AlternativesTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/xml/strict/XMLSpecStrictTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/util/ClassUtilTest.java
    
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/util/WebBeansUtilTest.java
    
openwebbeans/trunk/webbeans-jsf/src/test/java/org/apache/webbeans/jsf/test/JSFUtilTest.java
    openwebbeans/trunk/webbeans-tck/standalone-suite.xml
    
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/initialization/InitializedSessionScopedTest.java
    
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/CachedInterceptorHandlerTest.java
    
openwebbeans/trunk/webbeans-web/src/test/java/org/apache/webbeans/web/tests/interceptor/SerializationTest.java

Modified: 
openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/it/properties/src/test/java/org/apache/webbeans/test/spi/configuration/ConfigurationTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.spi.configuration;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.config.WebBeansContext;

Modified: 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/portable/AbstractProducer.java
 Fri May 26 22:35:32 2017
@@ -189,7 +189,7 @@ public abstract class AbstractProducer<T
                     Decorator decorator = decorators.get(i - 1);
                     creationalContextImpl.putContextual(decorator);
                     creationalContextImpl.putDelegate(delegate);
-                    Object decoratorInstance = 
decorator.create((CreationalContext) creationalContext);
+                    Object decoratorInstance = 
decorator.create(creationalContext);
                     instances.put(decorator, decoratorInstance);
                     delegate = proxyFactory.createProxyInstance(proxyClass, 
instance,
                             new DecoratorHandler(interceptorInfo, decorators, 
instances, i - 1, instance, passivationId));

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeOnProducerFieldTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.concepts.alternatives.common.Pen;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeProducerMethodTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeProducerMethodTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeProducerMethodTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/alternatives/tests/AlternativeProducerMethodTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.concepts.alternatives.common.AlternativeOnClassAndProducerMethodBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/typeliterals/TypeLiteralTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/typeliterals/TypeLiteralTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/typeliterals/TypeLiteralTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/concepts/typeliterals/TypeLiteralTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import java.lang.reflect.Type;
 
 import org.junit.Test;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import junit.framework.TestCase;
 
 public class TypeLiteralTest extends TestCase

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
 Fri May 26 22:35:32 2017
@@ -22,7 +22,7 @@ import java.util.Set;
 
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.annotation.binding.AnnotationWithBindingMember;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/SerializationTest.java
 Fri May 26 22:35:32 2017
@@ -43,7 +43,7 @@ import org.apache.webbeans.test.componen
 import 
org.apache.webbeans.test.component.event.normal.TransactionalInterceptor;
 import org.apache.webbeans.util.WebBeansUtil;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/conversation/ConversationScopedTest.java
 Fri May 26 22:35:32 2017
@@ -20,7 +20,7 @@ package org.apache.webbeans.test.context
 
 import javax.enterprise.context.RequestScoped;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/session/tests/SessionContextTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/session/tests/SessionContextTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/session/tests/SessionContextTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/session/tests/SessionContextTest.java
 Fri May 26 22:35:32 2017
@@ -24,7 +24,7 @@ import java.util.Collection;
 import javax.enterprise.context.RequestScoped;
 import javax.enterprise.context.SessionScoped;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.contexts.session.common.AppScopedBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/contexts/threadsafety/ThreadSafeBeanInitialisationTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.contexts.threadsafety;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.spi.ContextsService;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/constructor/DecoratorConstructorInjectionTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/constructor/DecoratorConstructorInjectionTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/constructor/DecoratorConstructorInjectionTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/constructor/DecoratorConstructorInjectionTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.decorators.constructor;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/AbstractDecoratorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/AbstractDecoratorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/AbstractDecoratorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/AbstractDecoratorTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.decorat
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.decorators.multiple.Decorator1;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ConversationDecoratorTest.java
 Fri May 26 22:35:32 2017
@@ -26,7 +26,7 @@ import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.conversation.DefaultConversationService;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DecoratorAndInterceptorStackTests.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DecoratorAndInterceptorStackTests.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DecoratorAndInterceptorStackTests.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DecoratorAndInterceptorStackTests.java
 Fri May 26 22:35:32 2017
@@ -28,7 +28,7 @@ import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.spi.ContextsService;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DependentDecoratorDestroyTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DependentDecoratorDestroyTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DependentDecoratorDestroyTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/DependentDecoratorDestroyTest.java
 Fri May 26 22:35:32 2017
@@ -26,7 +26,7 @@ import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.decorators.dependent.DependentDecorator;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedGenericDecoratorTest.java
 Fri May 26 22:35:32 2017
@@ -26,7 +26,7 @@ import javax.enterprise.inject.Decorated
 import javax.enterprise.inject.spi.Bean;
 import javax.inject.Inject;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Ignore;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedMulitpleGenericDecoratorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedMulitpleGenericDecoratorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedMulitpleGenericDecoratorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/ExtendedMulitpleGenericDecoratorTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.decorators.tests;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/GenericDecoratorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/GenericDecoratorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/GenericDecoratorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/GenericDecoratorTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import java.util.Collection;
 
 import javax.enterprise.inject.spi.DefinitionException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.decorators.common.Garphly;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/MultipleDecoratorStackTests.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/MultipleDecoratorStackTests.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/MultipleDecoratorStackTests.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/MultipleDecoratorStackTests.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.decorators.multiple.Decorator1;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/RepeatedGenericTypeDecoratorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/RepeatedGenericTypeDecoratorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/RepeatedGenericTypeDecoratorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/decorators/tests/RepeatedGenericTypeDecoratorTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import javax.decorator.Delegate;
 import javax.enterprise.inject.Any;
 import javax.inject.Inject;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DependentMethodBeanTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DependentMethodBeanTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DependentMethodBeanTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DependentMethodBeanTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import javax.enterprise.context.RequestS
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.disposes.beans.AppScopedBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DisposerMethodBeanTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DisposerMethodBeanTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DisposerMethodBeanTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/DisposerMethodBeanTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.disposes;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.disposes.beans.DisposeModel;
 import org.apache.webbeans.test.disposes.beans.DisposerMethodBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/StaticProducerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/StaticProducerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/StaticProducerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/disposes/StaticProducerTest.java
 Fri May 26 22:35:32 2017
@@ -27,7 +27,7 @@ import javax.enterprise.inject.Typed;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.annotation.binding.Users;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/extensionevents/ExtensionEventTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/extensionevents/ExtensionEventTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/extensionevents/ExtensionEventTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/extensionevents/ExtensionEventTest.java
 Fri May 26 22:35:32 2017
@@ -16,7 +16,7 @@
  */
 package org.apache.webbeans.test.events.extensionevents;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/injectiontarget/ProcessInjectionTargetTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/injectiontarget/ProcessInjectionTargetTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/injectiontarget/ProcessInjectionTargetTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/events/injectiontarget/ProcessInjectionTargetTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import javax.enterprise.inject.spi.Injec
 import javax.enterprise.inject.spi.ProcessInjectionTarget;
 import javax.inject.Inject;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionIntoConstructorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionIntoConstructorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionIntoConstructorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionIntoConstructorTest.java
 Fri May 26 22:35:32 2017
@@ -26,7 +26,7 @@ import java.util.Set;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.injection.circular.beans.CircularConstructorOrProducerMethodParameterBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/circular/tests/CircularInjectionTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.injecti
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.injection.circular.beans.CircularApplicationScopedBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/GenericsTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/GenericsTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/GenericsTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/generics/GenericsTest.java
 Fri May 26 22:35:32 2017
@@ -30,7 +30,7 @@ import javax.enterprise.inject.spi.Injec
 import javax.enterprise.inject.spi.ObserverMethod;
 import javax.enterprise.util.TypeLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/noncontextual/InjectNonContextualTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/noncontextual/InjectNonContextualTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/noncontextual/InjectNonContextualTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/noncontextual/InjectNonContextualTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.injection.noncontextual;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/serialization/DependentPassivationCriteriaTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/serialization/DependentPassivationCriteriaTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/serialization/DependentPassivationCriteriaTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/serialization/DependentPassivationCriteriaTest.java
 Fri May 26 22:35:32 2017
@@ -29,7 +29,7 @@ import org.junit.Test;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 /**
  * <p>This test performs a few tests to ensure correct handling of injecting

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/typed/TypedProducerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/typed/TypedProducerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/typed/TypedProducerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/injection/typed/TypedProducerTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.injecti
 import javax.enterprise.inject.spi.Bean;
 import java.util.Set;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/instance/InstanceIteratorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/instance/InstanceIteratorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/instance/InstanceIteratorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/instance/InstanceIteratorTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.instance;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/DependingInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/DependingInterceptorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/DependingInterceptorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/DependingInterceptorTest.java
 Fri May 26 22:35:32 2017
@@ -26,7 +26,7 @@ import javax.enterprise.context.RequestS
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.spi.ContextsService;
 import org.apache.webbeans.test.AbstractUnitTest;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InheritedBeanInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InheritedBeanInterceptorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InheritedBeanInterceptorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InheritedBeanInterceptorTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.interceptors.business.tests;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.interceptors.business.common.TransactionalBaseBean;
 import 
org.apache.webbeans.test.interceptors.business.common.TransactionalChildBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InterceptorPerformanceTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InterceptorPerformanceTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InterceptorPerformanceTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/InterceptorPerformanceTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.interceptors.business.tests;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.logger.WebBeansLoggerFacade;
 import org.apache.webbeans.spi.ContextsService;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/MultiRequestProxyTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/MultiRequestProxyTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/MultiRequestProxyTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/MultiRequestProxyTest.java
 Fri May 26 22:35:32 2017
@@ -22,7 +22,7 @@ import javax.enterprise.context.RequestS
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.interceptors.beans.ApplicationScopedBean;
 import org.apache.webbeans.test.interceptors.beans.DependentScopedBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedBindingTypeTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedBindingTypeTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedBindingTypeTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedBindingTypeTest.java
 Fri May 26 22:35:32 2017
@@ -26,7 +26,7 @@ import javax.enterprise.context.RequestS
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.spi.ContextsService;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithInheritedStereoTypeInterceptorTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.interceptors.business.common.WithInheritedStereoTypeInterceptorBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithStereoTypeInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithStereoTypeInterceptorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithStereoTypeInterceptorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/business/tests/WithStereoTypeInterceptorTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.interceptors.business.common.WithStereoTypeInterceptorBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentInterceptorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentInterceptorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentInterceptorTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.interceptors.beans.DependentScopedBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentLifecycleTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentLifecycleTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentLifecycleTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/dependent/DependentLifecycleTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/ejb/EjbInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/ejb/EjbInterceptorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/ejb/EjbInterceptorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/ejb/EjbInterceptorTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.interce
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.interceptors.beans.ApplicationScopedBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/inheritance/InheritedInterceptorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/inheritance/InheritedInterceptorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/inheritance/InheritedInterceptorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/inheritance/InheritedInterceptorTest.java
 Fri May 26 22:35:32 2017
@@ -26,7 +26,7 @@ import java.util.Set;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.After;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/LifecycleTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/LifecycleTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/LifecycleTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/LifecycleTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import java.util.Set;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritanceTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import java.util.Collection;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Before;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritedOverridenTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritedOverridenTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritedOverridenTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/interceptors/lifecycle/inheritance/LifecycleInheritedOverridenTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import java.util.Collection;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Before;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/ProxyFactoryTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/ProxyFactoryTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/ProxyFactoryTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/ProxyFactoryTest.java
 Fri May 26 22:35:32 2017
@@ -29,7 +29,7 @@ import java.util.concurrent.atomic.Atomi
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.proxy.NormalScopeProxyFactory;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/instance/InjectedInstanceComponentTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/instance/InjectedInstanceComponentTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/instance/InjectedInstanceComponentTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/managed/instance/InjectedInstanceComponentTest.java
 Fri May 26 22:35:32 2017
@@ -28,7 +28,7 @@ import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.TypeLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.managed.instance.beans.DependentBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeanManagerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeanManagerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeanManagerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeanManagerTest.java
 Fri May 26 22:35:32 2017
@@ -18,7 +18,7 @@
  */
 package org.apache.webbeans.test.portable;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeforeBeanDiscoveryTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeforeBeanDiscoveryTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeforeBeanDiscoveryTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/BeforeBeanDiscoveryTest.java
 Fri May 26 22:35:32 2017
@@ -7,7 +7,7 @@ import javax.enterprise.inject.Default;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/ExtensionTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/ExtensionTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/ExtensionTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/ExtensionTest.java
 Fri May 26 22:35:32 2017
@@ -24,7 +24,7 @@ import javax.enterprise.context.Applicat
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.PassivationCapable;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.config.WebBeansContext;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/PortableTests.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/PortableTests.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/PortableTests.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/PortableTests.java
 Fri May 26 22:35:32 2017
@@ -36,7 +36,7 @@ import javax.inject.Inject;
 import javax.inject.Named;
 import javax.interceptor.Interceptor;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.test.annotation.binding.Binding1;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/ExtensionTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/ExtensionTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/ExtensionTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/ExtensionTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import java.util.Collection;
 
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.container.BeanManagerImpl;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddBeanTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.portabl
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.portable.events.extensions.AddBeanExtension;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddObserverMethodTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddObserverMethodTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddObserverMethodTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableAddObserverMethodTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.portabl
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.portable.events.extensions.AddObserverMethodExtension;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableEventTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableEventTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableEventTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/PortableEventTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.portabl
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.apache.webbeans.test.portable.events.beans.Apple;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageReceiverExtension.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageReceiverExtension.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageReceiverExtension.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageReceiverExtension.java
 Fri May 26 22:35:32 2017
@@ -20,7 +20,7 @@ import javax.enterprise.event.Observes;
 import javax.enterprise.inject.spi.AfterDeploymentValidation;
 import javax.enterprise.inject.spi.Extension;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 /**
  * Test that an Extension can send  any message to another Extension.

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageSenderExtension.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageSenderExtension.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageSenderExtension.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/events/extensions/MessageSenderExtension.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ import javax.enterprise.inject.spi.BeanM
 import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 /**
  * Test that an Extension can send  any message to another Extension.

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/InjectionTargetTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/InjectionTargetTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/InjectionTargetTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/InjectionTargetTest.java
 Fri May 26 22:35:32 2017
@@ -25,7 +25,7 @@ import javax.enterprise.context.spi.Cont
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.InjectionTarget;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/supportInjections/SupportInjectionTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/supportInjections/SupportInjectionTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/supportInjections/SupportInjectionTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/injectiontarget/supportInjections/SupportInjectionTest.java
 Fri May 26 22:35:32 2017
@@ -24,7 +24,7 @@ import java.util.Collection;
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.InjectionTarget;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/javaee/JavaEeInjectionTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/javaee/JavaEeInjectionTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/javaee/JavaEeInjectionTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/portable/javaee/JavaEeInjectionTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.portabl
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.inject.OWBInjector;
 import org.apache.webbeans.test.AbstractUnitTest;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/AmbigousProducerTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import java.util.Collection;
 
 import javax.enterprise.inject.AmbiguousResolutionException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import javax.enterprise.inject.spi.DeploymentException;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ListProducerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ListProducerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ListProducerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ListProducerTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.produce
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.test.AbstractUnitTest;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerPassivationTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerPassivationTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerPassivationTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/producer/ProducerPassivationTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import javax.enterprise.inject.spi.Defin
 import javax.inject.Inject;
 import java.io.Serializable;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/GetterStringInjectorTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/GetterStringInjectorTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/GetterStringInjectorTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/GetterStringInjectorTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import java.util.Collection;
 
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.annotation.NamedLiteral;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/InnerClassInjectStringProducerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/InnerClassInjectStringProducerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/InnerClassInjectStringProducerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/InnerClassInjectStringProducerTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import java.util.Collection;
 
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.profields.beans.stringproducer.StringProducerBean;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/ProductProducerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/ProductProducerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/ProductProducerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/profields/ProductProducerTest.java
 Fri May 26 22:35:32 2017
@@ -21,7 +21,7 @@ package org.apache.webbeans.test.profiel
 import java.util.ArrayList;
 import java.util.Collection;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.annotation.DefaultLiteral;
 import org.apache.webbeans.test.AbstractUnitTest;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/MethodProducer1Test.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/MethodProducer1Test.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/MethodProducer1Test.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/MethodProducer1Test.java
 Fri May 26 22:35:32 2017
@@ -27,7 +27,7 @@ import javax.enterprise.inject.spi.Annot
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionTarget;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.component.ManagedBean;
 import org.apache.webbeans.test.AbstractUnitTest;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/PersonProducerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/PersonProducerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/PersonProducerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/promethods/PersonProducerTest.java
 Fri May 26 22:35:32 2017
@@ -26,7 +26,7 @@ import javax.enterprise.context.spi.Crea
 import javax.enterprise.inject.IllegalProductException;
 import javax.enterprise.inject.spi.Bean;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.component.ProducerMethodBean;
 import org.apache.webbeans.test.AbstractUnitTest;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/proxy/unproxyable/AllowProxyingTest.java
 Fri May 26 22:35:32 2017
@@ -23,7 +23,7 @@ import javax.enterprise.inject.spi.Defin
 import javax.inject.Inject;
 import java.util.HashMap;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Before;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/AlternativeSpecializesProducerTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/AlternativeSpecializesProducerTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/AlternativeSpecializesProducerTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/AlternativeSpecializesProducerTest.java
 Fri May 26 22:35:32 2017
@@ -27,7 +27,7 @@ import javax.enterprise.context.spi.Crea
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.util.AnnotationLiteral;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializationTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializationTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializationTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializationTest.java
 Fri May 26 22:35:32 2017
@@ -20,7 +20,7 @@ package org.apache.webbeans.test.specali
 
 import java.util.ArrayList;
 import java.util.Collection;
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import javax.enterprise.inject.spi.DefinitionException;
 

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializedProducerMethodsTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializedProducerMethodsTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializedProducerMethodsTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/multiple/MultipleSpecializedProducerMethodsTest.java
 Fri May 26 22:35:32 2017
@@ -20,7 +20,7 @@ import javax.enterprise.inject.Produces;
 import javax.enterprise.inject.Specializes;
 import javax.enterprise.inject.spi.DeploymentException;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
 import org.apache.webbeans.test.AbstractUnitTest;
 import org.junit.Test;

Modified: 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/DependentProducerMethodInjectionPointTest.java
URL: 
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/DependentProducerMethodInjectionPointTest.java?rev=1796357&r1=1796356&r2=1796357&view=diff
==============================================================================
--- 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/DependentProducerMethodInjectionPointTest.java
 (original)
+++ 
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/tests/DependentProducerMethodInjectionPointTest.java
 Fri May 26 22:35:32 2017
@@ -27,7 +27,7 @@ import javax.enterprise.context.spi.Crea
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import org.apache.webbeans.test.AbstractUnitTest;
 import 
org.apache.webbeans.test.injection.injectionpoint.beans.InjectionPointMetaDataOwner;

Reply via email to