From fb890bd1c4c5e4a96cd0a578ab7337d849d5a2d9 Mon Sep 17 00:00:00 2001 From: Adam Knapp Date: Thu, 29 Jul 2021 17:25:59 +0200 Subject: [PATCH] Some improvements of the executor and fix of the timestamp bug Signed-off-by: Adam Knapp --- org.eclipse.titan.executor/plugin.xml | 2 +- .../executor/views/testexecution/TestExecutionView.java | 8 ++++---- .../eclipse/titan/runtime/core/TTCN_Communication.java | 2 +- .../eclipse/titan/runtime/core/mctr/MainController.java | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/org.eclipse.titan.executor/plugin.xml b/org.eclipse.titan.executor/plugin.xml index 27e07d58b..4b2535d53 100644 --- a/org.eclipse.titan.executor/plugin.xml +++ b/org.eclipse.titan.executor/plugin.xml @@ -353,7 +353,7 @@ diff --git a/org.eclipse.titan.executor/src/org/eclipse/titan/executor/views/testexecution/TestExecutionView.java b/org.eclipse.titan.executor/src/org/eclipse/titan/executor/views/testexecution/TestExecutionView.java index c48acecff..0267543a8 100644 --- a/org.eclipse.titan.executor/src/org/eclipse/titan/executor/views/testexecution/TestExecutionView.java +++ b/org.eclipse.titan.executor/src/org/eclipse/titan/executor/views/testexecution/TestExecutionView.java @@ -71,7 +71,7 @@ public final class TestExecutionView extends ViewPart implements ISelectionListe table.setHeaderVisible(true); TableColumn column = new TableColumn(table, SWT.LEFT, 0); - column.setText("reason"); + column.setText("Reason"); column.setWidth(300); final Image infoImage = ImageCache.getImage("information2.gif"); column.setImage(infoImage); @@ -79,21 +79,21 @@ public final class TestExecutionView extends ViewPart implements ISelectionListe column.setAlignment(SWT.LEFT); column = new TableColumn(table, SWT.LEFT, 0); - column.setText("verdict"); + column.setText("Verdict"); column.setWidth(100); column.setImage(infoImage); column.setMoveable(true); column.setAlignment(SWT.LEFT); column = new TableColumn(table, SWT.LEFT, 0); - column.setText("testcase"); + column.setText("Testcase"); column.setWidth(300); column.setImage(infoImage); column.setMoveable(true); column.setAlignment(SWT.LEFT); column = new TableColumn(table, SWT.LEFT, 0); - column.setText("timestamp"); + column.setText("Timestamp"); column.setWidth(164); column.setMoveable(true); column.setAlignment(SWT.LEFT); diff --git a/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TTCN_Communication.java b/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TTCN_Communication.java index c98545c7a..8a3d607ec 100644 --- a/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TTCN_Communication.java +++ b/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/TTCN_Communication.java @@ -1159,7 +1159,7 @@ public final class TTCN_Communication { final String testcase_definition_name = local_incoming_buf.pull_string(); final int upper_int = local_incoming_buf.pull_int().get_int(); final int lower_int = local_incoming_buf.pull_int().get_int(); - final long seconds = upper_int * 0xffffffff + lower_int; + final long seconds = (long)(upper_int * 0xffffffff + lower_int); final int microSeconds = local_incoming_buf.pull_int().get_int(); local_incoming_buf.cut_message(); diff --git a/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/mctr/MainController.java b/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/mctr/MainController.java index 0a3abca1d..bb207f003 100644 --- a/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/mctr/MainController.java +++ b/org.eclipse.titan.runtime/src/org/eclipse/titan/runtime/core/mctr/MainController.java @@ -1823,7 +1823,7 @@ public class MainController { final int isAlive = text_buf.pull_int().get_int(); final int upper_int = text_buf.pull_int().get_int(); final int lower_int = text_buf.pull_int().get_int(); - testcase_start_time_seconds = upper_int * 0xffffffffL + lower_int; + testcase_start_time_seconds = (long)(upper_int * 0xffffffff + lower_int); testcase_start_time_microseconds = text_buf.pull_int().get_int(); final Host ptcLoc = choose_ptc_location(componentTypeName, componentName, componentLocation); @@ -5851,7 +5851,7 @@ public class MainController { final Text_Buf text_buf = connection.text_buf; final int upper_int = text_buf.pull_int().get_int(); final int lower_int = text_buf.pull_int().get_int(); - final long seconds = upper_int * 0xffffffffL + lower_int; + final long seconds = (long)(upper_int * 0xffffffff + lower_int); final int microseconds = text_buf.pull_int().get_int(); final String source = MessageFormat.format("@{0}", connection.ip_address.getHostAddress()); final int severity = text_buf.pull_int().get_int(); @@ -5866,7 +5866,7 @@ public class MainController { final Text_Buf text_buf = hc.text_buf; final int upper_int = text_buf.pull_int().get_int(); final int lower_int = text_buf.pull_int().get_int(); - final long seconds = upper_int * 0xffffffffL + lower_int; + final long seconds = (long)(upper_int * 0xffffffff + lower_int); final int microseconds = text_buf.pull_int().get_int(); final int severity = text_buf.pull_int().get_int(); @@ -5881,7 +5881,7 @@ public class MainController { final Text_Buf text_buf = tc.text_buf; final int upper_int = text_buf.pull_int().get_int(); final int lower_int = text_buf.pull_int().get_int(); - final long seconds = upper_int * 0xffffffffL + lower_int; + final long seconds = (long)(upper_int * 0xffffffff + lower_int); final int microseconds = text_buf.pull_int().get_int(); final int severity = text_buf.pull_int().get_int(); -- GitLab