You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2015/11/02 21:55:29 UTC
svn commit: r1712154 -
/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java
Author: schor
Date: Mon Nov 2 20:55:29 2015
New Revision: 1712154
URL: http://svn.apache.org/viewvc?rev=1712154&view=rev
Log:
no Jira - remove Assert. - deprecated form
Modified:
uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java
Modified: uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java?rev=1712154&r1=1712153&r2=1712154&view=diff
==============================================================================
--- uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java (original)
+++ uima/uimaj/branches/experiment-v3-jcas/uimaj-core/src/test/java/org/apache/uima/internal/util/UIMAClassLoaderTest.java Mon Nov 2 20:55:29 2015
@@ -22,14 +22,14 @@ package org.apache.uima.internal.util;
import java.io.File;
import java.lang.reflect.Method;
import java.net.URL;
-import java.util.Random;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
import org.apache.uima.resource.ResourceManager;
import org.apache.uima.test.junit_extension.JUnitExtension;
+import org.apache.uima.util.Misc;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
/*
* UIMA ClassLoader test
@@ -59,11 +59,11 @@ public class UIMAClassLoaderTest extends
public void testSimpleRsrcMgrCLassLoaderCreation() throws Exception {
ResourceManager rsrcMgr = UIMAFramework.newDefaultResourceManager();
- Assert.assertNull(rsrcMgr.getExtensionClassLoader());
+ assertNull(rsrcMgr.getExtensionClassLoader());
rsrcMgr.setExtensionClassPath("../this/is/a/simple/test.jar", false);
ClassLoader cl = rsrcMgr.getExtensionClassLoader();
- Assert.assertNotNull(cl);
+ assertNotNull(cl);
//assertTrue(cl != cl.getClassLoadingLock("Aclass"));
Class classOfLoader = cl.getClass().getSuperclass();
while (!(classOfLoader.getName().equals("java.lang.ClassLoader"))) {
@@ -80,11 +80,11 @@ public class UIMAClassLoaderTest extends
public void testAdvancedRsrcMgrCLassLoaderCreation() throws Exception {
ResourceManager rsrcMgr = UIMAFramework.newDefaultResourceManager();
- Assert.assertNull(rsrcMgr.getExtensionClassLoader());
+ assertNull(rsrcMgr.getExtensionClassLoader());
rsrcMgr.setExtensionClassPath("../this/is/a/simple/test.jar", true);
- Assert.assertNotNull(rsrcMgr.getExtensionClassLoader());
+ assertNotNull(rsrcMgr.getExtensionClassLoader());
}
@@ -94,18 +94,18 @@ public class UIMAClassLoaderTest extends
testClass = cl.loadClass("org.apache.uima.internal.util.ClassloadingTestClass");
- Assert.assertNotNull(testClass);
- Assert.assertEquals(cl, testClass.getClassLoader());
+ assertNotNull(testClass);
+ assertEquals(cl, testClass.getClassLoader());
testClass = cl.loadClass("org.apache.uima.flow.impl.AnalysisSequenceCapabilityNode");
- Assert.assertNotNull(testClass);
- Assert.assertEquals(this.getClass().getClassLoader(),testClass.getClassLoader());
+ assertNotNull(testClass);
+ assertEquals(this.getClass().getClassLoader(),testClass.getClassLoader());
}
public void testParallelClassLoading() throws Exception {
final UIMAClassLoader cl = new UIMAClassLoader(this.testClassPath, this.getClass().getClassLoader());
- final Class<?>[] loadedClasses = new Class<?>[Utilities.numberOfCores];
+ final Class<?>[] loadedClasses = new Class<?>[Misc.numberOfCores];
MultiThreadUtils.Run2isb callable = new MultiThreadUtils.Run2isb() {
@Override
@@ -114,9 +114,9 @@ public class UIMAClassLoaderTest extends
}
};
- MultiThreadUtils.tstMultiThread("MultiThreadLoading", Utilities.numberOfCores, 1, callable, MultiThreadUtils.emptyReset);
+ MultiThreadUtils.tstMultiThread("MultiThreadLoading", Misc.numberOfCores, 1, callable, MultiThreadUtils.emptyReset);
Class<?> c = loadedClasses[0];
- for (int i = 1; i < Utilities.numberOfCores; i++) {
+ for (int i = 1; i < Misc.numberOfCores; i++) {
assertEquals(c, loadedClasses[i]);
}
}
@@ -128,14 +128,14 @@ public class UIMAClassLoaderTest extends
testClass = cl.loadClass("org.apache.uima.internal.util.ClassloadingTestClass");
- Assert.assertNotNull(testClass);
- Assert.assertEquals(cl, testClass.getClassLoader());
+ assertNotNull(testClass);
+ assertEquals(cl, testClass.getClassLoader());
testClass = cl.loadClass("org.apache.uima.flow.impl.AnalysisSequenceCapabilityNode");
- Assert.assertNotNull(testClass);
- Assert.assertEquals(this.getClass().getClassLoader(),testClass.getClassLoader());
+ assertNotNull(testClass);
+ assertEquals(this.getClass().getClassLoader(),testClass.getClassLoader());
}
public void testAdvancedClassloadingSampleString() throws Exception {
@@ -144,13 +144,13 @@ public class UIMAClassLoaderTest extends
testClass = cl.loadClass("org.apache.uima.internal.util.ClassloadingTestClass");
- Assert.assertNotNull(testClass);
- Assert.assertEquals(cl, testClass.getClassLoader());
+ assertNotNull(testClass);
+ assertEquals(cl, testClass.getClassLoader());
testClass = cl.loadClass("org.apache.uima.flow.impl.AnalysisSequenceCapabilityNode");
- Assert.assertNotNull(testClass);
- Assert.assertEquals(this.getClass().getClassLoader(), testClass.getClassLoader());
+ assertNotNull(testClass);
+ assertEquals(this.getClass().getClassLoader(), testClass.getClassLoader());
}
public void testAdvancedClassloadingSampleURL() throws Exception {
@@ -160,13 +160,13 @@ public class UIMAClassLoaderTest extends
testClass = cl.loadClass("org.apache.uima.internal.util.ClassloadingTestClass");
- Assert.assertNotNull(testClass);
- Assert.assertEquals(cl, testClass.getClassLoader());
+ assertNotNull(testClass);
+ assertEquals(cl, testClass.getClassLoader());
testClass = cl.loadClass("org.apache.uima.flow.impl.AnalysisSequenceCapabilityNode");
- Assert.assertNotNull(testClass);
- Assert.assertEquals(this.getClass().getClassLoader(), testClass.getClassLoader());
+ assertNotNull(testClass);
+ assertEquals(this.getClass().getClassLoader(), testClass.getClassLoader());
}
}