#3900 entity appears only after SDK received first percepts (including

the stakeholders). Changed name and type of EIS entities to match actual. Updated manual.
eishub · May 10, 2016 · b2c8390 · b2c8390
1 parent 2ff61ca
commit b2c8390
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 6 deletions.
diff --git a/doc/src/main/latex/TygronManual.tex b/doc/src/main/latex/TygronManual.tex
@@ -55,6 +55,11 @@ \subsection{Init parameters}
 \end{tabularx}\\
 
 
+\subsection{Entities}
+The entities appear slightly after init has been called. How quick depends on network and server speeds.
+Entities get a name corresponding to the stakeholder type, e.g. "Municipality". The type of all entities is "stakeholder".
+Only entites matching the requested STAKEHOLDER init parameter will appear.
+
 %%%----------------------------------------------------------
 \section{Percepts}
 %%%----------------------------------------------------------

diff --git a/environment/src/main/java/tygronenv/EisEnv.java b/environment/src/main/java/tygronenv/EisEnv.java
@@ -132,7 +132,7 @@ public boolean isStateTransitionValid(EnvironmentState oldState, EnvironmentStat
 	 * @throws EntityException
 	 */
 	public void entityReady(String entity) throws EntityException {
-		addEntity(entity);
+		addEntity(entity, "stakeholder");
 	}
 
 	/************************* SUPPORT FUNCTIONS ****************************/

diff --git a/environment/src/main/java/tygronenv/TygronEntity.java b/environment/src/main/java/tygronenv/TygronEntity.java
@@ -77,7 +77,7 @@ public void notifyReady(String entity) throws EntityException {
 				joinedConfirm.client.getClientToken());
 		slotConnection.fireServerEvent(true, LogicEventType.SETTINGS_ALLOW_INTERACTION, true);
 
-		environment.entityReady(entity);
+		environment.entityReady(stakeholder.getName());
 	}
 
 	/**

diff --git a/environment/src/test/java/tygronenv/MyEnvListener.java b/environment/src/test/java/tygronenv/MyEnvListener.java
@@ -30,10 +30,11 @@ public void handleNewEntity(String entity) {
 		this.entity = entity;
 	}
 
-	public void waitForEntity() throws InterruptedException {
+	public String waitForEntity() throws InterruptedException {
 		while (entity == null) {
 			Thread.sleep(200);
 		}
+		return entity;
 	}
 
 }
diff --git a/environment/src/test/java/tygronenv/TestEnvironmentStates.java b/environment/src/test/java/tygronenv/TestEnvironmentStates.java
@@ -62,7 +62,7 @@ public void testEntityAppears()
 		Thread.sleep(5000); // give system sufficient time to create the entity.
 
 		// after the init, a new entity should appear that we can connect to.
-		verify(envlistener).handleNewEntity(ENTITY);
+		verify(envlistener).handleNewEntity("Municipality");
 
 	}
 
@@ -163,8 +163,7 @@ private void joinAsMunicipality() throws ManagementException, InterruptedExcepti
 		// any slot so not specified.
 		env.init(parameters);
 
-		listener.waitForEntity();
-
+		assertEquals("Municipality", listener.waitForEntity());
 	}
 
 	/**