Author: ash2k
Date: Sun Mar 2 10:55:13 2014
New Revision: 1573282
URL: http://svn.apache.org/r1573282
Log:
Do not use deprecated JUnit API
Modified:
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/classpath/ClasspathConfigTests.java
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/file/FileConfigTests.java
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/url/URLConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/ClasspathConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/both/BothClasspathConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/values/ValuesClasspathConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/duplicate/DuplicateClasspathConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/failure/FailureConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/FileConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/both/BothFileConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/DirectFileConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/OverrideFileConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/values/ValueFileConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/folder/FolderConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/URLConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/both/BothURLConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/DirectOverrideConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/OverrideConfigTests.java
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/values/ValuesURLConfigTests.java
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzTimerTestCase.java
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/WithPropertiesTestCase.java
Modified:
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/classpath/ClasspathConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/classpath/ClasspathConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/classpath/ClasspathConfigTests.java
(original)
+++
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/classpath/ClasspathConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNot
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.commons.configuration.plist.PropertyListConfiguration;
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import
org.apache.onami.autobind.integrations.commons.configuration.CommonsConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/file/FileConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/file/FileConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/file/FileConfigTests.java
(original)
+++
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/file/FileConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNot
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.commons.configuration.plist.PropertyListConfiguration;
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import
org.apache.onami.autobind.integrations.commons.configuration.CommonsConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/url/URLConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/url/URLConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/url/URLConfigTests.java
(original)
+++
onami/trunk/autobind/integrations/commons.configurations/src/test/java/org/apache/onami/autobind/integrations/test/commons/configuration/url/URLConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNot
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.commons.configuration.plist.PropertyListConfiguration;
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import
org.apache.onami.autobind.integrations.commons.configuration.CommonsConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/ClasspathConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/ClasspathConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/ClasspathConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/ClasspathConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/both/BothClasspathConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/both/BothClasspathConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/both/BothClasspathConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/both/BothClasspathConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.Configuration.Type;
@@ -32,6 +30,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/values/ValuesClasspathConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/values/ValuesClasspathConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/values/ValuesClasspathConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/classpath/values/ValuesClasspathConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNot
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.Configuration.Type;
@@ -30,6 +28,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/duplicate/DuplicateClasspathConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/duplicate/DuplicateClasspathConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/duplicate/DuplicateClasspathConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/duplicate/DuplicateClasspathConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/failure/FailureConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/failure/FailureConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/failure/FailureConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/failure/FailureConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/FileConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/FileConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/FileConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/FileConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -32,6 +30,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/both/BothFileConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/both/BothFileConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/both/BothFileConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/both/BothFileConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.Configuration.Type;
@@ -33,6 +31,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/DirectFileConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/DirectFileConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/DirectFileConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/DirectFileConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -32,6 +30,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/OverrideFileConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/OverrideFileConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/OverrideFileConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/override/OverrideFileConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -32,6 +30,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/values/ValueFileConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/values/ValueFileConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/values/ValueFileConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/file/values/ValueFileConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNot
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.Configuration.Type;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/folder/FolderConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/folder/FolderConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/folder/FolderConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/folder/FolderConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNot
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.Configuration.Type;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/URLConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/URLConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/URLConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/URLConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -32,6 +30,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/both/BothURLConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/both/BothURLConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/both/BothURLConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/both/BothURLConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.Configuration.Type;
@@ -33,6 +31,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/DirectOverrideConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/DirectOverrideConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/DirectOverrideConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/DirectOverrideConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -32,6 +30,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/OverrideConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/OverrideConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/OverrideConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/override/OverrideConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -22,8 +22,6 @@ import java.util.Properties;
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.PathConfig;
@@ -32,6 +30,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/values/ValuesURLConfigTests.java
URL:
http://svn.apache.org/viewvc/onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/values/ValuesURLConfigTests.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/values/ValuesURLConfigTests.java
(original)
+++
onami/trunk/autobind/tests/src/test/java/org/apache/onami/autobind/test/configuration/url/values/ValuesURLConfigTests.java
Sun Mar 2 10:55:13 2014
@@ -20,8 +20,6 @@ import static org.junit.Assert.assertNot
import javax.inject.Inject;
import javax.inject.Named;
-import junit.framework.Assert;
-
import org.apache.onami.autobind.annotations.Bind;
import org.apache.onami.autobind.configuration.Configuration;
import org.apache.onami.autobind.configuration.Configuration.Type;
@@ -31,6 +29,7 @@ import org.apache.onami.autobind.configu
import org.apache.onami.autobind.configuration.features.ConfigurationFeature;
import org.apache.onami.autobind.scanner.PackageFilter;
import org.apache.onami.autobind.scanner.asm.ASMClasspathScanner;
+import org.junit.Assert;
import org.junit.Test;
import com.google.inject.Guice;
Modified:
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java
URL:
http://svn.apache.org/viewvc/onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java
(original)
+++
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/AfterInjectionTestCase.java
Sun Mar 2 10:55:13 2014
@@ -24,7 +24,7 @@ import com.google.inject.ProvisionExcept
import org.junit.Test;
import static com.google.inject.Guice.createInjector;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
public final class AfterInjectionTestCase
{
Modified:
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java
URL:
http://svn.apache.org/viewvc/onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java
(original)
+++
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeModuleTestCase.java
Sun Mar 2 10:55:13 2014
@@ -29,7 +29,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import static com.google.inject.Guice.createInjector;
-import static junit.framework.Assert.*;
+import static org.junit.Assert.*;
public final class DisposeModuleTestCase
{
Modified:
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
URL:
http://svn.apache.org/viewvc/onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
(original)
+++
onami/trunk/lifecycle/standard/src/test/java/org/apache/onami/lifecycle/standard/DisposeTestCase.java
Sun Mar 2 10:55:13 2014
@@ -7,8 +7,8 @@ import org.junit.Before;
import org.junit.Test;
import static com.google.inject.Guice.createInjector;
-import static junit.framework.Assert.assertTrue;
-import static junit.framework.Assert.fail;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
public final class DisposeTestCase
{
Modified:
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java
URL:
http://svn.apache.org/viewvc/onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java
(original)
+++
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzSimpleTriggerTimerTestCase.java
Sun Mar 2 10:55:13 2014
@@ -19,7 +19,7 @@ package org.apache.onami.scheduler;
* under the License.
*/
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.GuiceProvidedModules;
Modified:
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzTimerTestCase.java
URL:
http://svn.apache.org/viewvc/onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzTimerTestCase.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzTimerTestCase.java
(original)
+++
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/GuartzTimerTestCase.java
Sun Mar 2 10:55:13 2014
@@ -19,7 +19,7 @@ package org.apache.onami.scheduler;
* under the License.
*/
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
import javax.inject.Inject;
Modified:
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java
URL:
http://svn.apache.org/viewvc/onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java
(original)
+++
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/RepeatedSchedulingTestCase.java
Sun Mar 2 10:55:13 2014
@@ -19,7 +19,7 @@ package org.apache.onami.scheduler;
* under the License.
*/
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertTrue;
import org.apache.onami.test.OnamiRunner;
import org.apache.onami.test.annotation.GuiceProvidedModules;
Modified:
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/WithPropertiesTestCase.java
URL:
http://svn.apache.org/viewvc/onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/WithPropertiesTestCase.java?rev=1573282&r1=1573281&r2=1573282&view=diff
==============================================================================
---
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/WithPropertiesTestCase.java
(original)
+++
onami/trunk/scheduler/src/test/java/org/apache/onami/scheduler/WithPropertiesTestCase.java
Sun Mar 2 10:55:13 2014
@@ -19,7 +19,7 @@ package org.apache.onami.scheduler;
* under the License.
*/
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertEquals;
import java.util.Properties;
