You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/11/11 21:40:50 UTC

svn commit: r1638376 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-container/src: main/java/org/apache/uima/ducc/container/common/ main/java/org/apache/uima/ducc/container/jd/ main/java/org/apache/uima/ducc/container/jd/mh/ main/java/org/apache/uima/duc...

Author: degenaro
Date: Tue Nov 11 20:40:50 2014
New Revision: 1638376

URL: http://svn.apache.org/r1638376
Log:
UIMA-4069 Redesign of JD toward the main goal of classpath separation for container (system) code.

Active WorkItemInfo.

Added:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Util.java   (with props)
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IWorkItemInfo.java   (with props)
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/WorkItemInfo.java   (with props)
Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java?rev=1638376&r1=1638375&r2=1638376&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Standardize.java Tue Nov 11 20:40:50 2014
@@ -23,6 +23,7 @@ public class Standardize {
 	public enum Label {
 		node,
 		pid,
+		tid,
 		crFetches,
 		crTotal,
 		preemptions,
@@ -50,6 +51,7 @@ public class Standardize {
 		killJob,
 		killProcess,
 		killWorkItem,
+		operatingMillis,
 		;
 		
 		Label() {

Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Util.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Util.java?rev=1638376&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Util.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Util.java Tue Nov 11 20:40:50 2014
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.common;
+
+public class Util {
+
+	public static boolean compare(String s0, String s1) {
+		boolean retVal = false;
+		if(s0 != null) {
+			if(s1 != null) {
+				if(s0.equals(s1)) {
+					retVal = true;
+				}
+			}
+		}
+		return retVal;
+	}
+}

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/common/Util.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java?rev=1638376&r1=1638375&r2=1638376&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/JobDriverHelper.java Tue Nov 11 20:40:50 2014
@@ -19,7 +19,6 @@
 package org.apache.uima.ducc.container.jd;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -28,7 +27,9 @@ import org.apache.uima.ducc.container.co
 import org.apache.uima.ducc.container.common.IEntityId;
 import org.apache.uima.ducc.container.common.MessageBuffer;
 import org.apache.uima.ducc.container.common.Standardize;
+import org.apache.uima.ducc.container.jd.mh.iface.IWorkItemInfo;
 import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteWorkerIdentity;
+import org.apache.uima.ducc.container.jd.mh.impl.WorkItemInfo;
 import org.apache.uima.ducc.container.jd.wi.IWorkItem;
 
 public class JobDriverHelper {
@@ -41,31 +42,30 @@ public class JobDriverHelper {
 		return instance;
 	}
 	
-	public HashMap<String,ArrayList<String>> getMapOperating() {
-		String location = "getMapOperating";
-		HashMap<String,ArrayList<String>> mapOperating = new HashMap<String, ArrayList<String>>();
+	public ArrayList<IWorkItemInfo> getActiveWotrkItemInfo() {
+		String location = "getActiveWotrkItemInfo";
+		ArrayList<IWorkItemInfo> list = new ArrayList<IWorkItemInfo>();
 		JobDriver jd = JobDriver.getInstance();
 		ConcurrentHashMap<IRemoteWorkerIdentity, IWorkItem> map = jd.getMap();
 		for(Entry<IRemoteWorkerIdentity, IWorkItem> entry : map.entrySet()) {
 			IRemoteWorkerIdentity rwi = entry.getKey();
-			String node = rwi.getNodeName();
-			String pid = ""+rwi.getPid();
-			ArrayList<String> list = null;
-			if(!mapOperating.containsKey(node)) {
-				list = new ArrayList<String>();
-				mapOperating.put(node,list);
-			}
-			else {
-				list = mapOperating.get(node);
-			}
-			if(!list.contains(pid)) {
-				list.add(pid);
-				MessageBuffer mb = new MessageBuffer();
-				mb.append(Standardize.Label.node.get()+node);
-				mb.append(Standardize.Label.pid.get()+pid);
-				logger.debug(location, IEntityId.null_id, mb);
-			}
+			IWorkItem wi = entry.getValue();
+			IWorkItemInfo wii = new WorkItemInfo();
+			wii.setNodeAddress(rwi.getNodeAddress());
+			wii.setNodeName(rwi.getNodeName());
+			wii.setPid(rwi.getPid());
+			wii.setTid(rwi.getTid());
+			//TODO
+			wii.setSeqNo(0);
+			wii.setOperatingMillis(wi.getMillisOperating());
+			list.add(wii);
+			MessageBuffer mb = new MessageBuffer();
+			mb.append(Standardize.Label.node.get()+wii.getNodeName());
+			mb.append(Standardize.Label.pid.get()+wii.getPid());
+			mb.append(Standardize.Label.tid.get()+wii.getTid());
+			mb.append(Standardize.Label.operatingMillis.get()+wii.getOperatingMillis());
+			logger.debug(location, IEntityId.null_id, mb);
 		}
-		return mapOperating;
+		return list;
 	}
 }

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java?rev=1638376&r1=1638375&r2=1638376&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/Dispatcher.java Tue Nov 11 20:40:50 2014
@@ -81,7 +81,7 @@ public class Dispatcher {
 			oi.setWorkItemRunningMillisMin(rwis.getMillisMin());
 			oi.setWorkItemRunningMillisMax(rwis.getMillisMax());
 			oi.setWorkItemTodMostRecentStart(rwis.getTodMostRecentStart());
-			oi.setMapOperating(jdh.getMapOperating());
+			oi.setActiveWorkItemInfo(jdh.getActiveWotrkItemInfo());
 			MessageBuffer mb = new MessageBuffer();
 			mb.append(Standardize.Label.crTotal.get()+oi.getWorkItemCrTotal());
 			mb.append(Standardize.Label.crFetches.get()+oi.getWorkItemCrFetches());

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java?rev=1638376&r1=1638375&r2=1638376&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IOperatingInfo.java Tue Nov 11 20:40:50 2014
@@ -19,7 +19,6 @@
 package org.apache.uima.ducc.container.jd.mh.iface;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
 public interface IOperatingInfo {
 
@@ -86,6 +85,6 @@ public interface IOperatingInfo {
 	
 	//
 	
-	public void setMapOperating(HashMap<String,ArrayList<String>> value);
-	public HashMap<String,ArrayList<String>> getMapOperating();
+	public void setActiveWorkItemInfo(ArrayList<IWorkItemInfo> value);
+	public ArrayList<IWorkItemInfo> getActiveWorkItemInfo();
 }

Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IWorkItemInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IWorkItemInfo.java?rev=1638376&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IWorkItemInfo.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IWorkItemInfo.java Tue Nov 11 20:40:50 2014
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.jd.mh.iface;
+
+import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteNode;
+import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemotePid;
+import org.apache.uima.ducc.container.jd.mh.iface.remote.IRemoteTid;
+
+public interface IWorkItemInfo extends IRemoteNode, IRemotePid, IRemoteTid {
+	
+	public int getSeqNo();
+	public void setSeqNo(int value);
+	
+	public long getOperatingMillis();
+	public void setOperatingMillis(long value);
+}

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/iface/IWorkItemInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java?rev=1638376&r1=1638375&r2=1638376&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/OperatingInfo.java Tue Nov 11 20:40:50 2014
@@ -19,9 +19,9 @@
 package org.apache.uima.ducc.container.jd.mh.impl;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 
 import org.apache.uima.ducc.container.jd.mh.iface.IOperatingInfo;
+import org.apache.uima.ducc.container.jd.mh.iface.IWorkItemInfo;
 
 public class OperatingInfo implements IOperatingInfo {
 
@@ -46,8 +46,8 @@ public class OperatingInfo implements IO
 	private long todMostRecentStart = 0;
 	
 	private boolean killJob = false;
-	
-	private HashMap<String,ArrayList<String>> mapOperating = null;
+
+	private ArrayList<IWorkItemInfo> activeWorkItemInfo = null;
 	
 	@Override
 	public void setWorkItemCrTotal(int value) {
@@ -225,13 +225,13 @@ public class OperatingInfo implements IO
 	}
 
 	@Override
-	public void setMapOperating(HashMap<String, ArrayList<String>> value) {
-		mapOperating = value;
+	public void setActiveWorkItemInfo(ArrayList<IWorkItemInfo> value) {
+		activeWorkItemInfo = value;
 	}
 
 	@Override
-	public HashMap<String, ArrayList<String>> getMapOperating() {
-		return mapOperating;
+	public ArrayList<IWorkItemInfo> getActiveWorkItemInfo() {
+		return activeWorkItemInfo;
 	}
 
 }

Added: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/WorkItemInfo.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/WorkItemInfo.java?rev=1638376&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/WorkItemInfo.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/WorkItemInfo.java Tue Nov 11 20:40:50 2014
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.container.jd.mh.impl;
+
+import org.apache.uima.ducc.container.jd.mh.iface.IWorkItemInfo;
+
+public class WorkItemInfo implements IWorkItemInfo {
+
+	String nodeName = null;
+	String nodeAddress = null;
+	int pid = 0;
+	int tid = 0;
+	long operatingMillis = 0;
+	int seqNo = 0;
+	
+	@Override
+	public String getNodeName() {
+		return nodeName;
+	}
+
+	@Override
+	public void setNodeName(String value) {
+		nodeName = value;
+	}
+
+	@Override
+	public String getNodeAddress() {
+		return nodeAddress;
+	}
+
+	@Override
+	public void setNodeAddress(String value) {
+		nodeAddress = value;
+	}
+
+	@Override
+	public int getPid() {
+		return pid;
+	}
+
+	@Override
+	public void setPid(int value) {
+		pid = value;
+	}
+
+	@Override
+	public int getTid() {
+		return tid;
+	}
+
+	@Override
+	public void setTid(int value) {
+		tid = value;
+	}
+
+	@Override
+	public long getOperatingMillis() {
+		return operatingMillis;
+	}
+
+	@Override
+	public void setOperatingMillis(long value) {
+		operatingMillis = value;
+	}
+
+	@Override
+	public int getSeqNo() {
+		return seqNo;
+	}
+
+	@Override
+	public void setSeqNo(int value) {
+		seqNo = value;
+	}
+}

Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/main/java/org/apache/uima/ducc/container/jd/mh/impl/WorkItemInfo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java?rev=1638376&r1=1638375&r2=1638376&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestDispatcher.java Tue Nov 11 20:40:50 2014
@@ -24,8 +24,6 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map.Entry;
 import java.util.Random;
 
 import org.apache.uima.ducc.container.jd.JobDriver;
@@ -34,6 +32,7 @@ import org.apache.uima.ducc.container.jd
 import org.apache.uima.ducc.container.jd.mh.Dispatcher;
 import org.apache.uima.ducc.container.jd.mh.iface.IOperatingInfo;
 import org.apache.uima.ducc.container.jd.mh.iface.IProcessInfo;
+import org.apache.uima.ducc.container.jd.mh.iface.IWorkItemInfo;
 import org.apache.uima.ducc.container.jd.mh.impl.ProcessInfo;
 import org.apache.uima.ducc.container.jd.test.helper.ThreadInfo;
 import org.apache.uima.ducc.container.jd.test.helper.ThreadInfoFactory;
@@ -243,14 +242,9 @@ public class TestDispatcher extends ATes
 			}
 			assertTrue(oi.getWorkItemCrFetches() == 100);
 			asExpected("CASes fetched count == 100");
-			int count = 0;
-			HashMap<String, ArrayList<String>> mapOperating = oi.getMapOperating();
-			for(Entry<String, ArrayList<String>> entry : mapOperating.entrySet()) {
-				ArrayList<String> list = entry.getValue();
-				count = count + list.size();
-			}
-			assertTrue(count == 100);
-			asExpected("Map operating count == 100");
+			ArrayList<IWorkItemInfo> list = oi.getActiveWorkItemInfo();
+			assertTrue(list.size() == 100);
+			asExpected("Operating count == 100");
 		}
 		catch(Exception e) {
 			e.printStackTrace();

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java?rev=1638376&r1=1638375&r2=1638376&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-container/src/test/java/org/apache/uima/ducc/container/jd/test/TestSuite.java Tue Nov 11 20:40:50 2014
@@ -24,14 +24,15 @@ import static org.junit.Assert.fail;
 import java.io.File;
 import java.net.URL;
 import java.util.ArrayList;
-import java.util.HashMap;
 
 import org.apache.uima.ducc.container.jd.JobDriverException;
 import org.apache.uima.ducc.container.jd.cas.CasManager;
 import org.apache.uima.ducc.container.jd.cas.CasManagerStats.RetryReason;
 import org.apache.uima.ducc.container.jd.classload.ProxyJobDriverCollectionReader;
 import org.apache.uima.ducc.container.jd.mh.RemoteWorkerIdentity;
+import org.apache.uima.ducc.container.jd.mh.iface.IWorkItemInfo;
 import org.apache.uima.ducc.container.jd.mh.impl.OperatingInfo;
+import org.apache.uima.ducc.container.jd.mh.impl.WorkItemInfo;
 import org.apache.uima.ducc.container.jd.test.helper.Utilities;
 import org.apache.uima.ducc.container.net.iface.IMetaCas;
 import org.apache.uima.ducc.container.net.impl.MetaCas;
@@ -387,13 +388,21 @@ public class TestSuite extends ATest {
 		ArrayList<String> pids01 = new ArrayList<String>();
 		pids01.add("011");
 		pids01.add("012");
-		HashMap<String,ArrayList<String>> map = new HashMap<String,ArrayList<String>>();
-		String mapKey = "node01";
-		map.put("node01", pids01);
-		oi.setMapOperating(map);
-		HashMap<String,ArrayList<String>> mapOperating = oi.getMapOperating();
-		assertTrue(mapOperating.size() == 1);
-		ArrayList<String> list = mapOperating.get(mapKey);
+		ArrayList<IWorkItemInfo> list = new ArrayList<IWorkItemInfo>();
+		IWorkItemInfo wii = new WorkItemInfo();
+		wii.setNodeName("node01");
+		wii.setPid(1);
+		wii.setTid(1);
+		wii.setOperatingMillis(9991);
+		list.add(wii);
+		wii = new WorkItemInfo();
+		wii.setNodeName("node02");
+		wii.setPid(2);
+		wii.setTid(2);
+		wii.setOperatingMillis(9992);
+		list.add(wii);
+		oi.setActiveWorkItemInfo(list);
+		list = oi.getActiveWorkItemInfo();
 		assertTrue(list.size() == 2);
 	}