From 047404c80da5470b57db74a6a6d112a20a30e35e Mon Sep 17 00:00:00 2001 From: adamopolous Date: Wed, 28 Aug 2019 10:46:12 -0400 Subject: [PATCH] fixing test problems --- .../plugin/core/codebrowser/CodeBrowserOptionsTest.java | 1 + .../program/model/lang/RegisterValueContextTest.java | 0 .../java/ghidra/program/model/lang/RegisterValueTest.java | 0 gradle/javaTestProject.gradle | 7 +++++-- 4 files changed, 6 insertions(+), 2 deletions(-) rename Ghidra/Test/IntegrationTest/src/{test => test.slow}/java/ghidra/program/model/lang/RegisterValueContextTest.java (100%) rename Ghidra/Test/IntegrationTest/src/{test => test.slow}/java/ghidra/program/model/lang/RegisterValueTest.java (100%) diff --git a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java index b720966d08..b0f74fed16 100644 --- a/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java +++ b/Ghidra/Features/Base/src/test.slow/java/ghidra/app/plugin/core/codebrowser/CodeBrowserOptionsTest.java @@ -184,6 +184,7 @@ public class CodeBrowserOptionsTest extends AbstractGhidraHeadedIntegrationTest assertEquals("Function Signature Field", groups[idx++]); assertEquals("Labels Field", groups[idx++]); assertEquals("Mnemonic Field", groups[idx++]); + assertEquals("Mouse", groups[idx++]); assertEquals("Operands Field", groups[idx++]); assertEquals("Pcode Field", groups[idx++]); assertEquals("Plate Comment", groups[idx++]); diff --git a/Ghidra/Test/IntegrationTest/src/test/java/ghidra/program/model/lang/RegisterValueContextTest.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/lang/RegisterValueContextTest.java similarity index 100% rename from Ghidra/Test/IntegrationTest/src/test/java/ghidra/program/model/lang/RegisterValueContextTest.java rename to Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/lang/RegisterValueContextTest.java diff --git a/Ghidra/Test/IntegrationTest/src/test/java/ghidra/program/model/lang/RegisterValueTest.java b/Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/lang/RegisterValueTest.java similarity index 100% rename from Ghidra/Test/IntegrationTest/src/test/java/ghidra/program/model/lang/RegisterValueTest.java rename to Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/program/model/lang/RegisterValueTest.java diff --git a/gradle/javaTestProject.gradle b/gradle/javaTestProject.gradle index 63fda637ab..3672f49076 100644 --- a/gradle/javaTestProject.gradle +++ b/gradle/javaTestProject.gradle @@ -29,8 +29,11 @@ test { t -> // the class searching environment. This can have a negative impact // on test results due to the inconsistent Application environment // which may exist when all tests are run versus a single test. - // Based on this limitation we should only use the Integration base - // test classes within integrationTest regions (e.g., test.slow). + // + // Based on this limitation, do not place tests that depend on integration + // base classes (eg: AbstractGhidraHeadlessIntegrationTest) in 'test'; they + // must go in 'test.slow'. + doFirst { startTestTimer(t)