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 2014/11/23 20:38:26 UTC
svn commit: r1641251 - in
/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima:
analysis_engine/impl/ cas/impl/ cas/test/ cas_data/impl/ impl/
internal/util/ internal/util/rb_trees/ pear/util/ resource/impl/
resource/metadata/impl/ testTypeSystem...
Author: schor
Date: Sun Nov 23 19:38:25 2014
New Revision: 1641251
URL: http://svn.apache.org/r1641251
Log:
no Jira - clean up unneeded casts, unnecessary imports, compare logic tests between boolean and true/false, replace a loop with arraycopy
Modified:
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntHashMapTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntPerfTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts_Type.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings_Type.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java
uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnalysisEngine_implTest.java Sun Nov 23 19:38:25 2014
@@ -1418,11 +1418,11 @@ public class AnalysisEngine_implTest ext
// -- check SourceDocumentInformation FSs
Iterator<AnnotationFS> sdiIter = outCas.getAnnotationIndex(sdiType).iterator();
assertTrue(sdiIter.hasNext());
- AnnotationFS outSdiFs = (AnnotationFS) sdiIter.next();
+ AnnotationFS outSdiFs = sdiIter.next();
assertEquals("This is", outSdiFs.getCoveredText());
assertEquals("cas1", outSdiFs.getStringValue(uriFeat));
assertTrue(sdiIter.hasNext());
- outSdiFs = (AnnotationFS) sdiIter.next();
+ outSdiFs = sdiIter.next();
assertEquals(" one.", outSdiFs.getCoveredText());
assertEquals("cas2", outSdiFs.getStringValue(uriFeat));
assertFalse(sdiIter.hasNext());
@@ -1437,11 +1437,11 @@ public class AnalysisEngine_implTest ext
// -- check SourceDocumentInformation FSs
sdiIter = outCas.getAnnotationIndex(sdiType).iterator();
assertTrue(sdiIter.hasNext());
- outSdiFs = (AnnotationFS) sdiIter.next();
+ outSdiFs = sdiIter.next();
assertEquals("This is", outSdiFs.getCoveredText());
assertEquals("cas2", outSdiFs.getStringValue(uriFeat));
assertTrue(sdiIter.hasNext());
- outSdiFs = (AnnotationFS) sdiIter.next();
+ outSdiFs = sdiIter.next();
assertEquals(" two.", outSdiFs.getCoveredText());
assertEquals("cas3", outSdiFs.getStringValue(uriFeat));
assertFalse(sdiIter.hasNext());
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/AnnotationWriter.java Sun Nov 23 19:38:25 2014
@@ -97,7 +97,7 @@ public class AnnotationWriter extends Ca
FSIterator<AnnotationFS> typeIterator = aCAS.getCurrentView().getAnnotationIndex().iterator();
for (typeIterator.moveToFirst(); typeIterator.isValid(); typeIterator.moveToNext()) {
- AnnotationFS annot = (AnnotationFS) typeIterator.get();
+ AnnotationFS annot = typeIterator.get();
this.fileWriter.write(annot.getCoveredText());
this.fileWriter.write(System.getProperty("line.separator"));
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineResegmenter.java Sun Nov 23 19:38:25 2014
@@ -24,7 +24,6 @@ import java.util.Iterator;
import org.apache.uima.analysis_component.JCasMultiplier_ImplBase;
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.AbstractCas;
-import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.examples.SourceDocumentInformation;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/NewlineSegmenter.java Sun Nov 23 19:38:25 2014
@@ -62,7 +62,7 @@ public class NewlineSegmenter extends Ca
*/
public AbstractCas next() throws AnalysisEngineProcessException {
String nextSeg = mStringTok.nextToken();
- CAS cas = (CAS) getContext().getEmptyCas(CAS.class);
+ CAS cas = getContext().getEmptyCas(CAS.class);
cas.getCurrentView().setDocumentText(nextSeg);
casAvailable = false;
return cas;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/analysis_engine/impl/TabSegmenter.java Sun Nov 23 19:38:25 2014
@@ -56,7 +56,7 @@ public class TabSegmenter extends CasMul
*/
public AbstractCas next() throws AnalysisEngineProcessException {
String nextSeg = mStringTok.nextToken();
- CAS cas = (CAS) getContext().getEmptyCas(CAS.class);
+ CAS cas = getContext().getEmptyCas(CAS.class);
cas.getCurrentView().setDocumentText(nextSeg);
return cas;
}
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/CasTypeSystemMapperTst.java Sun Nov 23 19:38:25 2014
@@ -18,8 +18,6 @@
*/
package org.apache.uima.cas.impl;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.util.BitSet;
import junit.framework.TestCase;
@@ -33,8 +31,6 @@ import org.apache.uima.cas.admin.TypeSys
import org.apache.uima.cas.test.AnnotatorInitializer;
import org.apache.uima.cas.test.CASInitializer;
import org.apache.uima.resource.ResourceInitializationException;
-import org.apache.uima.resource.metadata.TypeSystemDescription;
-import org.apache.uima.util.CasCreationUtils;
public class CasTypeSystemMapperTst extends TestCase {
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/FSBagIndexTest.java Sun Nov 23 19:38:25 2014
@@ -22,11 +22,11 @@ package org.apache.uima.cas.impl;
import java.io.File;
import java.util.Arrays;
+import junit.framework.TestCase;
+
import org.apache.uima.UIMAFramework;
-import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FSIndex;
import org.apache.uima.cas.TypeSystem;
-import org.apache.uima.impl.UIMAFramework_impl;
import org.apache.uima.internal.util.IntPointerIterator;
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.TypeSystemDescription;
@@ -35,8 +35,6 @@ import org.apache.uima.test.junit_extens
import org.apache.uima.util.CasCreationUtils;
import org.apache.uima.util.XMLInputSource;
-import junit.framework.TestCase;
-
public class FSBagIndexTest extends TestCase {
private TypeSystemDescription typeSystemDescription;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest4.java Sun Nov 23 19:38:25 2014
@@ -28,9 +28,7 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
-import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
-import java.nio.CharBuffer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -699,7 +697,7 @@ public class SerDesTest4 extends TestCas
fs = newAkof(fsl);
fs.setBooleanValue(akofBoolean, false);
fs.setByteValue(akofByte, Byte.MAX_VALUE);
- fs.setShortValue(akofShort, (short) Short.MAX_VALUE);
+ fs.setShortValue(akofShort, Short.MAX_VALUE);
fs.setIntValue(akofInt, Integer.MAX_VALUE);
fs.setFloatValue(akofFloat, Float.MAX_VALUE);
fs.setLongValue(akofLong, Long.MAX_VALUE);
@@ -710,7 +708,7 @@ public class SerDesTest4 extends TestCas
fs = newAkof(fsl);
fs.setByteValue(akofByte, Byte.MIN_VALUE);
- fs.setShortValue(akofShort, (short) Short.MIN_VALUE);
+ fs.setShortValue(akofShort, Short.MIN_VALUE);
fs.setIntValue(akofInt, Integer.MIN_VALUE);
fs.setFloatValue(akofFloat, Float.MIN_VALUE);
fs.setLongValue(akofLong, Long.MIN_VALUE);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/SerDesTest6.java Sun Nov 23 19:38:25 2014
@@ -1066,7 +1066,7 @@ public class SerDesTest6 extends TestCas
/* lfs index: 2 */
fs = newAkof(cas, m, typeKind, lfs);
maybeSetByte(fs, m, Byte.MIN_VALUE);
- maybeSetShort(fs, m, (short) Short.MIN_VALUE);
+ maybeSetShort(fs, m, Short.MIN_VALUE);
maybeSetInt(fs, m, Integer.MIN_VALUE);
maybeSetFloat(fs, m, Float.MIN_VALUE);
maybeSetLong(fs, m, Long.MIN_VALUE);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XCASDeserializerTest.java Sun Nov 23 19:38:25 2014
@@ -35,15 +35,12 @@ import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.FSIndex;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.IntArrayFS;
import org.apache.uima.cas.StringArrayFS;
import org.apache.uima.cas.Type;
-import org.apache.uima.cas.text.AnnotationFS;
-import org.apache.uima.jcas.cas.TOP;
import org.apache.uima.resource.metadata.FsIndexDescription;
import org.apache.uima.resource.metadata.TypeSystemDescription;
import org.apache.uima.resource.metadata.impl.TypePriorities_impl;
@@ -266,7 +263,7 @@ public class XCASDeserializerTest extend
// the view it is created in. https://issues.apache.org/jira/browse/UIMA-4099
// create a TOP and add to index of both views
Type topType = cas.getTypeSystem().getTopType();
- FeatureStructure aTOP = (FeatureStructure) cas.createFS(topType);
+ FeatureStructure aTOP = cas.createFS(topType);
cas.getIndexRepository().addFS(aTOP);
cas2.getIndexRepository().addFS(aTOP);
FSIterator<FeatureStructure> it = cas.getIndexRepository().getAllIndexedFS(topType);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/impl/XmiCasDeserializerTest.java Sun Nov 23 19:38:25 2014
@@ -31,7 +31,6 @@ import java.io.StringReader;
import java.io.StringWriter;
import java.util.Iterator;
import java.util.List;
-import java.util.Stack;
import javax.xml.parsers.FactoryConfigurationError;
import javax.xml.parsers.ParserConfigurationException;
@@ -54,7 +53,6 @@ import org.apache.uima.cas.Marker;
import org.apache.uima.cas.StringArrayFS;
import org.apache.uima.cas.Type;
import org.apache.uima.cas.TypeSystem;
-import org.apache.uima.cas.impl.XmiCasSerializer.XmiDocSerializer;
import org.apache.uima.cas.impl.XmiSerializationSharedData.OotsElementData;
import org.apache.uima.cas.impl.XmiSerializationSharedData.XmiArrayElement;
import org.apache.uima.cas.text.AnnotationFS;
@@ -72,12 +70,10 @@ import org.apache.uima.util.CasCreationU
import org.apache.uima.util.FileUtils;
import org.apache.uima.util.XMLInputSource;
import org.apache.uima.util.XMLSerializer;
-import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
public class XmiCasDeserializerTest extends TestCase {
@@ -493,7 +489,7 @@ public class XmiCasDeserializerTest exte
// the view it is created in. https://issues.apache.org/jira/browse/UIMA-4099
// create a TOP and add to index of both views
Type topType = cas.getTypeSystem().getTopType();
- FeatureStructure aTOP = (FeatureStructure) cas.createFS(topType);
+ FeatureStructure aTOP = cas.createFS(topType);
cas.getIndexRepository().addFS(aTOP);
cas2.getIndexRepository().addFS(aTOP);
FSIterator<FeatureStructure> it = cas.getIndexRepository().getAllIndexedFS(topType);
@@ -817,7 +813,7 @@ public class XmiCasDeserializerTest exte
//to test links across merge boundary
Type orgType = newCas2.getTypeSystem().getType(
"org.apache.uima.testTypeSystem.Organization");
- AnnotationFS org = (AnnotationFS)newCas2.getAnnotationIndex(orgType).iterator().next();
+ AnnotationFS org = newCas2.getAnnotationIndex(orgType).iterator().next();
Type ownerType = newCas2.getTypeSystem().getType(
"org.apache.uima.testTypeSystem.Owner");
Feature argsFeat = ownerType.getFeatureByBaseName("relationArgs");
@@ -914,11 +910,9 @@ public class XmiCasDeserializerTest exte
assertEquals(sofaText1, targetView1.getDocumentText());
CAS targetView2 = cas.getView("newSofa2");
assertEquals(sofaText2, targetView2.getDocumentText());
- AnnotationFS targetAnnot1 = (AnnotationFS)
- targetView1.getAnnotationIndex(orgType).iterator().get();
+ AnnotationFS targetAnnot1 = targetView1.getAnnotationIndex(orgType).iterator().get();
assertEquals(annotText, targetAnnot1.getCoveredText());
- AnnotationFS targetAnnot2 = (AnnotationFS)
- targetView2.getAnnotationIndex(orgType).iterator().get();
+ AnnotationFS targetAnnot2 = targetView2.getAnnotationIndex(orgType).iterator().get();
assertEquals(annotText, targetAnnot2.getCoveredText());
assertTrue(targetView1.getSofa().getSofaRef() !=
targetView2.getSofa().getSofaRef());
@@ -926,8 +920,7 @@ public class XmiCasDeserializerTest exte
CAS checkPreexistingView = cas.getView("preexistingView");
assertEquals(preexistingViewText, checkPreexistingView.getDocumentText());
Type personType = cas.getTypeSystem().getType("org.apache.uima.testTypeSystem.Person");
- AnnotationFS targetAnnot3 = (AnnotationFS)
- checkPreexistingView.getAnnotationIndex(personType).iterator().get();
+ AnnotationFS targetAnnot3 = checkPreexistingView.getAnnotationIndex(personType).iterator().get();
assertEquals("John Smith", targetAnnot3.getCoveredText());
// Check the FS with an array of pre-existing FSs
@@ -1003,7 +996,7 @@ public class XmiCasDeserializerTest exte
//check language feature of doc annot is not changed.
//System.out.println(cas1.getDocumentAnnotation().getStringValue(languageF));
- assertTrue( ((FeatureStructure) cas1.getAnnotationIndex().iterator().next()).getStringValue(languageF).equals("x-unspecified"));
+ assertTrue( cas1.getAnnotationIndex().iterator().next().getStringValue(languageF).equals("x-unspecified"));
//check new annotation exists and preexisting is not deleted
assertTrue(cas1.getAnnotationIndex().size()==4);
} catch (Exception e) {
@@ -1063,7 +1056,7 @@ public class XmiCasDeserializerTest exte
//check language feature of doc annot is not changed.
//System.out.println(cas1.getDocumentAnnotation().getStringValue(languageF));
- assertTrue( ((FeatureStructure) cas1.getAnnotationIndex().iterator().next()).getStringValue(languageF).equals("x-unspecified"));
+ assertTrue( cas1.getAnnotationIndex().iterator().next().getStringValue(languageF).equals("x-unspecified"));
//check new annotation exists
assertTrue(cas1.getAnnotationIndex().size() == 3); // cas2 should be unchanged.
} catch (Exception e) {
@@ -1387,7 +1380,7 @@ public class XmiCasDeserializerTest exte
//Test modification of a nonshared multivalued feature.
//This should serialize the encompassing FS.
Iterator<FeatureStructure> iter = cas2.getIndexRepository().getIndex("testEntityIndex").iterator();
- FeatureStructure cas2EntityFS = (FeatureStructure) iter.next();
+ FeatureStructure cas2EntityFS = iter.next();
StringArrayFS cas2strarrayFS = (StringArrayFS) cas2EntityFS.getFeatureValue(classesFeat);
cas2strarrayFS.set(1, "class2");
cas2strarrayFS.set(2, "class3");
@@ -1593,14 +1586,13 @@ public class XmiCasDeserializerTest exte
assertEquals(1,sharedData2.getOutOfTypeSystemElements().size());
OotsElementData ootsFeats3 = sharedData2.getOutOfTypeSystemFeatures(sharedData2.getFsAddrForXmiId(3));
assertEquals(1, ootsFeats3.attributes.size());
- XmlAttribute ootsAttr = (XmlAttribute)ootsFeats3.attributes.get(0);
+ XmlAttribute ootsAttr = ootsFeats3.attributes.get(0);
assertEquals("mentionType", ootsAttr.name);
assertEquals("NAME", ootsAttr.value);
OotsElementData ootsFeats5 = sharedData2.getOutOfTypeSystemFeatures(sharedData2.getFsAddrForXmiId(5));
assertEquals(0, ootsFeats5.attributes.size());
assertEquals(1, ootsFeats5.childElements.size());
- XmlElementNameAndContents ootsChildElem = (XmlElementNameAndContents)
- ootsFeats5.childElements.get(0);
+ XmlElementNameAndContents ootsChildElem = ootsFeats5.childElements.get(0);
assertEquals("mentionType", ootsChildElem.name.qName);
assertEquals("NAME", ootsChildElem.contents);
@@ -1728,7 +1720,7 @@ public class XmiCasDeserializerTest exte
List ootsElems = sharedData.getOutOfTypeSystemElements();
assertEquals(2, ootsElems.size());
OotsElementData oed = sharedData.getOutOfTypeSystemFeatures(listFs.hashCode());
- XmlAttribute attr = (XmlAttribute)oed.attributes.get(0);
+ XmlAttribute attr = oed.attributes.get(0);
assertNotNull(attr);
assertEquals(CAS.FEATURE_BASE_NAME_HEAD, attr.name);
assertEquals(attr.value, ((OotsElementData)ootsElems.get(0)).xmiId);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/AnnotationIteratorTest.java Sun Nov 23 19:38:25 2014
@@ -240,7 +240,7 @@ public class AnnotationIteratorTest exte
++count;
}
assertTrue(count == 4);
- AnnotationFS sent = (AnnotationFS) this.cas.getAnnotationIndex(this.sentenceType).iterator().get();
+ AnnotationFS sent = this.cas.getAnnotationIndex(this.sentenceType).iterator().get();
it = annotIndex.subiterator(sent, false, true);
count = 0;
while (it.isValid()) {
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/FilteredIteratorTest.java Sun Nov 23 19:38:25 2014
@@ -174,7 +174,7 @@ public class FilteredIteratorTest extend
// do iteration
while (it.isValid()) {
- AnnotationFS a = (AnnotationFS) it.get();
+ AnnotationFS a = it.get();
assertTrue(a.getType().equals(tokenType));
// System.out.println("Annotation type: " + a.getType().getName());
// System.out.println("Covered text: " + a.getCoveredText());
@@ -197,7 +197,7 @@ public class FilteredIteratorTest extend
// do iteration
int countFiltered = 0;
while (it.isValid()) {
- AnnotationFS a = (AnnotationFS) it.get();
+ AnnotationFS a = it.get();
assertTrue(ts.subsumes(annotationType, a.getType()));
// System.out.println("Annotation type: " + a.getType().getName());
// System.out.println("Covered text: " + a.getCoveredText());
@@ -236,7 +236,7 @@ public class FilteredIteratorTest extend
// do iteration
while (it.isValid()) {
- AnnotationFS a = (AnnotationFS) it.get();
+ AnnotationFS a = it.get();
assertTrue(a.getType().equals(tokenType));
// System.out.println("Annotation type: " + a.getType().getName());
// System.out.println("Covered text: " + a.getCoveredText());
@@ -331,7 +331,7 @@ public class FilteredIteratorTest extend
int theCount = 0;
// Iterate over the tokens.
for (tokenIt.moveToFirst(); tokenIt.isValid(); tokenIt.moveToNext()) {
- AnnotationFS tok = (AnnotationFS) tokenIt.get();
+ AnnotationFS tok = tokenIt.get();
if (tok.getStringValue(lemmaFeat).equals(lemma)) {
++theCount;
// System.out.println("Found token: " + tok.getCoveredText());
@@ -402,7 +402,7 @@ public class FilteredIteratorTest extend
int theCount = 0;
// Iterate over the tokens.
for (tokenIt.moveToFirst(); tokenIt.isValid(); tokenIt.moveToNext()) {
- AnnotationFS tok = (AnnotationFS) tokenIt.get();
+ AnnotationFS tok = tokenIt.get();
if (tok.getStringValue(lemmaFeat).equals(lemma)) {
++theCount;
// System.out.println("Found token: " + tok.getCoveredText());
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/IteratorTest.java Sun Nov 23 19:38:25 2014
@@ -655,8 +655,8 @@ public class IteratorTest extends TestCa
// System.out.println("Iteration: " + i);
it2.moveToFirst();
it2.moveTo(list.get(i));
- assertTrue(((AnnotationFS) it2.get()).getBegin() == ((AnnotationFS) list.get(i)).getBegin());
- assertTrue(((AnnotationFS) it2.get()).getEnd() == ((AnnotationFS) list.get(i)).getEnd());
+ assertTrue(it2.get().getBegin() == list.get(i).getBegin());
+ assertTrue(it2.get().getEnd() == list.get(i).getEnd());
}
// Check that reverse iterator produces reverse sequence.
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/NewPrimitiveTypesTest.java Sun Nov 23 19:38:25 2014
@@ -392,7 +392,7 @@ public class NewPrimitiveTypesTest exten
assertTrue(fs.getStringValue(stringFeature).equals("aaaaaaa"));
assertTrue(fs.getFloatValue(floatFeature) == (float) 99.99);
assertTrue(fs.getByteValue(byteFeature) == (byte) 'z');
- assertTrue(fs.getBooleanValue(booleanFeature) == true);
+ assertTrue(fs.getBooleanValue(booleanFeature));
assertTrue(fs.getShortValue(shortFeature) == Short.MIN_VALUE);
assertTrue(fs.getLongValue(longFeature) == Long.MIN_VALUE);
assertTrue(fs.getDoubleValue(doubleFeature) == Double.MAX_VALUE);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence.java Sun Nov 23 19:38:25 2014
@@ -22,10 +22,9 @@
/* First created by JCasGen Thu Jun 21 11:28:13 MDT 2007 */
package org.apache.uima.cas.test;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.cas.TOP_Type;
-
import org.apache.uima.jcas.tcas.Annotation;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Sentence_Type.java Sun Nov 23 19:38:25 2014
@@ -21,13 +21,13 @@
/* First created by JCasGen Thu Jun 21 11:28:13 MDT 2007 */
package org.apache.uima.cas.test;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.Type;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.tcas.Annotation_Type;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationNoMDTest.java Sun Nov 23 19:38:25 2014
@@ -319,7 +319,7 @@ public class SerializationNoMDTest exten
FSIterator<AnnotationFS> it = sentenceIndex.iterator();
AnnotationFS sentFS;
if (it.isValid()) {
- sentFS = (AnnotationFS) it.get();
+ sentFS = it.get();
assertTrue(sentFS.getCoveredText() != null);
}
// int counter = 0;
@@ -431,7 +431,7 @@ public class SerializationNoMDTest exten
for (int i = 0; i < numDocs && docCount < max; i++) {
// System.out.println("Processing document: " + i);
// Set document text in first CAS.
- cas.setDocumentText((String) docs.get(i));
+ cas.setDocumentText(docs.get(i));
tokenize();
numTok = cas.getAnnotationIndex(tokenType).size();
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SerializationReinitTest.java Sun Nov 23 19:38:25 2014
@@ -460,7 +460,7 @@ public class SerializationReinitTest ext
for (int i = 0; i < numDocs && docCount < max; i++) {
// System.out.println("Processing document: " + i);
// Set document text in first CAS.
- cas.setDocumentText((String) docs.get(i));
+ cas.setDocumentText(docs.get(i));
tokenize();
numTok = cas.getAnnotationIndex(tokenType).size();
@@ -550,7 +550,7 @@ public class SerializationReinitTest ext
for (int i = 0; i < numDocs && docCount < max; i++) {
// System.out.println("Processing document: " + i);
// Set document text in first CAS.
- cas.setDocumentText((String) docs.get(i));
+ cas.setDocumentText(docs.get(i));
tokenize();
numTok = cas.getAnnotationIndex(tokenType).size();
@@ -846,8 +846,8 @@ public class SerializationReinitTest ext
//modify FS - string feature and FS feature.
Iterator<AnnotationFS> personIter = cas2personIndex.iterator();
- AnnotationFS cas2person1 = (AnnotationFS) personIter.next();
- AnnotationFS cas2person2 = (AnnotationFS) personIter.next();
+ AnnotationFS cas2person1 = personIter.next();
+ AnnotationFS cas2person2 = personIter.next();
cas2person1.setFloatValue(confidenceFeat, (float) 99.99);
cas2person1.setStringValue(mentionTypeFeat, "FULLNAME");
@@ -856,12 +856,12 @@ public class SerializationReinitTest ext
cas2person2.setStringValue(mentionTypeFeat, "FIRSTNAME");
Iterator<AnnotationFS> orgIter = cas2orgIndex.iterator();
- AnnotationFS cas2orgAnnot = (AnnotationFS) orgIter.next();
+ AnnotationFS cas2orgAnnot = orgIter.next();
cas2orgAnnot.setStringValue(mentionTypeFeat, "ORGNAME");
//modify FS feature
Iterator<AnnotationFS> ownerIter = cas2ownerIndex.iterator();
- AnnotationFS cas2ownerAnnot = (AnnotationFS) ownerIter.next();
+ AnnotationFS cas2ownerAnnot = ownerIter.next();
FeatureStructure cas2relArgs = cas2ownerAnnot.getFeatureValue(argsFeat);
cas2relArgs.setFeatureValue(rangeFeat, cas2orgAnnot);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SofaTest.java Sun Nov 23 19:38:25 2014
@@ -315,9 +315,9 @@ public class SofaTest extends TestCase {
engIt.moveToNext();
gerIt.moveToNext();
frIt.moveToNext();
- engAnnot = (AnnotationFS) engIt.get();
- gerAnnot = (AnnotationFS) gerIt.get();
- frAnnot = (AnnotationFS) frIt.get();
+ engAnnot = engIt.get();
+ gerAnnot = gerIt.get();
+ frAnnot = frIt.get();
assertTrue(annotationType.getName().equals(engAnnot.getType().getName()));
assertTrue(("this").equals(engAnnot.getCoveredText()));
assertTrue(annotationType.getName().equals(frAnnot.getType().getName()));
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/SubiteratorTest.java Sun Nov 23 19:38:25 2014
@@ -29,7 +29,6 @@ import org.apache.uima.analysis_engine.A
import org.apache.uima.analysis_engine.AnalysisEngineProcessException;
import org.apache.uima.cas.FSIterator;
import org.apache.uima.cas.impl.UnambiguousIteratorImpl;
-import org.apache.uima.cas.text.AnnotationFS;
import org.apache.uima.cas.text.AnnotationIndex;
import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.tcas.Annotation;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token.java Sun Nov 23 19:38:25 2014
@@ -22,10 +22,9 @@
/* First created by JCasGen Thu Jun 21 11:28:13 MDT 2007 */
package org.apache.uima.cas.test;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.cas.TOP_Type;
-
import org.apache.uima.jcas.tcas.Annotation;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas/test/Token_Type.java Sun Nov 23 19:38:25 2014
@@ -21,13 +21,13 @@
/* First created by JCasGen Thu Jun 21 11:28:13 MDT 2007 */
package org.apache.uima.cas.test;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
+import org.apache.uima.cas.FeatureStructure;
+import org.apache.uima.cas.Type;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.cas.impl.FSGenerator;
-import org.apache.uima.cas.FeatureStructure;
import org.apache.uima.cas.impl.TypeImpl;
-import org.apache.uima.cas.Type;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.tcas.Annotation_Type;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/CasComparer.java Sun Nov 23 19:38:25 2014
@@ -59,7 +59,7 @@ public class CasComparer {
FSIterator<SofaFS> sofaIter = c1.getSofaIterator();
int c1Sofas = 0;
while (sofaIter.hasNext()) {
- SofaFS sofa = (SofaFS) sofaIter.next();
+ SofaFS sofa = sofaIter.next();
CAS tcas1 = c1.getView(sofa);
CAS tcas2 = c2.getView(tcas1.getViewName());
assertEqualViews(tcas1, tcas2);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/cas_data/impl/XCasToCasDataSaxHandlerTest.java Sun Nov 23 19:38:25 2014
@@ -203,8 +203,7 @@ public class XCasToCasDataSaxHandlerTest
Type arrayType = typeSystem.getType(CAS.TYPE_NAME_ARRAY_BASE);
Iterator<FeatureStructure> fsIter = casData.getFeatureStructures();
while (fsIter.hasNext()) {
- org.apache.uima.cas_data.FeatureStructure fs = (org.apache.uima.cas_data.FeatureStructure) fsIter
- .next();
+ org.apache.uima.cas_data.FeatureStructure fs = fsIter.next();
String typeName = fs.getType();
// don't do tests on the "fake" document text FS
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/impl/UimaContext_implTest.java Sun Nov 23 19:38:25 2014
@@ -870,11 +870,11 @@ public class UimaContext_implTest extend
public void testGetEmptyCas() throws Exception {
try {
- CAS emptyCas = (CAS)mContext5.getEmptyCas(CAS.class);
+ CAS emptyCas = mContext5.getEmptyCas(CAS.class);
//should be allowed to release this CAS
emptyCas.release();
//and then get it again
- emptyCas = (CAS)mContext5.getEmptyCas(CAS.class);
+ emptyCas = mContext5.getEmptyCas(CAS.class);
emptyCas.release();
} catch (Exception e) {
JUnitExtension.handleException(e);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntHashMapTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntHashMapTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntHashMapTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntHashMapTest.java Sun Nov 23 19:38:25 2014
@@ -26,10 +26,6 @@ import java.util.Set;
import junit.framework.TestCase;
-import org.apache.uima.internal.util.Int2IntHashMap;
-import org.apache.uima.internal.util.IntKeyValueIterator;
-import org.apache.uima.internal.util.IntListIterator;
-
public class Int2IntHashMapTest extends TestCase {
public void testIterator() {
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntPerfTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntPerfTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntPerfTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/Int2IntPerfTest.java Sun Nov 23 19:38:25 2014
@@ -19,15 +19,12 @@
package org.apache.uima.internal.util;
-import java.util.HashSet;
import java.util.Random;
-import java.util.Set;
-
-import org.apache.uima.internal.util.Int2IntHashMap;
-import org.apache.uima.internal.util.rb_trees.Int2IntRBT;
import junit.framework.TestCase;
+import org.apache.uima.internal.util.rb_trees.Int2IntRBT;
+
public class Int2IntPerfTest extends TestCase {
/**
* Set to false to run the performance test
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/IntHashSetPerfTest.java Sun Nov 23 19:38:25 2014
@@ -21,12 +21,10 @@ package org.apache.uima.internal.util;
import java.util.Random;
-import org.apache.uima.internal.util.IntBitSet;
-import org.apache.uima.internal.util.IntHashSet;
-import org.apache.uima.internal.util.rb_trees.IntArrayRBT;
-
import junit.framework.TestCase;
+import org.apache.uima.internal.util.rb_trees.IntArrayRBT;
+
public class IntHashSetPerfTest extends TestCase {
/**
* Set to false to run the performance test
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/MultiThreadUtils.java Sun Nov 23 19:38:25 2014
@@ -18,8 +18,6 @@
*/
package org.apache.uima.internal.util;
-import java.util.Random;
-
import junit.framework.TestCase;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/PositiveIntSetTest.java Sun Nov 23 19:38:25 2014
@@ -22,10 +22,6 @@ package org.apache.uima.internal.util;
import java.util.Arrays;
import java.util.Random;
-import org.apache.uima.internal.util.IntBitSet;
-import org.apache.uima.internal.util.IntHashSet;
-import org.apache.uima.internal.util.rb_trees.IntArrayRBT;
-
import junit.framework.TestCase;
public class PositiveIntSetTest extends TestCase {
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/Int2IntRBTtest.java Sun Nov 23 19:38:25 2014
@@ -19,18 +19,15 @@
package org.apache.uima.internal.util.rb_trees;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
-import java.util.List;
import java.util.Random;
import java.util.Set;
+import junit.framework.TestCase;
+
import org.apache.uima.internal.util.IntKeyValueIterator;
import org.apache.uima.internal.util.IntListIterator;
-import org.apache.uima.internal.util.IntPointerIterator;
-
-import junit.framework.TestCase;
public class Int2IntRBTtest extends TestCase {
public void testIterator() {
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/internal/util/rb_trees/IntArrayRBTtest.java Sun Nov 23 19:38:25 2014
@@ -19,16 +19,14 @@
package org.apache.uima.internal.util.rb_trees;
-import java.util.ArrayList;
import java.util.Arrays;
-import java.util.List;
import java.util.Random;
+import junit.framework.TestCase;
+
import org.apache.uima.internal.util.IntListIterator;
import org.apache.uima.internal.util.IntPointerIterator;
-import junit.framework.TestCase;
-
public class IntArrayRBTtest extends TestCase {
public void testIterator() {
IntArrayRBT ia = new IntArrayRBT();
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/pear/util/TestPearInstallationVerification.java Sun Nov 23 19:38:25 2014
@@ -24,10 +24,10 @@ import java.io.File;
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.apache.uima.pear.tools.InstallationController.TestStatus;
import org.apache.uima.pear.tools.InstallationTester;
import org.apache.uima.pear.tools.PackageBrowser;
import org.apache.uima.pear.tools.PackageInstaller;
-import org.apache.uima.pear.tools.InstallationController.TestStatus;
import org.apache.uima.test.junit_extension.JUnitExtension;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/CasManager_implTest.java Sun Nov 23 19:38:25 2014
@@ -22,7 +22,6 @@ import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
import org.apache.uima.cas.CAS;
-import org.apache.uima.cas.admin.CASAdminException;
import org.apache.uima.cas.impl.CASImpl;
import org.apache.uima.resource.CasManager;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/impl/PearSpecifier_implTest.java Sun Nov 23 19:38:25 2014
@@ -18,6 +18,8 @@
*/
package org.apache.uima.resource.impl;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
+
import java.io.ByteArrayInputStream;
import java.io.StringWriter;
@@ -30,8 +32,6 @@ import org.apache.uima.resource.PearSpec
import org.apache.uima.test.junit_extension.JUnitExtension;
import org.apache.uima.util.XMLInputSource;
-import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
-
/**
* PearSpecifier creation and Xmlization test
*/
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/resource/metadata/impl/Import_implTest.java Sun Nov 23 19:38:25 2014
@@ -19,6 +19,8 @@
package org.apache.uima.resource.metadata.impl;
+import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
+
import java.io.ByteArrayInputStream;
import java.io.File;
import java.net.URL;
@@ -36,8 +38,6 @@ import org.apache.uima.util.InvalidXMLEx
import org.apache.uima.util.XMLInputSource;
import org.w3c.dom.Document;
-import static org.apache.uima.analysis_engine.impl.AnalysisEngineDescription_implTest.encoding;
-
public class Import_implTest extends TestCase {
/**
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts.java Sun Nov 23 19:38:25 2014
@@ -21,11 +21,10 @@
/* First created by JCasGen Wed May 23 14:54:19 EDT 2012 */
package org.apache.uima.testTypeSystem_arrays;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
import org.apache.uima.jcas.cas.ShortArray;
+import org.apache.uima.jcas.cas.TOP_Type;
import org.apache.uima.jcas.tcas.Annotation;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts_Type.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfShorts_Type.java Sun Nov 23 19:38:25 2014
@@ -20,15 +20,15 @@
/* First created by JCasGen Wed May 23 14:54:19 EDT 2012 */
package org.apache.uima.testTypeSystem_arrays;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.tcas.Annotation_Type;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings.java Sun Nov 23 19:38:25 2014
@@ -21,11 +21,10 @@
/* First created by JCasGen Wed May 23 14:54:19 EDT 2012 */
package org.apache.uima.testTypeSystem_arrays;
-import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCas;
import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.jcas.cas.TOP_Type;
-
import org.apache.uima.jcas.cas.StringArray;
+import org.apache.uima.jcas.cas.TOP_Type;
import org.apache.uima.jcas.tcas.Annotation;
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings_Type.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings_Type.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings_Type.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/testTypeSystem_arrays/OfStrings_Type.java Sun Nov 23 19:38:25 2014
@@ -20,15 +20,15 @@
/* First created by JCasGen Wed May 23 14:54:19 EDT 2012 */
package org.apache.uima.testTypeSystem_arrays;
-import org.apache.uima.jcas.JCas;
-import org.apache.uima.jcas.JCasRegistry;
-import org.apache.uima.cas.impl.CASImpl;
-import org.apache.uima.cas.impl.FSGenerator;
+import org.apache.uima.cas.Feature;
import org.apache.uima.cas.FeatureStructure;
-import org.apache.uima.cas.impl.TypeImpl;
import org.apache.uima.cas.Type;
+import org.apache.uima.cas.impl.CASImpl;
+import org.apache.uima.cas.impl.FSGenerator;
import org.apache.uima.cas.impl.FeatureImpl;
-import org.apache.uima.cas.Feature;
+import org.apache.uima.cas.impl.TypeImpl;
+import org.apache.uima.jcas.JCas;
+import org.apache.uima.jcas.JCasRegistry;
import org.apache.uima.jcas.tcas.Annotation_Type;
/**
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/CasCopierTest.java Sun Nov 23 19:38:25 2014
@@ -28,7 +28,6 @@ import java.util.Iterator;
import junit.framework.TestCase;
import org.apache.uima.UIMAFramework;
-import org.apache.uima.UIMARuntimeException;
import org.apache.uima.cas.ArrayFS;
import org.apache.uima.cas.CAS;
import org.apache.uima.cas.FeatureStructure;
@@ -247,14 +246,14 @@ public class CasCopierTest extends TestC
// copy an Annotation
Iterator<AnnotationFS> annotIter = srcCas.getAnnotationIndex().iterator();
- FeatureStructure annot = (FeatureStructure) annotIter.next();
+ FeatureStructure annot = annotIter.next();
FeatureStructure copy = copier.copyFs(annot);
// verify copy
CasComparer.assertEquals(annot, copy);
// copy a Relation (which will have references)
Iterator<FeatureStructure> relationIter = srcCas.getIndexRepository().getIndex("testRelationIndex").iterator();
- FeatureStructure relFS = (FeatureStructure) relationIter.next();
+ FeatureStructure relFS = relationIter.next();
FeatureStructure relCopy = copier.copyFs(relFS);
// verify copy
CasComparer.assertEquals(relFS, relCopy);
@@ -273,7 +272,7 @@ public class CasCopierTest extends TestC
copier = new CasCopier(((CASImpl)srcCas).getBaseCAS(), ((CASImpl)destCas).getBaseCAS());
annotIter = srcCas.getAnnotationIndex().iterator();
- annot = (FeatureStructure) annotIter.next();
+ annot = annotIter.next();
copy = copier.copyFs(annot);
// verify copy
CasComparer.assertEquals(annot, copy);
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/ProcessTrace_implTest.java Sun Nov 23 19:38:25 2014
@@ -76,13 +76,13 @@ public class ProcessTrace_implTest exten
// verify contents of the ProcessTrace
List<ProcessTraceEvent> evts = pt.getEvents();
- ProcessTraceEvent evt0 = (ProcessTraceEvent) evts.get(0);
+ ProcessTraceEvent evt0 = evts.get(0);
Assert.assertEquals("c1", evt0.getComponentName());
Assert.assertEquals("t1", evt0.getType());
Assert.assertEquals("testing", evt0.getDescription());
Assert.assertEquals("success", evt0.getResultMessage());
List<ProcessTraceEvent> subEvts = evt0.getSubEvents();
- ProcessTraceEvent subEvt0 = (ProcessTraceEvent) subEvts.get(0);
+ ProcessTraceEvent subEvt0 = subEvts.get(0);
Assert.assertEquals("c1", subEvt0.getComponentName());
Assert.assertEquals("t2", subEvt0.getType());
Assert.assertEquals("testing", subEvt0.getDescription());
@@ -116,7 +116,7 @@ public class ProcessTrace_implTest exten
// should be 2 events on list
Assert.assertEquals(2, pt.getEvents().size());
// 2nd event should have a sub-event
- ProcessTraceEvent evt = (ProcessTraceEvent) pt.getEvents().get(1);
+ ProcessTraceEvent evt = pt.getEvents().get(1);
Assert.assertEquals(1, evt.getSubEvents().size());
}
@@ -141,25 +141,25 @@ public class ProcessTrace_implTest exten
// get top-level events for component c1
List<ProcessTraceEvent> c1evts = pt.getEventsByComponentName("c1", false);
Assert.assertEquals(1, c1evts.size());
- ProcessTraceEvent evt = (ProcessTraceEvent) c1evts.get(0);
+ ProcessTraceEvent evt = c1evts.get(0);
Assert.assertEquals(evt.getType(), "t1");
// get all events for component c1
c1evts = pt.getEventsByComponentName("c1", true);
Assert.assertEquals(2, c1evts.size());
- evt = (ProcessTraceEvent) c1evts.get(1);
+ evt = c1evts.get(1);
Assert.assertEquals(evt.getType(), "t2");
// get top-level events for component c2
List<ProcessTraceEvent> c2evts = pt.getEventsByComponentName("c2", false);
Assert.assertEquals(1, c2evts.size());
- evt = (ProcessTraceEvent) c2evts.get(0);
+ evt = c2evts.get(0);
Assert.assertEquals(evt.getType(), "t1");
// get all events for component c2
c2evts = pt.getEventsByComponentName("c2", true);
Assert.assertEquals(4, c2evts.size());
- evt = (ProcessTraceEvent) c2evts.get(3);
+ evt = c2evts.get(3);
Assert.assertEquals(evt.getType(), "t4");
}
@@ -184,15 +184,15 @@ public class ProcessTrace_implTest exten
// get top-level events of type t1
List<ProcessTraceEvent> t1evts = pt.getEventsByType("t1", false);
Assert.assertEquals(2, t1evts.size());
- ProcessTraceEvent evt = (ProcessTraceEvent) t1evts.get(0);
+ ProcessTraceEvent evt = t1evts.get(0);
Assert.assertEquals(evt.getComponentName(), "c1");
- evt = (ProcessTraceEvent) t1evts.get(1);
+ evt = t1evts.get(1);
Assert.assertEquals(evt.getComponentName(), "c2");
// get all events for type t1
t1evts = pt.getEventsByType("t1", true);
Assert.assertEquals(3, t1evts.size());
- evt = (ProcessTraceEvent) t1evts.get(2);
+ evt = t1evts.get(2);
Assert.assertEquals(evt.getComponentName(), "c3");
}
@@ -237,9 +237,9 @@ public class ProcessTrace_implTest exten
pt2.addEvent("c1", "t1", "testing", 250, "success");
pt1.aggregate(pt2);
- ProcessTraceEvent c1evt = (ProcessTraceEvent) pt1.getEvents().get(0);
- ProcessTraceEvent c2evt = (ProcessTraceEvent) pt1.getEvents().get(1);
- ProcessTraceEvent c2subEvt = (ProcessTraceEvent) c2evt.getSubEvents().get(0);
+ ProcessTraceEvent c1evt = pt1.getEvents().get(0);
+ ProcessTraceEvent c2evt = pt1.getEvents().get(1);
+ ProcessTraceEvent c2subEvt = c2evt.getSubEvents().get(0);
Assert.assertEquals(1250, c1evt.getDuration());
Assert.assertEquals(1000, c2subEvt.getDuration());
}
Modified: uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java
URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java?rev=1641251&r1=1641250&r2=1641251&view=diff
==============================================================================
--- uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java (original)
+++ uima/uimaj/trunk/uimaj-core/src/test/java/org/apache/uima/util/impl/TestLog4jLogger_impl.java Sun Nov 23 19:38:25 2014
@@ -92,7 +92,7 @@ public class TestLog4jLogger_impl extend
String key = log4jLogger.getLevel().toString();
- Level defaultLogLevel = (Level) logLevels.get(key);
+ Level defaultLogLevel = logLevels.get(key);
assertNotNull(defaultLogLevel);
// check message logging for root logger based on default log level