test fixes, version changed to RC-2

Author: Hotzkow

build.gradle

@@ -1,7 +1,7 @@
 
 
 
-version '1.3.2-RC1'
+version '1.3.2-RC2'
 
 buildscript {
 	project.ext {

src/main/kotlin/org/droidmate/explorationModel/retention/loading/ModelParser.kt

@@ -51,11 +51,12 @@ object ModelParser{
 	/** returning the model map of origId->newId for states and widgets */
 	suspend fun loadAndRepair(config: ModelConfig,
 	                          modelProvider: (ModelConfig)->Model = {Model.emptyModel(config)},
-	                          sequential: Boolean = true): Triple<Model, Map<ConcreteId,ConcreteId>,Map<ConcreteId,ConcreteId>>{
+	                          sequential: Boolean = true,
+	                          enablePrint: Boolean = false): Triple<Model, Map<ConcreteId,ConcreteId>,Map<ConcreteId,ConcreteId>>{
 		val parser = if (sequential)
-			ModelParserS(config, compatibilityMode = true, enablePrint = false, reader = ContentReader(config), enableChecks = true, modelProvider = modelProvider)
+			ModelParserS(config, compatibilityMode = true, enablePrint = enablePrint, reader = ContentReader(config), enableChecks = true, modelProvider = modelProvider)
 		else
-			ModelParserP(config, compatibilityMode = true, enablePrint = false, reader = ContentReader(config), enableChecks = true, modelProvider = modelProvider)
+			ModelParserP(config, compatibilityMode = true, enablePrint = enablePrint, reader = ContentReader(config), enableChecks = true, modelProvider = modelProvider)
 
 		val model = parser.loadModel(LinkedList(), emptyMap())
 		logger.info("model parsing complete '${config.appName}' : $model, state repairs = ${parser.stateMap.size}, widget repairs = ${parser.widgetMap.size}")
@@ -158,7 +159,7 @@ internal abstract class ModelParserI<T,S,W>: ParserI<T, Pair<Interaction, State>
 
 	/** parse a single action this function is called in the processor either asynchronous (Deferred) or sequential (blocking) */
 	suspend fun parseAction(actionS: List<String>): Pair<Interaction, State> {
-		if(enablePrint) println("\n\t ---> parse action $actionS")
+		if(enablePrint) logger.trace("\n\t ---> parse action $actionS")
 		val resId = ConcreteId.fromString(actionS[Interaction.resStateIdx])!!
 		val resState = stateParser.queue.computeIfAbsent(resId, stateParser.parseIfAbsent(coroutineContext)).getState()
 		val targetWidgetId = widgetParser.fixedWidgetId(actionS[Interaction.widgetIdx])

src/test/kotlin/org/droidmate/explorationModel/ModelTester.kt

@@ -28,7 +28,7 @@ class ModelTester: TestI, TestModel by DefaultTestModel() {
 		val emptyWidget = Widget.emptyWidget
 		expect(parentWidget.configId.toString(), "20ef5802-33dc-310b-8efc-c791586ede85")  // quickFix due to new UiElementP constructor
 		expect(emptyWidget.configId, parentWidget.configId)
-		expect(parentWidget.id.toString(),"4d910bd0-9ce1-32bf-b162-4e5a743620b2_${parentWidget.configId}")
+		expect(parentWidget.id.toString(),"f3290220-b5dc-3665-b30e-d533f658d117_${parentWidget.configId}")
 		expect(testWidget.parentId, emptyWidget.id)
 
 		expect(testWidget.configId, UUID.fromString("5d802df8-481b-3882-9c3b-95ea87b08a03"))

src/test/kotlin/org/droidmate/explorationModel/TestModel.kt

@@ -46,7 +46,7 @@ internal class DefaultTestModel: TestModel {
 	override val testWidget: Widget by lazy{ super.testWidget }
 	override val parentWidget: Widget by lazy{ super.parentWidget }
 
-	override val testWidgetDumpString = "771eb696-344f-3290-81ed-dc88af7ab7e4_5d802df8-481b-3882-9c3b-95ea87b08a03;" +
+	override val testWidgetDumpString = "1db4c18e-a236-35af-b51d-f9a0bfbe8847_5d802df8-481b-3882-9c3b-95ea87b08a03;" +
 			"class-mock;text-mock;Dummy-hintText;description-mock;0;disabled;false;11:136:81:51;11:136:81:51;[];true;true;true;disabled;" +
 			"0;0;false;false;false;false;package-mock;0;resourceId-mock;false;false;[11:136:81:51];No-xPath"
 }