diff --git a/capectracer/requirements_capec_tracer.txt b/capectracer/requirements_capec_tracer.txt
index 354c7e3f16c07446aa6971bb67cd803a9838d0fa..b5c5fc9bf62ba73f52e7e817f40f32ab635963ac 100644
--- a/capectracer/requirements_capec_tracer.txt
+++ b/capectracer/requirements_capec_tracer.txt
@@ -1,4 +1,4 @@
-scikit-learn==1.0.2
+scikit-learn==1.2
gensim==4.1.2
spacy==3.7.2
xmltodict==0.13.0
diff --git a/src/main/java/avatartranslator/AvatarBlock.java b/src/main/java/avatartranslator/AvatarBlock.java
index 4409415bd437265ebe2421cbad69106dd93fb54b..e7ad1e312670c45834f7effbddf7c349e27745fa 100644
--- a/src/main/java/avatartranslator/AvatarBlock.java
+++ b/src/main/java/avatartranslator/AvatarBlock.java
@@ -130,7 +130,7 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
}
for (i = 0; i < actions.length; i++) {
- //TraceManager.addDev("params=" + params + " actions=" + actions[i]);
+ //TraceManager.addDev("params=" + params + " actions=" + actions[i] + "isInt?" + am.getListOfAttributes().get(i).isInt());
// Must check the validity of this action
if (am.getListOfAttributes().get(i).isInt()) {
@@ -188,14 +188,14 @@ public class AvatarBlock extends AvatarElement implements AvatarStateMachineOwne
// Only one param.
aa = owner.getAvatarAttributeWithName(retparams);
if (aa == null) {
- //TraceManager.addDev("Failed for return attribute " + retparams);
+ TraceManager.addDev("Failed for return attribute " + retparams);
return false;
} else if (aa.isConstant()) {
return false;
}
if (am.getListOfReturnAttributes().size() != 1) {
- //TraceManager.addDev("Wrong number of return parameters in :" + retparams);
+ TraceManager.addDev("Wrong number of return parameters in :" + retparams);
return false;
}
}
diff --git a/src/main/java/ui/AvatarDesignPanelTranslator.java b/src/main/java/ui/AvatarDesignPanelTranslator.java
index dd3ca1f65fb8bbb5ae21cb8c9a86f1035d92cd8b..9dc11935f11f98346dda09a975ae4e1465e1621b 100644
--- a/src/main/java/ui/AvatarDesignPanelTranslator.java
+++ b/src/main/java/ui/AvatarDesignPanelTranslator.java
@@ -2331,9 +2331,12 @@ public class AvatarDesignPanelTranslator {
//TraceManager.addDev("Action before modifyStringMethodCall :" + actionText);
actionText = modifyStringMethodCall(actionText, block.getName());
- TraceManager.addDev("Action after modifyStringMethodCall :" + actionText);
+ //TraceManager.addDev("Action after modifyStringMethodCall :" + actionText);
+
+ TraceManager.addDev("Testing if method call is valid");
if (!AvatarBlock.isAValidMethodCall(block, actionText)) {
+ TraceManager.addDev("Invalid\n");
UICheckingError ce = new UICheckingError(CheckingError.BEHAVIOR_ERROR, "Badly formed transition method call: " + actionText);
// TODO: adapt
// ce.setAvatarBlock(_ab);
@@ -2341,7 +2344,7 @@ public class AvatarDesignPanelTranslator {
ce.setTGComponent(connector);
addCheckingError(ce);
} else {
- //TraceManager.addDev("Adding method call action");
+ //TraceManager.addDev("Valid: Adding method call action\n");
transition.addAction(actionText);
}
} else {
diff --git a/ttool/src/test/java/launcher/TestRshClient.java b/ttool/src/test/java/launcher/TestRshClient.java
index 192a2cde6ccb716afb07e685ada59e24bf7cc761..0cb4d0a85a8eb77ef4993a09f2b37415b62ac07c 100644
--- a/ttool/src/test/java/launcher/TestRshClient.java
+++ b/ttool/src/test/java/launcher/TestRshClient.java
@@ -116,142 +116,7 @@ public class TestRshClient extends AbstractTest {
throws Exception {
SERVER_THREAD.interrupt();
}
-//
-// private void handleException( final Throwable th ) {
-// th.printStackTrace();
-// fail( th.getLocalizedMessage() );
-// }
-
- /*@Test
- public void testStopCommand() {
- final Runnable runnable = new Runnable() {
-
- @Override
- public void run() {
- try {
- System.out.println("starting thread for LauncherException:");
- client.setCmd( TEST_COMMAND_NON_STOP );
- client.sendExecuteCommandRequest();
- final Writer writer = new StringWriter();
- client.writeCommandMessages( writer );
- }
- catch (LauncherException e) {
- System.out.println("LauncherException:" + e.getMessage());
- handleException( e );
- }
- }
- };
-
- final Thread thread = new Thread( runnable );
- System.out.println("Going to start thread for LauncherException:");
- thread.start();
-
- try {
-
- // Ensure the remote process has enough time to start
- Thread.sleep( 2000 );
- client.stopCommand();
-
- // Ensure the stop command has been processed on the server
- Thread.sleep( 2000 );
- assertTrue( killUnexistentProcess() );
- }
- catch ( LauncherException ex ) {
- System.out.println("LauncherException:" + ex.getMessage());
- handleException( ex );
- }
- catch ( InterruptedException ex ) {
- System.out.println("InterruptedException:" + ex.getMessage());
- handleException( ex );
- }
- }*/
-
- /*public boolean killUnexistentProcess() {
- try {
- client.sendKillProcessRequest();
- return false;
- }
- catch ( LauncherException ex ) {
- return RshClient.FAILED.equals( ex.getMessage() );
- }
- }*/
-
- /*@Test
- public void testGetId() {
- try {
- final int id = client.getId();
- assertTrue( id == 1 );
- }
- catch ( LauncherException ex ) {
- handleException( ex );
- }
- }
-
- @Test
- public void testFreeId() {
- try {
- client.freeId( 1 );
- }
- catch ( LauncherException ex ) {
- handleException( ex );
- }
- }
-
- @Test
- public void testSendExecuteCommandRequest() {
- client.setCmd( TEST_COMMAND );
-
- try {
- client.sendExecuteCommandRequest();
- final Writer writer = new StringWriter();
- client.writeCommandMessages( writer );
- assertTrue( ( EXPECTED_COMMAND_OUTPUT + System.lineSeparator() ).equals( writer.toString() ) );
- }
- catch ( LauncherException ex ) {
- handleException( ex );
- }
- }
-
- @Test
- public void testSendExecuteCommandRequestBoolean() {
- client.setCmd( TEST_COMMAND );
- try {
- client.sendExecuteCommandRequest( true );
- final Writer writer = new StringWriter();
- client.writeCommandMessages( writer );
- assertTrue( writer.toString().startsWith( EXPECTED_COMMAND_OUTPUT ) );
-
- final Integer retCode = client.getProcessReturnCode();
- assertTrue( retCode != null && retCode == 0 );
- }
- catch ( LauncherException ex ) {
- handleException( ex );
- }
- }
-
- @Test
- public void testSendExecutePipedCommandsRequest() {
- final String testFileName = "./" + RESOURCES_DIR + "test_piped_commands.txt";
- final String expectedData = "Test Passed!" + System.lineSeparator();
-
- try {
- FileUtils.saveFile( testFileName, expectedData );
- client.sendExecutePipedCommandsRequest( "echo " + testFileName, "xargs cat" );
- final String data = client.getDataFromProcess();
-
- assertTrue( "Piped commands returned " + data, expectedData.equals( data ) );
- }
- catch ( LauncherException ex ) {
- handleException( ex );
- }
- catch ( FileException ex ) {
- handleException( ex );
- }
- finally {
- new File( testFileName ).delete();
- }
- }*/
private boolean deleteTestFile() {
final File testFile = new File( TEST_FILE_NAME );
@@ -322,61 +187,5 @@ public class TestRshClient extends AbstractTest {
}
}
- /*@Test
- public void testSendKillProcessRequest() {
- client.setCmd( TEST_COMMAND_NON_STOP );
-
- try {
- client.sendExecuteCommandRequest();
- Thread.sleep( 200 );
- client.sendKillProcessRequest();
-
- Thread.sleep( 200 );
- assertTrue( killUnexistentProcess() );
- }
- catch ( LauncherException ex ) {
- handleException( ex );
- }
- catch ( InterruptedException ex ) {
- handleException( ex );
- }
- }*/
-
- /*@Test
- public void testSendKillAllProcessRequest() {
- client.setCmd( TEST_COMMAND_NON_STOP );
-
- try {
- for ( int index = 0; index < 4; index++ ) {
- client.sendExecuteCommandRequest();
- Thread.sleep( 200 );
- }
-
- client.sendKillAllProcessRequest();
-
- Thread.sleep( 200 );
- assertTrue( killUnexistentProcess() );
- }
- catch ( LauncherException ex ) {
- handleException( ex );
- }
- catch ( InterruptedException ex ) {
- handleException( ex );
- }
- }*/
-
- /*@Test
- public void testGetDataFromProcess() {
- client.setCmd( TEST_COMMAND );
- try {
- client.sendExecuteCommandRequest();
- final String messageFromProcess = client.getDataFromProcess();
-
- assertTrue( ( EXPECTED_COMMAND_OUTPUT ).equals( messageFromProcess ) );
- }
- catch ( LauncherException ex ) {
- handleException( ex );
- }
- }*/
}