From aff5b21b7776f0f8b7c5606d84d772ba30d57833 Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Tue, 13 Aug 2024 08:23:25 -0400 Subject: [PATCH] GP-4801: Deprecate Framework-Debugging and related. Ignore tests. --- .../java/agent/dbgeng/dbgeng/DbgEngTest.java | 9 +++--- .../manager/impl/SpawnedDbgManagerTest.java | 9 ++++-- .../GadpModelForDbgengBreakpointsTest.java | 9 ++++-- .../gadp/GadpModelForDbgengFactoryTest.java | 9 ++++-- ...GadpModelForDbgengFrameActivationTest.java | 10 +++++-- .../GadpModelForDbgengInterpreterTest.java | 7 +++-- ...dpModelForDbgengProcessActivationTest.java | 11 +++++-- .../GadpModelForDbgengRootAttacherTest.java | 9 ++++-- .../GadpModelForDbgengRootLauncherTest.java | 9 ++++-- ...dpModelForDbgengScenarioCloneExitTest.java | 9 ++++-- ...adpModelForDbgengScenarioForkExitTest.java | 8 +++-- .../GadpModelForDbgengScenarioMemoryTest.java | 9 ++++-- .../GadpModelForDbgengScenarioStackTest.java | 9 ++++-- ...odelForDbgengScenarioX64RegistersTest.java | 9 ++++-- ...dpModelForDbgengSessionActivationTest.java | 11 +++---- .../gadp/GadpModelForDbgengSteppableTest.java | 9 ++++-- ...adpModelForDbgengThreadActivationTest.java | 11 +++++-- .../GadpModelForDbgengX64RegistersTest.java | 9 ++++-- .../model/invm/InVmDbgengModelHost.java | 9 ++++-- .../InVmModelForDbgengBreakpointsTest.java | 11 +++++-- .../invm/InVmModelForDbgengFactoryTest.java | 9 ++++-- ...InVmModelForDbgengFrameActivationTest.java | 10 +++++-- .../InVmModelForDbgengInterpreterTest.java | 7 +++-- ...VmModelForDbgengProcessActivationTest.java | 11 +++++-- .../InVmModelForDbgengRootAttacherTest.java | 7 +++-- .../InVmModelForDbgengRootLauncherTest.java | 9 ++++-- ...VmModelForDbgengScenarioCloneExitTest.java | 9 ++++-- ...nVmModelForDbgengScenarioForkExitTest.java | 8 +++-- .../InVmModelForDbgengScenarioMemoryTest.java | 9 ++++-- .../InVmModelForDbgengScenarioStackTest.java | 9 ++++-- ...odelForDbgengScenarioX64RegistersTest.java | 9 ++++-- ...VmModelForDbgengSessionActivationTest.java | 11 +++---- .../invm/InVmModelForDbgengSteppableTest.java | 9 ++++-- ...nVmModelForDbgengThreadActivationTest.java | 11 +++++-- .../InVmModelForDbgengX64RegistersTest.java | 9 ++++-- .../dbgmodel/DbgModelSetContextMWETest.java | 10 +++---- .../agent/dbgmodel/dbgmodel/DbgModelTest.java | 10 +++---- .../InVmModelForDbgmodelBreakpointsTest.java | 9 ++++-- .../invm/InVmModelForDbgmodelFactoryTest.java | 9 ++++-- ...VmModelForDbgmodelFrameActivationTest.java | 10 +++++-- .../InVmModelForDbgmodelInterpreterTest.java | 7 +++-- ...ModelForDbgmodelProcessActivationTest.java | 11 +++++-- .../InVmModelForDbgmodelRootAttacherTest.java | 7 +++-- .../InVmModelForDbgmodelRootLauncherTest.java | 9 ++++-- ...ModelForDbgmodelScenarioCloneExitTest.java | 9 ++++-- ...mModelForDbgmodelScenarioForkExitTest.java | 8 +++-- ...nVmModelForDbgmodelScenarioMemoryTest.java | 9 ++++-- ...InVmModelForDbgmodelScenarioStackTest.java | 9 ++++-- ...elForDbgmodelScenarioX64RegistersTest.java | 9 ++++-- ...ModelForDbgmodelSessionActivationTest.java | 11 +++---- .../InVmModelForDbgmodelSteppableTest.java | 9 ++++-- ...mModelForDbgmodelThreadActivationTest.java | 11 +++++-- .../InVmModelForDbgmodelX64RegistersTest.java | 7 +++-- .../gadp/GadpModelForFridaFactoryTest.java | 9 ++++-- .../GadpModelForFridaInterpreterTest.java | 10 +++---- .../GadpModelForFridaRootLauncherTest.java | 9 ++++-- .../GadpModelForFridaScenarioStackTest.java | 9 ++++-- .../GadpModelForFridaX64RegistersTest.java | 11 ++++--- .../invm/InVmModelForFridaFactoryTest.java | 8 +++-- .../InVmModelForFridaInterpreterTest.java | 7 +++-- .../invm/InVmModelForFridaMethodsTest.java | 8 +++-- .../InVmModelForFridaRootAttacherTest.java | 7 +++-- .../InVmModelForFridaRootLauncherTest.java | 8 +++-- .../InVmModelForFridaScenarioStackTest.java | 8 +++-- .../InVmModelForFridaX64RegistersTest.java | 8 +++-- .../java/agent/gdb/manager/GdbTableTest.java | 8 +++-- .../gdb/manager/impl/GdbCValueParserTest.java | 8 +++-- .../impl/GdbReadRegistersCommandTest.java | 8 +++-- .../manager/impl/JoinedGdbManagerTest.java | 8 ++--- .../impl/SpawnedCliGdbManagerTest.java | 8 ++--- .../SpawnedMi2Gdb7Dot6Dot1ManagerTest.java | 8 ++--- .../SpawnedMi2GdbHomeLocalManagerTest.java | 8 ++--- .../impl/SpawnedMi2GdbSystemManagerTest.java | 8 ++--- .../impl/SpawnedWindowsMi2GdbManagerTest.java | 8 ++--- .../gdb/manager/parsing/GdbMiParserTest.java | 8 +++-- .../gadp/GadpModelForGdbBreakpointsTest.java | 9 ++++-- .../gadp/GadpModelForGdbFactoryTest.java | 9 ++++-- .../GadpModelForGdbInferiorAttacherTest.java | 9 ++++-- .../GadpModelForGdbInferiorLauncherTest.java | 9 ++++-- .../gadp/GadpModelForGdbInterpreterTest.java | 9 ++++-- .../GadpModelForGdbScenarioForkExitTest.java | 9 ++++-- .../GadpModelForGdbSessionAttacherTest.java | 9 ++++-- .../GadpModelForGdbSessionLauncherTest.java | 9 ++++-- .../InVmModelForGdbAmd64RegistersTest.java | 8 +++-- .../invm/InVmModelForGdbBreakpointsTest.java | 8 +++-- .../invm/InVmModelForGdbFactoryTest.java | 9 ++++-- .../InVmModelForGdbFrameActivationTest.java | 8 +++-- ...InVmModelForGdbInferiorActivationTest.java | 12 +++++--- .../InVmModelForGdbInferiorAttacherTest.java | 7 +++-- .../InVmModelForGdbInferiorLauncherTest.java | 8 +++-- .../invm/InVmModelForGdbInterpreterTest.java | 8 +++-- ...ModelForGdbScenarioAmd64RegistersTest.java | 8 +++-- .../InVmModelForGdbScenarioCloneExitTest.java | 8 +++-- .../InVmModelForGdbScenarioForkExitTest.java | 8 ++--- .../InVmModelForGdbScenarioMemoryTest.java | 8 ++--- .../InVmModelForGdbScenarioStackTest.java | 8 ++--- .../InVmModelForGdbSessionAttacherTest.java | 9 ++++-- .../InVmModelForGdbSessionLauncherTest.java | 8 +++-- .../invm/InVmModelForGdbSteppableTest.java | 8 +++-- .../InVmModelForGdbThreadActivationTest.java | 8 ++--- .../ssh/SshJoinModelForGdbFactoryTest.java | 8 +++-- ...SshJoinModelForGdbSessionLauncherTest.java | 8 +++-- .../model/ssh/SshModelForGdbFactoryTest.java | 8 +++-- .../test/java/agent/lldb/lldb/LLDBTest.java | 17 ++++------- .../invm/InVmModelForLldbBreakpointsTest.java | 17 +++++------ .../invm/InVmModelForLldbFactoryTest.java | 9 ++++-- .../InVmModelForLldbFrameActivationTest.java | 15 ++++++---- .../invm/InVmModelForLldbInterpreterTest.java | 10 +++---- ...InVmModelForLldbProcessActivationTest.java | 22 +++++++++----- .../InVmModelForLldbRootAttacherTest.java | 13 ++++---- .../InVmModelForLldbRootLauncherTest.java | 9 ++++-- ...InVmModelForLldbScenarioCloneExitTest.java | 9 ++++-- .../InVmModelForLldbScenarioForkExitTest.java | 8 +++-- .../InVmModelForLldbScenarioMemoryTest.java | 9 ++++-- .../InVmModelForLldbScenarioStackTest.java | 9 ++++-- ...mModelForLldbScenarioX64RegistersTest.java | 9 ++++-- ...InVmModelForLldbSessionActivationTest.java | 22 +++++++++----- .../invm/InVmModelForLldbSteppableTest.java | 9 ++++-- .../InVmModelForLldbThreadActivationTest.java | 18 ++++++----- .../InVmModelForLldbX64RegistersTest.java | 11 ++++--- .../java/ghidra/dbg/gadp/GadpRegistry.java | 7 +++-- .../java/ghidra/dbg/gadp/GadpVersion.java | 7 +++-- .../ghidra/dbg/gadp/client/GadpClient.java | 7 +++-- .../dbg/gadp/server/AbstractGadpServer.java | 7 +++-- .../ghidra/dbg/gadp/GadpClientServerTest.java | 7 +++-- .../dbg/gadp/client/GadpClientTest.java | 11 ++++--- .../util/AsyncProtobufMessageChannelTest.java | 8 +++-- .../ghidra/dbg/jdi/model/JdiModelTest.java | 7 +++-- .../gui/objects/DebuggerObjectsPlugin.java | 10 ++++--- .../gui/target/DebuggerTargetsPlugin.java | 29 +++++++++--------- .../DebuggerModelServiceProxyPlugin.java | 10 ++++--- .../AnnotatedDebuggerAttributeListener.java | 9 ++++-- .../ghidra/dbg/DebugModelConventions.java | 10 +++++-- .../DebuggerAbnormalModelClosedReason.java | 7 +++-- .../ghidra/dbg/DebuggerModelClosedReason.java | 9 ++++-- .../java/ghidra/dbg/DebuggerModelFactory.java | 9 ++++-- .../ghidra/dbg/DebuggerModelListener.java | 9 ++++-- .../dbg/DebuggerNormalModelClosedReason.java | 7 +++-- .../java/ghidra/dbg/DebuggerObjectModel.java | 9 ++++-- .../dbg/DebuggerObjectModelWithMemory.java | 7 +++-- .../ghidra/dbg/DebuggerTargetObjectIface.java | 9 ++++-- .../agent/AbstractDebuggerObjectModel.java | 7 +++-- .../dbg/agent/AbstractTargetObject.java | 8 +++-- .../java/ghidra/dbg/agent/AgentWindow.java | 7 +++-- .../dbg/agent/DefaultTargetModelRoot.java | 7 +++-- .../ghidra/dbg/agent/DefaultTargetObject.java | 14 +++++---- .../agent/InvalidatableTargetObjectIf.java | 9 ++++-- .../dbg/agent/SpiDebuggerObjectModel.java | 17 ++++++----- .../ghidra/dbg/agent/SpiTargetObject.java | 7 +++-- .../dbg/attributes/TargetArrayDataType.java | 7 +++-- .../attributes/TargetBitfieldDataType.java | 10 +++++-- .../ghidra/dbg/attributes/TargetDataType.java | 7 +++-- .../dbg/attributes/TargetObjectList.java | 7 +++-- .../dbg/attributes/TargetPointerDataType.java | 7 +++-- .../attributes/TargetPrimitiveDataType.java | 9 +++--- .../dbg/attributes/TargetStringList.java | 7 +++-- .../dbg/error/DebuggerIgnorableException.java | 9 ++++-- .../DebuggerIllegalArgumentException.java | 12 ++++---- .../error/DebuggerMemoryAccessException.java | 9 ++++-- .../error/DebuggerModelAccessException.java | 9 ++++-- .../DebuggerModelNoSuchPathException.java | 7 +++-- .../DebuggerModelTerminatingException.java | 9 ++++-- .../dbg/error/DebuggerModelTypeException.java | 8 +++-- .../DebuggerRegisterAccessException.java | 9 ++++-- .../dbg/error/DebuggerRuntimeException.java | 7 +++-- .../dbg/error/DebuggerUserException.java | 9 ++++-- .../java/ghidra/dbg/memory/CachedMemory.java | 9 ++++-- .../java/ghidra/dbg/memory/MemoryReader.java | 8 +++-- .../java/ghidra/dbg/memory/MemoryWriter.java | 8 +++-- .../dbg/target/TargetAccessConditioned.java | 9 ++++-- .../ghidra/dbg/target/TargetActivatable.java | 9 ++++-- .../ghidra/dbg/target/TargetActiveScope.java | 9 ++++-- .../ghidra/dbg/target/TargetAggregate.java | 9 ++++-- .../ghidra/dbg/target/TargetAttachable.java | 9 ++++-- .../ghidra/dbg/target/TargetAttacher.java | 9 ++++-- .../dbg/target/TargetBreakpointLocation.java | 9 ++++-- .../TargetBreakpointLocationContainer.java | 9 ++++-- .../dbg/target/TargetBreakpointSpec.java | 9 ++++-- .../target/TargetBreakpointSpecContainer.java | 9 ++++-- .../dbg/target/TargetCmdLineLauncherEx.java | 23 +++++++------- .../ghidra/dbg/target/TargetConfigurable.java | 9 ++++-- .../java/ghidra/dbg/target/TargetConsole.java | 10 ++++--- .../dbg/target/TargetDataTypeMember.java | 9 ++++-- .../dbg/target/TargetDataTypeNamespace.java | 9 ++++-- .../ghidra/dbg/target/TargetDeletable.java | 9 ++++-- .../ghidra/dbg/target/TargetDetachable.java | 9 ++++-- .../ghidra/dbg/target/TargetEnvironment.java | 8 +++-- .../ghidra/dbg/target/TargetEventScope.java | 9 ++++-- .../dbg/target/TargetExecutionStateful.java | 9 ++++-- .../ghidra/dbg/target/TargetFocusScope.java | 9 ++++-- .../ghidra/dbg/target/TargetInterpreter.java | 9 ++++-- .../dbg/target/TargetInterruptible.java | 9 ++++-- .../ghidra/dbg/target/TargetKillable.java | 9 ++++-- .../ghidra/dbg/target/TargetLauncher.java | 9 ++++-- .../java/ghidra/dbg/target/TargetMemory.java | 9 ++++-- .../ghidra/dbg/target/TargetMemoryRegion.java | 7 +++-- .../java/ghidra/dbg/target/TargetMethod.java | 9 ++++-- .../java/ghidra/dbg/target/TargetModule.java | 9 ++++-- .../dbg/target/TargetModuleContainer.java | 9 ++++-- .../dbg/target/TargetNamedDataType.java | 8 +++-- .../java/ghidra/dbg/target/TargetObject.java | 9 ++++-- .../ghidra/dbg/target/TargetObjectPath.java | 7 +++-- .../java/ghidra/dbg/target/TargetProcess.java | 9 ++++-- .../ghidra/dbg/target/TargetRegister.java | 9 ++++-- .../ghidra/dbg/target/TargetRegisterBank.java | 9 ++++-- .../dbg/target/TargetRegisterContainer.java | 9 ++++-- .../ghidra/dbg/target/TargetResumable.java | 9 ++++-- .../java/ghidra/dbg/target/TargetSection.java | 9 ++++-- .../dbg/target/TargetSectionContainer.java | 11 ++++--- .../java/ghidra/dbg/target/TargetStack.java | 9 ++++-- .../ghidra/dbg/target/TargetStackFrame.java | 9 ++++-- .../ghidra/dbg/target/TargetSteppable.java | 9 ++++-- .../java/ghidra/dbg/target/TargetSymbol.java | 8 +++-- .../dbg/target/TargetSymbolNamespace.java | 9 ++++-- .../java/ghidra/dbg/target/TargetThread.java | 9 ++++-- .../ghidra/dbg/target/TargetTogglable.java | 9 ++++-- .../target/schema/AnnotatedSchemaContext.java | 12 ++++---- .../target/schema/DefaultSchemaContext.java | 11 +++++-- .../schema/DefaultTargetObjectSchema.java | 11 +++++-- .../schema/EnumerableTargetObjectSchema.java | 11 +++++-- .../dbg/target/schema/SchemaBuilder.java | 11 +++++-- .../dbg/target/schema/SchemaContext.java | 10 +++++-- .../target/schema/TargetAttributeType.java | 9 ++++-- .../dbg/target/schema/TargetElementType.java | 10 +++++-- .../dbg/target/schema/TargetObjectSchema.java | 10 +++++-- .../target/schema/TargetObjectSchemaInfo.java | 10 +++++-- .../dbg/target/schema/XmlSchemaContext.java | 11 +++++-- .../java/ghidra/dbg/util/CollectionUtils.java | 10 +++++-- .../ghidra/dbg/util/ConfigurableFactory.java | 10 +++++-- .../java/ghidra/dbg/util/ConversionUtils.java | 30 +++++-------------- .../dbg/util/DebuggerCallbackReorderer.java | 9 ++++-- .../main/java/ghidra/dbg/util/HandlerMap.java | 10 +++++-- .../java/ghidra/dbg/util/PathMatcher.java | 11 +++++-- .../java/ghidra/dbg/util/PathPattern.java | 11 +++++-- .../java/ghidra/dbg/util/PathPredicates.java | 11 +++++-- .../main/java/ghidra/dbg/util/PathUtils.java | 10 +++++-- .../main/java/ghidra/dbg/util/PrefixMap.java | 8 +++-- .../main/java/ghidra/dbg/util/ShellUtils.java | 11 +++++-- .../dbg/util/TargetDataTypeConverter.java | 10 +++++-- .../main/java/ghidra/dbg/util/ValueUtils.java | 10 +++++-- .../dbg/test/AbstractDebuggerModelTest.java | 10 +++++-- .../dialog/PluginInstallerTableModel.java | 26 ++++++++-------- .../plugintool/util/PluginStatus.java | 7 ++++- 243 files changed, 1449 insertions(+), 854 deletions(-) diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/dbgeng/DbgEngTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/dbgeng/DbgEngTest.java index 1bf9ca8312..d9bd792f9b 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/dbgeng/DbgEngTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/dbgeng/DbgEngTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,7 +16,7 @@ package agent.dbgeng.dbgeng; import static org.junit.Assert.*; -import static org.junit.Assume.*; +import static org.junit.Assume.assumeTrue; import java.io.*; import java.nio.ByteBuffer; @@ -45,6 +45,7 @@ import ghidra.test.AbstractGhidraHeadlessIntegrationTest; import ghidra.util.Msg; import ghidra.util.NumericUtilities; +@Ignore("deprecated") public class DbgEngTest extends AbstractGhidraHeadlessIntegrationTest { private interface DummyLibIf extends StdCallLibrary { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/manager/impl/SpawnedDbgManagerTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/manager/impl/SpawnedDbgManagerTest.java index 92da464037..bcb0c40b16 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/manager/impl/SpawnedDbgManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/manager/impl/SpawnedDbgManagerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,8 +17,11 @@ package agent.dbgeng.manager.impl; import java.util.concurrent.CompletableFuture; +import org.junit.Ignore; + import agent.dbgeng.manager.DbgManager; +@Ignore("deprecated") public class SpawnedDbgManagerTest extends AbstractDbgManagerTest { @Override protected CompletableFuture startManager(DbgManager manager) { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengBreakpointsTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengBreakpointsTest.java index 67c8e4f9cd..68a1aa9c6a 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengBreakpointsTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengBreakpointsTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,10 +15,13 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengBreakpointsTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class GadpModelForDbgengBreakpointsTest extends AbstractModelForDbgengBreakpointsTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFactoryTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFactoryTest.java index 2af5e65956..821fef44f3 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengFactoryTest; +@Ignore("deprecated") public class GadpModelForDbgengFactoryTest extends AbstractModelForDbgengFactoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFrameActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFrameActivationTest.java index 9cd2b46cc2..3efb0e1013 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFrameActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengFrameActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,13 +15,17 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengFrameActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class GadpModelForDbgengFrameActivationTest extends AbstractModelForDbgengFrameActivationTest { + @Override protected PathPattern getStackPattern() { return new PathPattern(PathUtils.parse("Sessions[0].Processes[].Threads[].Stack[]")); } diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengInterpreterTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengInterpreterTest.java index 65d603e3b7..fcc84569e6 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengInterpreterTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengInterpreterTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,7 @@ import org.junit.Test; import agent.dbgeng.model.AbstractModelForDbgengInterpreterTest; +@Ignore("deprecated") public class GadpModelForDbgengInterpreterTest extends AbstractModelForDbgengInterpreterTest { // NB: testLaunchViaInterpreterShowInProcessContainer fails diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengProcessActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengProcessActivationTest.java index fde546e80c..33409c5543 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengProcessActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengProcessActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,13 +17,17 @@ package agent.dbgeng.model.gadp; import java.util.List; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengProcessActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class GadpModelForDbgengProcessActivationTest extends AbstractModelForDbgengProcessActivationTest { + @Override protected PathPattern getProcessPattern() { return new PathPattern(PathUtils.parse("Sessions[0].Processes[]")); } @@ -38,6 +42,7 @@ public class GadpModelForDbgengProcessActivationTest return PathUtils.parse("Sessions[0]"); } + @Override public String getIdFromCapture(String line) { return line.split("\\s+")[1]; } diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootAttacherTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootAttacherTest.java index 8a2781e86b..82ae195c86 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengRootAttacherTest; +@Ignore("deprecated") public class GadpModelForDbgengRootAttacherTest extends AbstractModelForDbgengRootAttacherTest { // NB: testListAttachable fails with OTE - [] not invalidated diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootLauncherTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootLauncherTest.java index ec49f6fa84..5301114e72 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengRootLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengRootLauncherTest; +@Ignore("deprecated") public class GadpModelForDbgengRootLauncherTest extends AbstractModelForDbgengRootLauncherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioCloneExitTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioCloneExitTest.java index 43fbd71659..21bf709f0a 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioCloneExitTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioCloneExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioCloneExitTest; +@Ignore("deprecated") public class GadpModelForDbgengScenarioCloneExitTest extends AbstractModelForDbgengScenarioCloneExitTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioForkExitTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioForkExitTest.java index 5bb2afef9f..8f9d2af757 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioForkExitTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioForkExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,9 +20,11 @@ import org.junit.Test; import agent.dbgeng.model.AbstractModelForDbgengScenarioForkExitTest; +@Ignore("deprecated") public class GadpModelForDbgengScenarioForkExitTest extends AbstractModelForDbgengScenarioForkExitTest { + @Override @Ignore("Specimen is currently defunct") @Test public void testScenario() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioMemoryTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioMemoryTest.java index 682de3dae1..8321850128 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioMemoryTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioMemoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioMemoryTest; +@Ignore("deprecated") public class GadpModelForDbgengScenarioMemoryTest extends AbstractModelForDbgengScenarioMemoryTest { // NB: Fails on validateCompletionThread diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioStackTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioStackTest.java index 4e123f6552..f5cb8b78df 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioStackTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioStackTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioStackTest; +@Ignore("deprecated") public class GadpModelForDbgengScenarioStackTest extends AbstractModelForDbgengScenarioStackTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioX64RegistersTest.java index 11142fea8b..f5da866431 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengScenarioX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioX64RegistersTest; +@Ignore("deprecated") public class GadpModelForDbgengScenarioX64RegistersTest extends AbstractModelForDbgengScenarioX64RegistersTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSessionActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSessionActivationTest.java index 00847b3e6c..64ac2425dd 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSessionActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSessionActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,8 +19,9 @@ import org.junit.Ignore; import agent.dbgeng.model.AbstractModelForDbgengSessionActivationTest; -@Ignore("Don't know how to make multiple sessions") -public class GadpModelForDbgengSessionActivationTest extends AbstractModelForDbgengSessionActivationTest { +@Ignore("Don't know how to make multiple sessions, deprecated") +public class GadpModelForDbgengSessionActivationTest + extends AbstractModelForDbgengSessionActivationTest { @Override public ModelHost modelHost() throws Throwable { return new GadpDbgengModelHost(); diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSteppableTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSteppableTest.java index 083935e74f..1a5373b593 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSteppableTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengSteppableTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengSteppableTest; +@Ignore("deprecated") public class GadpModelForDbgengSteppableTest extends AbstractModelForDbgengSteppableTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengThreadActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengThreadActivationTest.java index cc6a6bf913..ca9b00f69f 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengThreadActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengThreadActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,13 +17,17 @@ package agent.dbgeng.model.gadp; import java.util.List; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengThreadActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class GadpModelForDbgengThreadActivationTest extends AbstractModelForDbgengThreadActivationTest { + @Override protected PathPattern getThreadPattern() { return new PathPattern(PathUtils.parse("Sessions[0].Processes[].Threads[]")); } @@ -38,6 +42,7 @@ public class GadpModelForDbgengThreadActivationTest return PathUtils.parse("Sessions[0]"); } + @Override public String getIdFromCapture(String line) { return line.split("\\s+")[1]; } diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengX64RegistersTest.java index 3cf2638c7e..eca50820d5 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/gadp/GadpModelForDbgengX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.gadp; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengX64RegistersTest; +@Ignore("deprecated") public class GadpModelForDbgengX64RegistersTest extends AbstractModelForDbgengX64RegistersTest { // NB: Fails testWriteRegisters diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmDbgengModelHost.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmDbgengModelHost.java index f6d784b9fd..42bf8a2633 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmDbgengModelHost.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmDbgengModelHost.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,14 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.DbgEngInJvmDebuggerModelFactory; import agent.dbgeng.dbgeng.DbgEngTest; import agent.dbgeng.model.AbstractDbgengModelHost; import ghidra.dbg.DebuggerModelFactory; +@Ignore("deprecated") public class InVmDbgengModelHost extends AbstractDbgengModelHost { @Override public DebuggerModelFactory getModelFactory() { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengBreakpointsTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengBreakpointsTest.java index 317c512fdc..2b6550971d 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengBreakpointsTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengBreakpointsTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,10 +15,15 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengBreakpointsTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgengBreakpointsTest extends AbstractModelForDbgengBreakpointsTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFactoryTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFactoryTest.java index 0810619534..c82fadd6d1 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengFactoryTest; +@Ignore("deprecated") public class InVmModelForDbgengFactoryTest extends AbstractModelForDbgengFactoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFrameActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFrameActivationTest.java index 8be720439b..62b1f857c1 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFrameActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengFrameActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,13 +15,17 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengFrameActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgengFrameActivationTest extends AbstractModelForDbgengFrameActivationTest { + @Override protected PathPattern getStackPattern() { return new PathPattern(PathUtils.parse("Sessions[0].Processes[].Threads[].Stack[]")); } diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengInterpreterTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengInterpreterTest.java index 9e3d3982d3..74d6dcdc2e 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengInterpreterTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengInterpreterTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,6 +21,7 @@ import org.junit.Test; import agent.dbgeng.model.AbstractModelForDbgengInterpreterTest; import ghidra.dbg.error.DebuggerModelTerminatingException; +@Ignore("deprecated") public class InVmModelForDbgengInterpreterTest extends AbstractModelForDbgengInterpreterTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengProcessActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengProcessActivationTest.java index 5e8947ce56..5b2a7c2892 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengProcessActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengProcessActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,13 +17,17 @@ package agent.dbgeng.model.invm; import java.util.List; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengProcessActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgengProcessActivationTest extends AbstractModelForDbgengProcessActivationTest { + @Override protected PathPattern getProcessPattern() { return new PathPattern(PathUtils.parse("Sessions[0].Processes[]")); } @@ -38,6 +42,7 @@ public class InVmModelForDbgengProcessActivationTest return PathUtils.parse("Sessions[0]"); } + @Override public String getIdFromCapture(String line) { return line.split("\\s+")[1]; } diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootAttacherTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootAttacherTest.java index 5597327acb..333a52db54 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,7 @@ import org.junit.Test; import agent.dbgeng.model.AbstractModelForDbgengRootAttacherTest; +@Ignore("deprecated") public class InVmModelForDbgengRootAttacherTest extends AbstractModelForDbgengRootAttacherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootLauncherTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootLauncherTest.java index 85dfb66129..0339e40be6 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengRootLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengRootLauncherTest; +@Ignore("deprecated") public class InVmModelForDbgengRootLauncherTest extends AbstractModelForDbgengRootLauncherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioCloneExitTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioCloneExitTest.java index 72fb2aef73..34753420e5 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioCloneExitTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioCloneExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioCloneExitTest; +@Ignore("deprecated") public class InVmModelForDbgengScenarioCloneExitTest extends AbstractModelForDbgengScenarioCloneExitTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioForkExitTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioForkExitTest.java index 988cd2c13e..c3eae4d934 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioForkExitTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioForkExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,9 +20,11 @@ import org.junit.Test; import agent.dbgeng.model.AbstractModelForDbgengScenarioForkExitTest; +@Ignore("deprecated") public class InVmModelForDbgengScenarioForkExitTest extends AbstractModelForDbgengScenarioForkExitTest { + @Override @Ignore("Specimen is currently defunct") @Test public void testScenario() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioMemoryTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioMemoryTest.java index 98b238b089..a3c32f6474 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioMemoryTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioMemoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioMemoryTest; +@Ignore("deprecated") public class InVmModelForDbgengScenarioMemoryTest extends AbstractModelForDbgengScenarioMemoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioStackTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioStackTest.java index 6dad9ca48f..10aeeaa790 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioStackTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioStackTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioStackTest; +@Ignore("deprecated") public class InVmModelForDbgengScenarioStackTest extends AbstractModelForDbgengScenarioStackTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioX64RegistersTest.java index c175e300fd..aa8b62f6a5 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengScenarioX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioX64RegistersTest; +@Ignore("deprecated") public class InVmModelForDbgengScenarioX64RegistersTest extends AbstractModelForDbgengScenarioX64RegistersTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSessionActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSessionActivationTest.java index 691650e8d5..4126caebae 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSessionActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSessionActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,8 +19,9 @@ import org.junit.Ignore; import agent.dbgeng.model.AbstractModelForDbgengSessionActivationTest; -@Ignore("Don't know how to make multiple sessions") -public class InVmModelForDbgengSessionActivationTest extends AbstractModelForDbgengSessionActivationTest { +@Ignore("Don't know how to make multiple sessions, deprecated") +public class InVmModelForDbgengSessionActivationTest + extends AbstractModelForDbgengSessionActivationTest { @Override public ModelHost modelHost() throws Throwable { return new InVmDbgengModelHost(); diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSteppableTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSteppableTest.java index 6d24173a11..fc257236d9 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSteppableTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengSteppableTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengSteppableTest; +@Ignore("deprecated") public class InVmModelForDbgengSteppableTest extends AbstractModelForDbgengSteppableTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengThreadActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengThreadActivationTest.java index d4d2291e66..303a24086b 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengThreadActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengThreadActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,13 +17,17 @@ package agent.dbgeng.model.invm; import java.util.List; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengThreadActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgengThreadActivationTest extends AbstractModelForDbgengThreadActivationTest { + @Override protected PathPattern getThreadPattern() { return new PathPattern(PathUtils.parse("Sessions[0].Processes[].Threads[]")); } @@ -38,6 +42,7 @@ public class InVmModelForDbgengThreadActivationTest return PathUtils.parse("Sessions[0]"); } + @Override public String getIdFromCapture(String line) { return line.split("\\s+")[1]; } diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengX64RegistersTest.java index c43244257b..c2dc159165 100644 --- a/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgeng/src/test/java/agent/dbgeng/model/invm/InVmModelForDbgengX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgeng.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengX64RegistersTest; +@Ignore("deprecated") public class InVmModelForDbgengX64RegistersTest extends AbstractModelForDbgengX64RegistersTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelSetContextMWETest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelSetContextMWETest.java index e7bb33f51d..340d7da16e 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelSetContextMWETest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelSetContextMWETest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,8 +21,7 @@ import static org.junit.Assert.assertNotNull; import java.io.*; import java.util.*; -import org.junit.Before; -import org.junit.Test; +import org.junit.*; import agent.dbgeng.dbgeng.*; import agent.dbgeng.dbgeng.DebugBreakpoint.BreakFlags; @@ -37,6 +36,7 @@ import ghidra.dbg.util.PathUtils; import ghidra.test.AbstractGhidraHeadlessIntegrationTest; import ghidra.util.Msg; +@Ignore("deprecated") public class DbgModelSetContextMWETest extends AbstractGhidraHeadlessIntegrationTest { @Before diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelTest.java index f4c615f5f8..0166d4a123 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/dbgmodel/DbgModelTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,8 +22,7 @@ import java.nio.ByteBuffer; import java.util.*; import java.util.concurrent.CompletableFuture; -import org.junit.Before; -import org.junit.Test; +import org.junit.*; import com.sun.jna.Pointer; import com.sun.jna.WString; @@ -53,6 +52,7 @@ import agent.dbgmodel.jna.dbgmodel.UnknownWithUtils; import ghidra.test.AbstractGhidraHeadlessIntegrationTest; import ghidra.util.NumericUtilities; +@Ignore("deprecated") public class DbgModelTest extends AbstractGhidraHeadlessIntegrationTest { protected static HostDataModelAccess cachedAccess = null; protected static DebugClient cachedClient = null; diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelBreakpointsTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelBreakpointsTest.java index 3a9ef913bf..292677cf29 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelBreakpointsTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelBreakpointsTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,10 +15,13 @@ */ package agent.dbgmodel.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengBreakpointsTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgmodelBreakpointsTest extends AbstractModelForDbgengBreakpointsTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFactoryTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFactoryTest.java index e1a5409b79..9ba3704e44 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,9 +15,12 @@ */ package agent.dbgmodel.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengFactoryTest; import ghidra.dbg.testutil.TestDebuggerModelProvider.ModelHost.WithoutThreadValidation; +@Ignore("deprecated") public class InVmModelForDbgmodelFactoryTest extends AbstractModelForDbgengFactoryTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFrameActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFrameActivationTest.java index 1b2321c979..b25273bace 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFrameActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelFrameActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,13 +15,17 @@ */ package agent.dbgmodel.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengFrameActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgmodelFrameActivationTest extends AbstractModelForDbgengFrameActivationTest { + @Override protected PathPattern getStackPattern() { return new PathPattern( PathUtils.parse("Sessions[0x0].Processes[].Threads[].Stack.Frames[]")); diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelInterpreterTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelInterpreterTest.java index 6f27fd722f..7c1cbeea9f 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelInterpreterTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelInterpreterTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,6 +32,7 @@ import ghidra.dbg.test.AbstractDebuggerModelTest; import ghidra.dbg.test.ProvidesTargetViaLaunchSpecimen; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgmodelInterpreterTest extends AbstractModelForDbgengInterpreterTest implements ProvidesTargetViaLaunchSpecimen { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelProcessActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelProcessActivationTest.java index 25c6340227..386fead163 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelProcessActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelProcessActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,15 +17,19 @@ package agent.dbgmodel.model.invm; import java.util.List; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengProcessActivationTest; import ghidra.dbg.target.TargetInterpreter; import ghidra.dbg.target.TargetObject; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgmodelProcessActivationTest extends AbstractModelForDbgengProcessActivationTest { + @Override protected PathPattern getProcessPattern() { return new PathPattern(PathUtils.parse("Sessions[0x0].Processes[]")); } @@ -40,6 +44,7 @@ public class InVmModelForDbgmodelProcessActivationTest return PathUtils.parse("Sessions[0x0]"); } + @Override public String getIdFromCapture(String line) { return "0x" + line.split("\\s+")[3]; } diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootAttacherTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootAttacherTest.java index 2ae5b52e61..f5433dec39 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,7 @@ import org.junit.Test; import agent.dbgeng.model.AbstractModelForDbgengRootAttacherTest; +@Ignore("deprecated") public class InVmModelForDbgmodelRootAttacherTest extends AbstractModelForDbgengRootAttacherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootLauncherTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootLauncherTest.java index c37eeb9fbd..3a0d73e902 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelRootLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgmodel.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengRootLauncherTest; +@Ignore("deprecated") public class InVmModelForDbgmodelRootLauncherTest extends AbstractModelForDbgengRootLauncherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioCloneExitTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioCloneExitTest.java index 9e111a3332..700d59213a 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioCloneExitTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioCloneExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgmodel.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioCloneExitTest; +@Ignore("deprecated") public class InVmModelForDbgmodelScenarioCloneExitTest extends AbstractModelForDbgengScenarioCloneExitTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioForkExitTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioForkExitTest.java index 9817d941d0..7105156b4e 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioForkExitTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioForkExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,9 +20,11 @@ import org.junit.Test; import agent.dbgeng.model.AbstractModelForDbgengScenarioForkExitTest; +@Ignore("deprecated") public class InVmModelForDbgmodelScenarioForkExitTest extends AbstractModelForDbgengScenarioForkExitTest { + @Override @Ignore("Specimen is currently defunct") @Test public void testScenario() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioMemoryTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioMemoryTest.java index 2d6e184905..8c32893b3d 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioMemoryTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioMemoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,6 +17,8 @@ package agent.dbgmodel.model.invm; import java.util.*; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioMemoryTest; import ghidra.dbg.target.TargetModule; import ghidra.dbg.target.TargetProcess; @@ -24,6 +26,7 @@ import ghidra.dbg.util.PathUtils; import ghidra.program.model.address.Address; import ghidra.program.model.address.AddressRange; +@Ignore("deprecated") public class InVmModelForDbgmodelScenarioMemoryTest extends AbstractModelForDbgengScenarioMemoryTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioStackTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioStackTest.java index ded0fb1c37..e09e965598 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioStackTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioStackTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,10 +15,13 @@ */ package agent.dbgmodel.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioStackTest; import ghidra.dbg.target.TargetProcess; import ghidra.program.model.address.Address; +@Ignore("deprecated") public class InVmModelForDbgmodelScenarioStackTest extends AbstractModelForDbgengScenarioStackTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioX64RegistersTest.java index f19ae4bde4..afa5d300be 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelScenarioX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgmodel.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengScenarioX64RegistersTest; +@Ignore("deprecated") public class InVmModelForDbgmodelScenarioX64RegistersTest extends AbstractModelForDbgengScenarioX64RegistersTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSessionActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSessionActivationTest.java index 2061ea96a4..1ef3e0a1f3 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSessionActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSessionActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,8 +19,9 @@ import org.junit.Ignore; import agent.dbgeng.model.AbstractModelForDbgengSessionActivationTest; -@Ignore("Don't know how to make multiple sessions") -public class InVmModelForDbgmodelSessionActivationTest extends AbstractModelForDbgengSessionActivationTest { +@Ignore("Don't know how to make multiple sessions, deprecated") +public class InVmModelForDbgmodelSessionActivationTest + extends AbstractModelForDbgengSessionActivationTest { @Override public ModelHost modelHost() throws Throwable { return new InVmDbgmodelModelHost(); diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSteppableTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSteppableTest.java index 3dcfcb14c9..0bfe92eb6b 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSteppableTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelSteppableTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.dbgmodel.model.invm; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengSteppableTest; +@Ignore("deprecated") public class InVmModelForDbgmodelSteppableTest extends AbstractModelForDbgengSteppableTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelThreadActivationTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelThreadActivationTest.java index 10c885f59b..a697e4cc6d 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelThreadActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelThreadActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,15 +17,19 @@ package agent.dbgmodel.model.invm; import java.util.List; +import org.junit.Ignore; + import agent.dbgeng.model.AbstractModelForDbgengThreadActivationTest; import ghidra.dbg.target.TargetInterpreter; import ghidra.dbg.target.TargetObject; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgmodelThreadActivationTest extends AbstractModelForDbgengThreadActivationTest { + @Override protected PathPattern getThreadPattern() { return new PathPattern(PathUtils.parse("Sessions[0x0].Processes[].Threads[]")); } @@ -40,6 +44,7 @@ public class InVmModelForDbgmodelThreadActivationTest return PathUtils.parse("Sessions[0x0]"); } + @Override public String getIdFromCapture(String line) { return "0x" + line.split("\\s+")[3].split("\\.")[1]; } diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelX64RegistersTest.java index 15d05af07d..92e2f750e5 100644 --- a/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-dbgmodel/src/test/java/agent/dbgmodel/model/invm/InVmModelForDbgmodelX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,6 +24,7 @@ import org.junit.Test; import agent.dbgeng.model.AbstractModelForDbgengX64RegistersTest; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForDbgmodelX64RegistersTest extends AbstractModelForDbgengX64RegistersTest { public final Map REG_VALSX = Map.ofEntries( diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaFactoryTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaFactoryTest.java index 7eed21f066..28eea867da 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.frida.model.gadp; +import org.junit.Ignore; + import agent.frida.model.AbstractModelForFridaFactoryTest; +@Ignore("deprecated") public class GadpModelForFridaFactoryTest extends AbstractModelForFridaFactoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaInterpreterTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaInterpreterTest.java index 2a949604e6..b506a3bf1f 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaInterpreterTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaInterpreterTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,8 @@ import org.junit.Test; import agent.frida.model.AbstractModelForFridaInterpreterTest; import ghidra.dbg.test.ProvidesTargetViaLaunchSpecimen; -public class GadpModelForFridaInterpreterTest extends AbstractModelForFridaInterpreterTest +@Ignore("deprecated") +public class GadpModelForFridaInterpreterTest extends AbstractModelForFridaInterpreterTest implements ProvidesTargetViaLaunchSpecimen { @Override public ModelHost modelHost() throws Throwable { @@ -61,4 +62,3 @@ public class GadpModelForFridaInterpreterTest extends AbstractModelForFridaInter } } - diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaRootLauncherTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaRootLauncherTest.java index cf080d57b0..55f5183943 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaRootLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaRootLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.frida.model.gadp; +import org.junit.Ignore; + import agent.frida.model.AbstractModelForFridaRootLauncherTest; +@Ignore("deprecated") public class GadpModelForFridaRootLauncherTest extends AbstractModelForFridaRootLauncherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaScenarioStackTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaScenarioStackTest.java index 714bd70fc6..df70819e9b 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaScenarioStackTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaScenarioStackTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.frida.model.gadp; +import org.junit.Ignore; + import agent.frida.model.AbstractModelForFridaScenarioStackTest; +@Ignore("deprecated") public class GadpModelForFridaScenarioStackTest extends AbstractModelForFridaScenarioStackTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaX64RegistersTest.java index af03676535..43ccb22c4d 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/gadp/GadpModelForFridaX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,13 +15,16 @@ */ package agent.frida.model.gadp; +import org.junit.Ignore; + import agent.frida.model.AbstractModelForFridaX64RegistersTest; +@Ignore("deprecated") public class GadpModelForFridaX64RegistersTest extends AbstractModelForFridaX64RegistersTest { @Override public ModelHost modelHost() throws Throwable { return new GadpFridaModelHost(); } - + } diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaFactoryTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaFactoryTest.java index 220888f928..a46c4ebfdc 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.frida.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.frida.model.AbstractModelForFridaFactoryTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForFridaFactoryTest extends AbstractModelForFridaFactoryTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaInterpreterTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaInterpreterTest.java index 3b18537083..0268476f31 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaInterpreterTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaInterpreterTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,6 +23,7 @@ import agent.frida.model.AbstractModelForFridaInterpreterTest; import generic.test.category.NightlyCategory; import ghidra.dbg.test.ProvidesTargetViaLaunchSpecimen; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForFridaInterpreterTest extends AbstractModelForFridaInterpreterTest implements ProvidesTargetViaLaunchSpecimen { diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaMethodsTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaMethodsTest.java index 20a862a90a..374d1e2d60 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaMethodsTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaMethodsTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.frida.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.frida.model.AbstractModelForFridaMethodsTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForFridaMethodsTest extends AbstractModelForFridaMethodsTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaRootAttacherTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaRootAttacherTest.java index 23e545f24b..b84cd70da4 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaRootAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaRootAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,6 +22,7 @@ import org.junit.experimental.categories.Category; import agent.frida.model.AbstractModelForFridaRootAttacherTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForFridaRootAttacherTest extends AbstractModelForFridaRootAttacherTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaRootLauncherTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaRootLauncherTest.java index 1f101aaeea..9db202d577 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaRootLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaRootLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.frida.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.frida.model.AbstractModelForFridaRootLauncherTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForFridaRootLauncherTest extends AbstractModelForFridaRootLauncherTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaScenarioStackTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaScenarioStackTest.java index a922224ec1..060f98e276 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaScenarioStackTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaScenarioStackTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.frida.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.frida.model.AbstractModelForFridaScenarioStackTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForFridaScenarioStackTest extends AbstractModelForFridaScenarioStackTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaX64RegistersTest.java index c5152c2aca..01c2c90e0a 100644 --- a/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-frida/src/test/java/agent/frida/model/invm/InVmModelForFridaX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.frida.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.frida.model.AbstractModelForFridaX64RegistersTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForFridaX64RegistersTest extends AbstractModelForFridaX64RegistersTest { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/GdbTableTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/GdbTableTest.java index 1945d677b1..7c1108312d 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/GdbTableTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/GdbTableTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,10 +20,12 @@ import static org.junit.Assert.*; import java.util.*; import java.util.function.Consumer; +import org.junit.Ignore; import org.junit.Test; import agent.gdb.manager.parsing.GdbMiParser.GdbMiFieldList; +@Ignore("deprecated") public class GdbTableTest { protected GdbMiFieldList buildFieldList(Consumer conf) { GdbMiFieldList.Builder builder = GdbMiFieldList.builder(); diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/GdbCValueParserTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/GdbCValueParserTest.java index f34b93f5e9..4a274adfc3 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/GdbCValueParserTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/GdbCValueParserTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,12 +18,14 @@ package agent.gdb.manager.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import org.junit.Ignore; import org.junit.Test; import agent.gdb.manager.parsing.GdbCValueParser; import agent.gdb.manager.parsing.GdbCValueParser.*; import agent.gdb.manager.parsing.GdbParsingUtils.GdbParseError; +@Ignore("deprecated") public class GdbCValueParserTest { @Test public void testIntegerZero() throws GdbParseError { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/GdbReadRegistersCommandTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/GdbReadRegistersCommandTest.java index 414014f522..a3cd88541b 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/GdbReadRegistersCommandTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/GdbReadRegistersCommandTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,10 +20,12 @@ import static org.junit.Assert.assertEquals; import java.math.BigInteger; import java.nio.ByteOrder; +import org.junit.Ignore; import org.junit.Test; import agent.gdb.manager.impl.cmd.GdbReadRegistersCommand; +@Ignore("deprecated") public class GdbReadRegistersCommandTest { @Test public void testParseAndFindInteger_Integer() throws Exception { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java index d05850d29a..e0ce81b102 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/JoinedGdbManagerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,7 @@ import ghidra.pty.linux.LinuxIoctls; import ghidra.pty.unix.UnixPty; import ghidra.util.Msg; -@Ignore("Need compatible GDB version for CI") +@Ignore("Need compatible GDB version for CI, deprecated") public class JoinedGdbManagerTest extends AbstractGdbManagerTest { protected class ReaderThread extends Thread { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java index 5e8c43b73d..a1e0e1427b 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedCliGdbManagerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,7 @@ import org.junit.Ignore; import agent.gdb.manager.GdbManager; -@Ignore("Need compatible GDB version for CI") +@Ignore("Need compatible GDB version for CI, deprecated") public class SpawnedCliGdbManagerTest extends AbstractGdbManagerTest { @Override protected CompletableFuture startManager(GdbManager manager) { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java index 27e287b3dc..3accf3d318 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2Gdb7Dot6Dot1ManagerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,7 +23,7 @@ import org.junit.Ignore; import agent.gdb.manager.GdbManager; -@Ignore("Need to install GDB 7.6.1 to the expected directory on CI") +@Ignore("Need to install GDB 7.6.1 to the expected directory on CI, deprecated") public class SpawnedMi2Gdb7Dot6Dot1ManagerTest extends AbstractGdbManagerTest { @Override protected File findGdbBin() { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbHomeLocalManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbHomeLocalManagerTest.java index 932c4426f2..c035f74b3d 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbHomeLocalManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbHomeLocalManagerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,7 +23,7 @@ import org.junit.Ignore; import agent.gdb.manager.GdbManager; -@Ignore("Does not exist on CI") +@Ignore("Does not exist on CI, deprecated") public class SpawnedMi2GdbHomeLocalManagerTest extends AbstractGdbManagerTest { @Override protected File findGdbBin() { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbSystemManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbSystemManagerTest.java index b593e4b89c..5b7130ed3a 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbSystemManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedMi2GdbSystemManagerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,7 @@ import org.junit.Ignore; import agent.gdb.manager.GdbManager; -@Ignore("Need compatible version install on CI") +@Ignore("Need compatible version install on CI, deprecated") public class SpawnedMi2GdbSystemManagerTest extends AbstractGdbManagerTest { @Override protected CompletableFuture startManager(GdbManager manager) { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedWindowsMi2GdbManagerTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedWindowsMi2GdbManagerTest.java index 7d799eed87..8664f9740d 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedWindowsMi2GdbManagerTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/impl/SpawnedWindowsMi2GdbManagerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,7 @@ import org.junit.Ignore; import agent.gdb.manager.GdbManager; -@Ignore("Need compatible version on CI") +@Ignore("Need compatible version on CI, deprecated") public class SpawnedWindowsMi2GdbManagerTest extends AbstractGdbManagerTest { @Override protected CompletableFuture startManager(GdbManager manager) { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/parsing/GdbMiParserTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/parsing/GdbMiParserTest.java index fa09bcd0c2..58185495a5 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/parsing/GdbMiParserTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/manager/parsing/GdbMiParserTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,11 +22,13 @@ import java.util.List; import java.util.function.Consumer; import java.util.regex.Pattern; +import org.junit.Ignore; import org.junit.Test; import agent.gdb.manager.parsing.GdbMiParser.GdbMiFieldList; import agent.gdb.manager.parsing.GdbParsingUtils.GdbParseError; +@Ignore("deprecated") public class GdbMiParserTest { protected GdbMiFieldList buildFieldList(Consumer conf) { GdbMiFieldList.Builder builder = GdbMiFieldList.builder(); diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbBreakpointsTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbBreakpointsTest.java index 712978f45a..2e93807a0c 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbBreakpointsTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbBreakpointsTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.gadp; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbBreakpointsTest; +@Ignore("deprecated") public class GadpModelForGdbBreakpointsTest extends AbstractModelForGdbBreakpointsTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbFactoryTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbFactoryTest.java index 4ff603250a..e519cfdb25 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.gadp; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbFactoryTest; +@Ignore("deprecated") public class GadpModelForGdbFactoryTest extends AbstractModelForGdbFactoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInferiorAttacherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInferiorAttacherTest.java index c22340156a..cfd0c162ab 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInferiorAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInferiorAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.gadp; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbInferiorAttacherTest; +@Ignore("deprecated") public class GadpModelForGdbInferiorAttacherTest extends AbstractModelForGdbInferiorAttacherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInferiorLauncherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInferiorLauncherTest.java index 1fe604ae15..75b68a2902 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInferiorLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInferiorLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.gadp; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbInferiorLauncherTest; +@Ignore("deprecated") public class GadpModelForGdbInferiorLauncherTest extends AbstractModelForGdbInferiorLauncherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInterpreterTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInterpreterTest.java index 9f676bb5b6..1d6100d9bb 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInterpreterTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbInterpreterTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.gadp; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbInterpreterTest; +@Ignore("deprecated") public class GadpModelForGdbInterpreterTest extends AbstractModelForGdbInterpreterTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbScenarioForkExitTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbScenarioForkExitTest.java index 2433cb033e..bef358121b 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbScenarioForkExitTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbScenarioForkExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.gadp; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbScenarioForkExitTest; +@Ignore("deprecated") public class GadpModelForGdbScenarioForkExitTest extends AbstractModelForGdbScenarioForkExitTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbSessionAttacherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbSessionAttacherTest.java index ed5262a81e..4626b48638 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbSessionAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbSessionAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.gadp; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbSessionAttacherTest; +@Ignore("deprecated") public class GadpModelForGdbSessionAttacherTest extends AbstractModelForGdbSessionAttacherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbSessionLauncherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbSessionLauncherTest.java index d874ca154a..c30dad5a68 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbSessionLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/gadp/GadpModelForGdbSessionLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.gadp; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbSessionLauncherTest; +@Ignore("deprecated") public class GadpModelForGdbSessionLauncherTest extends AbstractModelForGdbSessionLauncherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbAmd64RegistersTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbAmd64RegistersTest.java index 115c326f41..135371146b 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbAmd64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbAmd64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbAmd64RegistersTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbAmd64RegistersTest extends AbstractModelForGdbAmd64RegistersTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbBreakpointsTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbBreakpointsTest.java index 533abd6520..3dfc41a542 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbBreakpointsTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbBreakpointsTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbBreakpointsTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbBreakpointsTest extends AbstractModelForGdbBreakpointsTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbFactoryTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbFactoryTest.java index 2cbd32368c..9fac61a0bc 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbFactoryTest; +@Ignore("deprecated") public class InVmModelForGdbFactoryTest extends AbstractModelForGdbFactoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbFrameActivationTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbFrameActivationTest.java index 328695192b..d020f9c26c 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbFrameActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbFrameActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbFrameActivationTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbFrameActivationTest extends AbstractModelForGdbFrameActivationTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorActivationTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorActivationTest.java index 537af846d4..10c9c2ce57 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,9 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbInferiorActivationTest; -public class InVmModelForGdbInferiorActivationTest extends AbstractModelForGdbInferiorActivationTest { +@Ignore("deprecated") +public class InVmModelForGdbInferiorActivationTest + extends AbstractModelForGdbInferiorActivationTest { @Override public ModelHost modelHost() throws Throwable { return new InVmGdbModelHost(); diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorAttacherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorAttacherTest.java index f44e47a463..b4c756c5aa 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,6 +24,7 @@ import agent.gdb.model.AbstractModelForGdbInferiorAttacherTest; import ghidra.util.Msg; import ghidra.util.SystemUtilities; +@Ignore("deprecated") public class InVmModelForGdbInferiorAttacherTest extends AbstractModelForGdbInferiorAttacherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorLauncherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorLauncherTest.java index e173613677..7cd663a470 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInferiorLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbInferiorLauncherTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbInferiorLauncherTest extends AbstractModelForGdbInferiorLauncherTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInterpreterTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInterpreterTest.java index 40cc5f42d5..313c4c9917 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInterpreterTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbInterpreterTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbInterpreterTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbInterpreterTest extends AbstractModelForGdbInterpreterTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioAmd64RegistersTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioAmd64RegistersTest.java index 24256d5cec..ef69d27048 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioAmd64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioAmd64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbScenarioAmd64RegistersTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbScenarioAmd64RegistersTest extends AbstractModelForGdbScenarioAmd64RegistersTest { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioCloneExitTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioCloneExitTest.java index 5d12c11a78..fd27ff04a0 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioCloneExitTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioCloneExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbScenarioCloneExitTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbScenarioCloneExitTest extends AbstractModelForGdbScenarioCloneExitTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioForkExitTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioForkExitTest.java index c52be68e85..6fbb4b8e8f 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioForkExitTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioForkExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,7 +19,7 @@ import org.junit.Ignore; import agent.gdb.model.AbstractModelForGdbScenarioForkExitTest; -@Ignore +@Ignore("deprecated") public class InVmModelForGdbScenarioForkExitTest extends AbstractModelForGdbScenarioForkExitTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioMemoryTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioMemoryTest.java index 0694279b68..56433ac18d 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioMemoryTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioMemoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,7 +19,7 @@ import org.junit.Ignore; import agent.gdb.model.AbstractModelForGdbScenarioMemoryTest; -@Ignore +@Ignore("deprecated") public class InVmModelForGdbScenarioMemoryTest extends AbstractModelForGdbScenarioMemoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioStackTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioStackTest.java index 8884fef419..27a55f700a 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioStackTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbScenarioStackTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,7 +19,7 @@ import org.junit.Ignore; import agent.gdb.model.AbstractModelForGdbScenarioStackTest; -@Ignore +@Ignore("deprecated") public class InVmModelForGdbScenarioStackTest extends AbstractModelForGdbScenarioStackTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSessionAttacherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSessionAttacherTest.java index bb9a474e52..fd838667de 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSessionAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSessionAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; + import agent.gdb.model.AbstractModelForGdbSessionAttacherTest; +@Ignore("deprecated") public class InVmModelForGdbSessionAttacherTest extends AbstractModelForGdbSessionAttacherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSessionLauncherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSessionLauncherTest.java index 784af96bb2..123929b1c8 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSessionLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSessionLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbSessionLauncherTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbSessionLauncherTest extends AbstractModelForGdbSessionLauncherTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSteppableTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSteppableTest.java index 09b11a05ba..9744c7fec4 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSteppableTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbSteppableTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,11 +15,13 @@ */ package agent.gdb.model.invm; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbSteppableTest; import generic.test.category.NightlyCategory; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class InVmModelForGdbSteppableTest extends AbstractModelForGdbSteppableTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbThreadActivationTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbThreadActivationTest.java index 2f2fb23749..72a8703579 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbThreadActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/invm/InVmModelForGdbThreadActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,7 +19,7 @@ import org.junit.Ignore; import agent.gdb.model.AbstractModelForGdbThreadActivationTest; -@Ignore +@Ignore("deprecated") public class InVmModelForGdbThreadActivationTest extends AbstractModelForGdbThreadActivationTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshJoinModelForGdbFactoryTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshJoinModelForGdbFactoryTest.java index 76eb0bb2a8..d9f993dfde 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshJoinModelForGdbFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshJoinModelForGdbFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,10 +18,12 @@ package agent.gdb.model.ssh; import static org.junit.Assume.assumeFalse; import org.junit.Before; +import org.junit.Ignore; import agent.gdb.model.AbstractModelForGdbFactoryTest; import ghidra.util.SystemUtilities; +@Ignore("deprecated") public class SshJoinModelForGdbFactoryTest extends AbstractModelForGdbFactoryTest { @Before diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshJoinModelForGdbSessionLauncherTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshJoinModelForGdbSessionLauncherTest.java index a248b99101..311edd1c47 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshJoinModelForGdbSessionLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshJoinModelForGdbSessionLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,12 +18,14 @@ package agent.gdb.model.ssh; import static org.junit.Assume.assumeFalse; import org.junit.Before; +import org.junit.Ignore; import org.junit.experimental.categories.Category; import agent.gdb.model.AbstractModelForGdbSessionLauncherTest; import generic.test.category.NightlyCategory; import ghidra.util.SystemUtilities; +@Ignore("deprecated") @Category(NightlyCategory.class) // this may actually be an @PortSensitive test public class SshJoinModelForGdbSessionLauncherTest extends AbstractModelForGdbSessionLauncherTest { diff --git a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshModelForGdbFactoryTest.java b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshModelForGdbFactoryTest.java index 7bbaa556ce..d4fe9c3e5c 100644 --- a/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshModelForGdbFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-gdb/src/test/java/agent/gdb/model/ssh/SshModelForGdbFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,10 +18,12 @@ package agent.gdb.model.ssh; import static org.junit.Assume.assumeFalse; import org.junit.Before; +import org.junit.Ignore; import agent.gdb.model.AbstractModelForGdbFactoryTest; import ghidra.util.SystemUtilities; +@Ignore("deprecated") public class SshModelForGdbFactoryTest extends AbstractModelForGdbFactoryTest { @Before diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/lldb/LLDBTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/lldb/LLDBTest.java index 7482d50703..6f95aa92d7 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/lldb/LLDBTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/lldb/LLDBTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,18 +22,13 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.CompletableFuture; -import org.junit.Before; -import org.junit.Test; +import org.junit.*; -import SWIG.SBDebugger; -import SWIG.SBProcess; -import SWIG.SBProcessInfo; -import SWIG.SBTarget; -import SWIG.SBThread; -import SWIG.StateType; +import SWIG.*; import ghidra.test.AbstractGhidraHeadlessIntegrationTest; import ghidra.util.Msg; +@Ignore("deprecated") public class LLDBTest extends AbstractGhidraHeadlessIntegrationTest { public static void assumeLibLoadable() { diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbBreakpointsTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbBreakpointsTest.java index 8a26fe61ea..d61840a148 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbBreakpointsTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbBreakpointsTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,10 +19,10 @@ import org.junit.Ignore; import org.junit.Test; import agent.lldb.model.AbstractModelForLldbBreakpointsTest; -import ghidra.dbg.target.TargetBreakpointSpec.TargetBreakpointKind; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForLldbBreakpointsTest extends AbstractModelForLldbBreakpointsTest { @Override @@ -34,10 +34,10 @@ public class InVmModelForLldbBreakpointsTest extends AbstractModelForLldbBreakpo public ModelHost modelHost() throws Throwable { return new InVmLldbModelHost(); } - + // The following tests are being ignored because the target doesn't generate // breakpointAdded/Modified events on placement, only on resume - + @Override @Ignore @Test @@ -94,17 +94,16 @@ public class InVmModelForLldbBreakpointsTest extends AbstractModelForLldbBreakpo super.testToggleBreakpointLocationsViaInterpreter(); } - // These have a similar problem enabled/disabled & cleared for watchpoints // appear to occur on resume - + @Override @Ignore @Test public void testDeleteBreakpoints() throws Throwable { super.testDeleteBreakpoints(); } - + @Override @Ignore @Test diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbFactoryTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbFactoryTest.java index ff414fc161..51d6a2eaf9 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbFactoryTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbFactoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.lldb.model.invm; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbFactoryTest; +@Ignore("deprecated") public class InVmModelForLldbFactoryTest extends AbstractModelForLldbFactoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbFrameActivationTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbFrameActivationTest.java index 4ff753fd0e..7fd0bd8cdc 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbFrameActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbFrameActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,13 +17,17 @@ package agent.lldb.model.invm; import java.util.List; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbFrameActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForLldbFrameActivationTest extends AbstractModelForLldbFrameActivationTest { + @Override protected PathPattern getStackPattern() { return new PathPattern(PathUtils.parse("Sessions[].Processes[].Threads[].Stack[]")); } @@ -32,14 +36,15 @@ public class InVmModelForLldbFrameActivationTest protected List getExpectedDefaultActivePath() { return PathUtils.parse("Sessions[].Processes[].Threads[].Stack[0]"); } - + + @Override public String getIdFromCapture(String line) { // Syntax "frame #N:..." String[] split = line.split(":"); split = split[0].split("#"); return split[1]; } - + @Override public ModelHost modelHost() throws Throwable { return new InVmLldbModelHost(); diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbInterpreterTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbInterpreterTest.java index 69ef89b569..4dfae949db 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbInterpreterTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbInterpreterTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,8 @@ import org.junit.Test; import agent.lldb.model.AbstractModelForLldbInterpreterTest; import ghidra.dbg.test.ProvidesTargetViaLaunchSpecimen; -public class InVmModelForLldbInterpreterTest extends AbstractModelForLldbInterpreterTest +@Ignore("deprecated") +public class InVmModelForLldbInterpreterTest extends AbstractModelForLldbInterpreterTest implements ProvidesTargetViaLaunchSpecimen { @Override public ModelHost modelHost() throws Throwable { @@ -61,4 +62,3 @@ public class InVmModelForLldbInterpreterTest extends AbstractModelForLldbInterpr } } - diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbProcessActivationTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbProcessActivationTest.java index 392ce4b8c3..102656a917 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbProcessActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbProcessActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,10 +17,13 @@ package agent.lldb.model.invm; import java.util.List; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbProcessActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForLldbProcessActivationTest extends AbstractModelForLldbProcessActivationTest { @@ -29,6 +32,7 @@ public class InVmModelForLldbProcessActivationTest return PathUtils.parse("Sessions[]"); } + @Override protected PathPattern getProcessPattern() { return new PathPattern(PathUtils.parse("Sessions[].Processes[]")); } @@ -36,22 +40,24 @@ public class InVmModelForLldbProcessActivationTest @Override protected List getExpectedDefaultActivePath() { return PathUtils.parse("Sessions[3].Processes[]"); - } - + } + + @Override public String getIdFromCapture(String line) { // Syntax "* process #N:..." String[] split = line.split("pid="); split = split[1].split(","); return split[0]; } - + + @Override public String getIndexFromCapture(String line) { // Syntax "* target #N:..." String[] split = line.split("#"); split = split[1].split(":"); return split[0]; - } - + } + @Override public ModelHost modelHost() throws Throwable { return new InVmLldbModelHost(); diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbRootAttacherTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbRootAttacherTest.java index e2fecd42b3..bc8063a203 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbRootAttacherTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbRootAttacherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,21 +20,22 @@ import org.junit.Test; import agent.lldb.model.AbstractModelForLldbRootAttacherTest; +@Ignore("deprecated") public class InVmModelForLldbRootAttacherTest extends AbstractModelForLldbRootAttacherTest { @Override public ModelHost modelHost() throws Throwable { return new InVmLldbModelHost(); } - + // NB: These tests need debugger rights, which means either: // (1) on macos, codesigning the executables // (2) on linux, "sudo su; echo 0 > /proc/sys/kernel/yama/ptrace_scope" - + @Override @Ignore // test requires ability to attach by object & lldb version requires pid @Test public void testAttachByObjBogusThrowsException() throws Throwable { super.testAttachByObjBogusThrowsException(); } - + } diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbRootLauncherTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbRootLauncherTest.java index f8738b2676..18f22f0296 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbRootLauncherTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbRootLauncherTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.lldb.model.invm; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbRootLauncherTest; +@Ignore("deprecated") public class InVmModelForLldbRootLauncherTest extends AbstractModelForLldbRootLauncherTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioCloneExitTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioCloneExitTest.java index 598af567dd..2b45385337 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioCloneExitTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioCloneExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.lldb.model.invm; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbScenarioCloneExitTest; +@Ignore("deprecated") public class InVmModelForLldbScenarioCloneExitTest extends AbstractModelForLldbScenarioCloneExitTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioForkExitTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioForkExitTest.java index 709e0c54f3..458b6cd518 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioForkExitTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioForkExitTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,9 +20,11 @@ import org.junit.Test; import agent.lldb.model.AbstractModelForlldbScenarioForkExitTest; +@Ignore("deprecated") public class InVmModelForLldbScenarioForkExitTest extends AbstractModelForlldbScenarioForkExitTest { + @Override @Ignore("Specimen is currently defunct - lldb does not support fork/vfork yet") @Test public void testScenario() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioMemoryTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioMemoryTest.java index 2ca2da1552..2f19a10c9e 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioMemoryTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioMemoryTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.lldb.model.invm; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbScenarioMemoryTest; +@Ignore("deprecated") public class InVmModelForLldbScenarioMemoryTest extends AbstractModelForLldbScenarioMemoryTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioStackTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioStackTest.java index a0c43fbb70..5004b55028 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioStackTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioStackTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.lldb.model.invm; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbScenarioStackTest; +@Ignore("deprecated") public class InVmModelForLldbScenarioStackTest extends AbstractModelForLldbScenarioStackTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioX64RegistersTest.java index f2bf7cf7b4..0963469b53 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbScenarioX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.lldb.model.invm; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbScenarioX64RegistersTest; +@Ignore("deprecated") public class InVmModelForLldbScenarioX64RegistersTest extends AbstractModelForLldbScenarioX64RegistersTest { @Override diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbSessionActivationTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbSessionActivationTest.java index 729f820906..749b7f72f1 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbSessionActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbSessionActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,18 +17,22 @@ package agent.lldb.model.invm; import java.util.List; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbSessionActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForLldbSessionActivationTest extends AbstractModelForLldbSessionActivationTest { - + @Override public List getExpectedSessionPath() { return PathUtils.parse("Sessions[]"); } + @Override protected PathPattern getSessionPattern() { return new PathPattern(PathUtils.parse("Sessions[]")); } @@ -36,22 +40,24 @@ public class InVmModelForLldbSessionActivationTest @Override protected List getExpectedDefaultActivePath() { return PathUtils.parse("Sessions[]"); - } - + } + + @Override public String getIndexFromCapture(String line) { // Syntax "* target #N:..." String[] split = line.split("#"); split = split[1].split(":"); return split[0]; } - + + @Override public String getIdFromCapture(String line) { // Syntax "* target #N:..." String[] split = line.split("pid="); split = split[1].split(","); return split[0]; } - + @Override public ModelHost modelHost() throws Throwable { return new InVmLldbModelHost(); diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbSteppableTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbSteppableTest.java index 6097991548..cf6fb343ae 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbSteppableTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbSteppableTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,11 @@ */ package agent.lldb.model.invm; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbSteppableTest; +@Ignore("deprecated") public class InVmModelForLldbSteppableTest extends AbstractModelForLldbSteppableTest { @Override public ModelHost modelHost() throws Throwable { diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbThreadActivationTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbThreadActivationTest.java index d3c3625184..18b88eb940 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbThreadActivationTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbThreadActivationTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,10 +17,13 @@ package agent.lldb.model.invm; import java.util.List; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbThreadActivationTest; import ghidra.dbg.util.PathPattern; import ghidra.dbg.util.PathUtils; +@Ignore("deprecated") public class InVmModelForLldbThreadActivationTest extends AbstractModelForLldbThreadActivationTest { @@ -28,7 +31,8 @@ public class InVmModelForLldbThreadActivationTest public List getExpectedSessionPath() { return PathUtils.parse("Sessions[]"); } - + + @Override protected PathPattern getThreadPattern() { return new PathPattern(PathUtils.parse("Sessions[].Processes[].Threads[]")); } @@ -36,8 +40,9 @@ public class InVmModelForLldbThreadActivationTest @Override protected List getExpectedDefaultActivePath() { return PathUtils.parse("Sessions[].Processes[].Threads[]"); - } + } + @Override public String getIdFromCapture(String line) { // Syntax "* thread #N:..." String[] split = line.split("tid = "); @@ -45,11 +50,10 @@ public class InVmModelForLldbThreadActivationTest Integer decode = Integer.decode(split[0]); return Integer.toHexString(decode); } - + @Override public ModelHost modelHost() throws Throwable { return new InVmLldbModelHost(); } - } diff --git a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbX64RegistersTest.java b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbX64RegistersTest.java index 57a3a481a3..15ab086790 100644 --- a/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbX64RegistersTest.java +++ b/Ghidra/Debug/Debugger-agent-lldb/src/test/java/agent/lldb/model/invm/InVmModelForLldbX64RegistersTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,13 +15,16 @@ */ package agent.lldb.model.invm; +import org.junit.Ignore; + import agent.lldb.model.AbstractModelForLldbX64RegistersTest; +@Ignore("deprecated") public class InVmModelForLldbX64RegistersTest extends AbstractModelForLldbX64RegistersTest { @Override public ModelHost modelHost() throws Throwable { return new InVmLldbModelHost(); } - + } diff --git a/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/GadpRegistry.java b/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/GadpRegistry.java index 3bbf75ddc2..effecc00ac 100644 --- a/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/GadpRegistry.java +++ b/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/GadpRegistry.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,6 +27,7 @@ import ghidra.dbg.gadp.client.*; import ghidra.dbg.target.*; import utilities.util.reflection.ReflectionUtilities; +@Deprecated(forRemoval = true, since = "11.2") public enum GadpRegistry { ; diff --git a/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/GadpVersion.java b/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/GadpVersion.java index d824edad45..ebd6501c33 100644 --- a/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/GadpVersion.java +++ b/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/GadpVersion.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,6 +19,7 @@ import java.util.NoSuchElementException; import ghidra.dbg.gadp.protocol.Gadp; +@Deprecated(forRemoval = true, since = "11.2") public enum GadpVersion { VER1 { @Override diff --git a/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/client/GadpClient.java b/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/client/GadpClient.java index 1e1e7c7b25..cc1ad895a9 100644 --- a/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/client/GadpClient.java +++ b/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/client/GadpClient.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -51,6 +51,7 @@ import ghidra.util.datastruct.FixedSizeHashMap; import ghidra.util.exception.DuplicateNameException; import utilities.util.ProxyUtilities; +@Deprecated(forRemoval = true, since = "11.2") public class GadpClient extends AbstractDebuggerObjectModel implements ProxyFactory>> { diff --git a/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpServer.java b/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpServer.java index 3cd54cf8f5..43f7d4bf0b 100644 --- a/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpServer.java +++ b/Ghidra/Debug/Debugger-gadp/src/main/java/ghidra/dbg/gadp/server/AbstractGadpServer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,6 +27,7 @@ import ghidra.dbg.gadp.protocol.Gadp; import ghidra.program.model.address.*; import ghidra.util.Msg; +@Deprecated(forRemoval = true, since = "11.2") public abstract class AbstractGadpServer extends AbstractAsyncServer implements DebuggerModelListener { diff --git a/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/GadpClientServerTest.java b/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/GadpClientServerTest.java index 62e2d2f4cd..2557e7629f 100644 --- a/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/GadpClientServerTest.java +++ b/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/GadpClientServerTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -63,6 +63,7 @@ import ghidra.program.model.address.*; import ghidra.util.Msg; import ghidra.util.SystemUtilities; +@Ignore("deprecated") public class GadpClientServerTest implements AsyncTestUtils { public static final long TIMEOUT_MILLISECONDS = SystemUtilities.isInTestingBatchMode() ? 5000 : Long.MAX_VALUE; diff --git a/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/client/GadpClientTest.java b/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/client/GadpClientTest.java index 64692b0622..62db61b01e 100644 --- a/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/client/GadpClientTest.java +++ b/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/client/GadpClientTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,6 +28,7 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; +import org.junit.Ignore; import org.junit.Test; import ghidra.async.*; @@ -41,6 +42,7 @@ import ghidra.dbg.target.schema.TargetObjectSchema.SchemaName; import ghidra.dbg.util.PathUtils; import ghidra.util.Msg; +@Ignore("deprecated") public class GadpClientTest implements AsyncTestUtils { private static final String HELLO_WORLD = "Hello, World!"; private static final String TEST_HOST = "localhost"; @@ -401,7 +403,8 @@ public class GadpClientTest implements AsyncTestUtils { assertEquals(HELLO_WORLD, waitOn(fetchVal1)); assertEquals(HELLO_WORLD, waitOn(fetchVal2)); - CompletableFuture fetchVal3 = client.fetchModelValue(PathUtils.parse("value"), RefreshBehavior.REFRESH_ALWAYS); + CompletableFuture fetchVal3 = + client.fetchModelValue(PathUtils.parse("value"), RefreshBehavior.REFRESH_ALWAYS); srv.handleResyncAttributes(List.of(), true, null, Map.of("value", "Hi")); assertEquals("Hi", waitOn(fetchVal3)); } diff --git a/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/util/AsyncProtobufMessageChannelTest.java b/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/util/AsyncProtobufMessageChannelTest.java index 9b9e3eb987..700e7f85f1 100644 --- a/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/util/AsyncProtobufMessageChannelTest.java +++ b/Ghidra/Debug/Debugger-gadp/src/test/java/ghidra/dbg/gadp/util/AsyncProtobufMessageChannelTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,6 +24,7 @@ import java.nio.channels.CompletionHandler; import java.util.Arrays; import java.util.concurrent.*; +import org.junit.Ignore; import org.junit.Test; import ghidra.async.*; @@ -32,6 +33,7 @@ import ghidra.dbg.gadp.protocol.Gadp.RootMessage; import ghidra.util.NumericUtilities; import ghidra.util.SystemUtilities; +@Ignore("deprecated") public class AsyncProtobufMessageChannelTest { public final static long TIMEOUT_MILLIS = SystemUtilities.isInTestingBatchMode() ? 1000 : Long.MAX_VALUE; diff --git a/Ghidra/Debug/Debugger-jpda/src/test/java/ghidra/dbg/jdi/model/JdiModelTest.java b/Ghidra/Debug/Debugger-jpda/src/test/java/ghidra/dbg/jdi/model/JdiModelTest.java index 14ea9e6445..2b52c00da7 100644 --- a/Ghidra/Debug/Debugger-jpda/src/test/java/ghidra/dbg/jdi/model/JdiModelTest.java +++ b/Ghidra/Debug/Debugger-jpda/src/test/java/ghidra/dbg/jdi/model/JdiModelTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,6 +29,7 @@ import ghidra.dbg.testutil.DebuggerModelTestUtils; import ghidra.dbg.util.PathUtils; import ghidra.util.Msg; +@Ignore("deprecated") public class JdiModelTest implements DebuggerModelTestUtils { DebuggerObjectModel model; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java index 46a3a8f136..873ce800aa 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/objects/DebuggerObjectsPlugin.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -41,10 +41,12 @@ import ghidra.util.datastruct.CollectionChangeListener; @PluginInfo( shortDescription = "Debugger objects manager", - description = "GUI to manage connections to external debuggers and trace recording", + description = """ + GUI to manage connections to external debuggers and trace recording. \ + Deprecated since 11.2 for removal in 11.3.""", category = PluginCategoryNames.DEBUGGER, packageName = DebuggerPluginPackage.NAME, - status = PluginStatus.RELEASED, + status = PluginStatus.DEPRECATED, eventsConsumed = { ProgramActivatedPluginEvent.class, // for default launch executable path ProgramOpenedPluginEvent.class, diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/target/DebuggerTargetsPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/target/DebuggerTargetsPlugin.java index b97927b5a1..3a6c49439b 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/target/DebuggerTargetsPlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/target/DebuggerTargetsPlugin.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,19 +24,20 @@ import ghidra.framework.plugintool.*; import ghidra.framework.plugintool.annotation.AutoServiceConsumed; import ghidra.framework.plugintool.util.PluginStatus; -@PluginInfo( // - shortDescription = "Debugger targets manager", // - description = "GUI to manage connections to external debuggers and trace recording", // - category = PluginCategoryNames.DEBUGGER, // - packageName = DebuggerPluginPackage.NAME, // - status = PluginStatus.RELEASED, // +@PluginInfo( + shortDescription = "Debugger targets manager", + description = """ + GUI to manage connections to external debuggers and trace recording. \ + Deprecated since 11.2 for removal in 11.3.""", + category = PluginCategoryNames.DEBUGGER, + packageName = DebuggerPluginPackage.NAME, + status = PluginStatus.DEPRECATED, eventsConsumed = { - ModelActivatedPluginEvent.class, // - }, // - servicesRequired = { // - DebuggerModelService.class, // - } // -) + ModelActivatedPluginEvent.class, + }, + servicesRequired = { + DebuggerModelService.class, + }) public class DebuggerTargetsPlugin extends AbstractDebuggerPlugin { @AutoServiceConsumed protected DebuggerModelService modelService; diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServiceProxyPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServiceProxyPlugin.java index 35ff07b6ac..9a95b0ec33 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServiceProxyPlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/DebuggerModelServiceProxyPlugin.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -75,10 +75,12 @@ import ghidra.util.task.TaskMonitor; @PluginInfo( shortDescription = "Debugger models manager service (proxy to front-end)", - description = "Manage debug sessions, connections, and trace recording", + description = """ + Manage debug sessions, connections, and trace recording. \ + Deprecated since 11.2 for removal in 11.3.""", category = PluginCategoryNames.DEBUGGER, packageName = DebuggerPluginPackage.NAME, - status = PluginStatus.RELEASED, + status = PluginStatus.DEPRECATED, eventsConsumed = { ProgramActivatedPluginEvent.class, ProgramClosedPluginEvent.class, }, servicesRequired = { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/AnnotatedDebuggerAttributeListener.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/AnnotatedDebuggerAttributeListener.java index 3155c1e8f6..f4b463ab6f 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/AnnotatedDebuggerAttributeListener.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/AnnotatedDebuggerAttributeListener.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,7 +28,10 @@ import ghidra.util.Msg; /** * A model listener that permits {@link AttributeCallback} annotations for convenient callbacks when * the named attribute changes + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public abstract class AnnotatedDebuggerAttributeListener implements DebuggerModelListener { private static final String ATTR_METHODS = "@" + AttributeCallback.class.getSimpleName() + "-annotated methods"; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebugModelConventions.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebugModelConventions.java index f45080bc46..a5240dc49e 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebugModelConventions.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebugModelConventions.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,6 +29,10 @@ import ghidra.dbg.util.PathUtils.PathComparator; import ghidra.util.Msg; import ghidra.util.Swing; +/** + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + */ +@Deprecated(forRemoval = true, since = "11.2") public enum DebugModelConventions { ; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerAbnormalModelClosedReason.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerAbnormalModelClosedReason.java index 1f4ab70da5..545adcc829 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerAbnormalModelClosedReason.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerAbnormalModelClosedReason.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,6 +15,7 @@ */ package ghidra.dbg; +@Deprecated(forRemoval = true, since = "11.2") class DebuggerAbnormalModelClosedReason implements DebuggerModelClosedReason { final Throwable exc; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelClosedReason.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelClosedReason.java index 5955d58352..0a6f0ecdec 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelClosedReason.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelClosedReason.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,10 @@ package ghidra.dbg; /** * A reason given for a closed connection + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface DebuggerModelClosedReason { DebuggerModelClosedReason NORMAL = DebuggerNormalModelClosedReason.NORMAL; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelFactory.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelFactory.java index ecf1dc0883..a2699b8e36 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelFactory.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelFactory.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,10 @@ import ghidra.util.classfinder.ExtensionPoint; * *

* This provides a discoverable means of configuring and creating a debug model. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface DebuggerModelFactory extends ExtensionPoint, ConfigurableFactory { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelListener.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelListener.java index f29c2cff9e..0c0d410117 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelListener.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerModelListener.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,7 +28,10 @@ import ghidra.util.Msg; /** * A listener for events related to the debugger model, including its connection and objects + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface DebuggerModelListener { /** diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerNormalModelClosedReason.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerNormalModelClosedReason.java index b8b3391f0d..10ac7111d1 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerNormalModelClosedReason.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerNormalModelClosedReason.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,6 +15,7 @@ */ package ghidra.dbg; +@Deprecated(forRemoval = true, since = "11.2") enum DebuggerNormalModelClosedReason implements DebuggerModelClosedReason { NORMAL; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModel.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModel.java index 9a4953b29f..fdbf51782f 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModel.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModel.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -62,7 +62,10 @@ import ghidra.util.Msg; * Users and implementors of this interface may find {@link AsyncUtils} useful. An implementation of * this interface should never block the calling thread to wait on an external event, otherwise, you * risk deadlocking Ghidra's UI. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface DebuggerObjectModel { public static enum RefreshBehavior { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModelWithMemory.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModelWithMemory.java index 44367ce237..14daf0c9ae 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModelWithMemory.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerObjectModelWithMemory.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,6 +19,7 @@ import ghidra.dbg.target.TargetMemory; import ghidra.dbg.target.TargetObject; import ghidra.program.model.address.Address; +@Deprecated(forRemoval = true, since = "11.2") public interface DebuggerObjectModelWithMemory { TargetMemory getMemory(TargetObject target, Address address, int length); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerTargetObjectIface.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerTargetObjectIface.java index 81fda93fd3..4575475098 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerTargetObjectIface.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/DebuggerTargetObjectIface.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,10 @@ import ghidra.dbg.target.TargetObject; /** * Annotation to assign the name of a target object interface to its Java implementation, an * interface extending {@link TargetObject}. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface DebuggerTargetObjectIface { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractDebuggerObjectModel.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractDebuggerObjectModel.java index 12d687ec7d..425df72d06 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractDebuggerObjectModel.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractDebuggerObjectModel.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,6 +30,7 @@ import ghidra.util.Msg; import ghidra.util.datastruct.ListenerSet; import ghidra.util.datastruct.PrivatelyQueuedListener; +@Deprecated(forRemoval = true, since = "11.2") public abstract class AbstractDebuggerObjectModel implements SpiDebuggerObjectModel { public final Object lock = new Object(); public final Object cbLock = new Object(); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractTargetObject.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractTargetObject.java index ed08b9802a..2ee5a9cc4a 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractTargetObject.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AbstractTargetObject.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -37,7 +37,9 @@ import ghidra.dbg.util.PathUtils; * properly. * * @param

the type of the parent + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public abstract class AbstractTargetObject

implements SpiTargetObject { public static interface ProxyFactory { SpiTargetObject createProxy(AbstractTargetObject delegate, I info); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AgentWindow.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AgentWindow.java index 5e1c7a995a..08c79c670f 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AgentWindow.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/AgentWindow.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,6 +34,7 @@ import ghidra.util.Swing; import log.LogListener; import log.LogPanelAppender; +@Deprecated(forRemoval = true, since = "11.2") public class AgentWindow extends JFrame implements WindowListener, LogListener { public static final int MAX_LOG_CHARS = 100000; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetModelRoot.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetModelRoot.java index 2451620db4..8d453dbbc8 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetModelRoot.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetModelRoot.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,6 +21,7 @@ import ghidra.dbg.target.TargetObject; import ghidra.dbg.target.schema.EnumerableTargetObjectSchema; import ghidra.dbg.target.schema.TargetObjectSchema; +@Deprecated(forRemoval = true, since = "11.2") public class DefaultTargetModelRoot extends DefaultTargetObject implements TargetAggregate { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetObject.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetObject.java index 7702f1f787..ac635c2cc5 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetObject.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/DefaultTargetObject.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -35,7 +35,9 @@ import ghidra.util.Msg; * @see AbstractTargetObject * @param the type of child elements * @param

the type of the parent + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DefaultTargetObject extends AbstractTargetObject

{ @@ -133,7 +135,8 @@ public class DefaultTargetObject } @Override - public CompletableFuture resync(RefreshBehavior refreshAttributes, RefreshBehavior refreshElements) { + public CompletableFuture resync(RefreshBehavior refreshAttributes, + RefreshBehavior refreshElements) { return CompletableFuture.allOf(fetchAttributes(refreshAttributes), fetchElements(refreshElements)); } @@ -180,7 +183,8 @@ public class DefaultTargetObject * response, then complete with {@link #elementsView}. */ @Override - public CompletableFuture> fetchElements(RefreshBehavior refresh) { + public CompletableFuture> fetchElements( + RefreshBehavior refresh) { CompletableFuture req; synchronized (elements) { if (shouldRequestElements(refresh)) { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/InvalidatableTargetObjectIf.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/InvalidatableTargetObjectIf.java index c03a87eb85..0ca904ba71 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/InvalidatableTargetObjectIf.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/InvalidatableTargetObjectIf.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -40,7 +40,10 @@ import ghidra.dbg.target.TargetObject; * release its resources and also invalidate its children accordingly. For the case of a proxy whose * delegate derives from {@link AbstractTargetObject}, the proxy must include this interface, and * the call need only be forwarded to the delegate. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface InvalidatableTargetObjectIf extends TargetObject { /** diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/SpiDebuggerObjectModel.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/SpiDebuggerObjectModel.java index 9c8cb3d441..9a7ee44257 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/SpiDebuggerObjectModel.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/SpiDebuggerObjectModel.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,6 +25,7 @@ import ghidra.dbg.error.DebuggerModelTypeException; import ghidra.dbg.target.TargetObject; import ghidra.dbg.util.PathUtils; +@Deprecated(forRemoval = true, since = "11.2") public interface SpiDebuggerObjectModel extends DebuggerObjectModel { @Override @@ -64,9 +65,10 @@ public interface SpiDebuggerObjectModel extends DebuggerObjectModel { break; case REFRESH_WHEN_ABSENT: default: - CompletableFuture futureChild0 = obj.fetchChild(key); + CompletableFuture futureChild0 = obj.fetchChild(key); futureChild = futureChild0.thenCompose(c -> { - return c == null ? fetchFreshChild(obj, key) : CompletableFuture.completedFuture(c); + return c == null ? fetchFreshChild(obj, key) + : CompletableFuture.completedFuture(c); }); break; } @@ -99,7 +101,8 @@ public interface SpiDebuggerObjectModel extends DebuggerObjectModel { } @Override - public default CompletableFuture fetchModelValue(List path, RefreshBehavior refresh) { + public default CompletableFuture fetchModelValue(List path, + RefreshBehavior refresh) { return fetchModelRoot().thenCompose(root -> { return fetchSuccessorValue(root, path, refresh, true); }); @@ -116,7 +119,7 @@ public interface SpiDebuggerObjectModel extends DebuggerObjectModel { return CompletableFuture.completedFuture(obj); } String key = path.get(0); - CompletableFuture futureChild = obj.fetchChild(key); + CompletableFuture futureChild = obj.fetchChild(key); CompletableFuture ffutureChild = futureChild.thenCompose(c -> { return c == null ? fetchFreshChild(obj, key) : CompletableFuture.completedFuture(c); }); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/SpiTargetObject.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/SpiTargetObject.java index f43930b002..4b7b7d9dd2 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/SpiTargetObject.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/agent/SpiTargetObject.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,6 +18,7 @@ package ghidra.dbg.agent; import ghidra.dbg.DebuggerModelListener; import ghidra.dbg.target.TargetObject; +@Deprecated(forRemoval = true, since = "11.2") public interface SpiTargetObject extends TargetObject, InvalidatableTargetObjectIf { @Override AbstractDebuggerObjectModel getModel(); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetArrayDataType.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetArrayDataType.java index 37cab6c5dc..c178d5ade7 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetArrayDataType.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetArrayDataType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,6 +18,7 @@ package ghidra.dbg.attributes; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +@Deprecated(forRemoval = true, since = "11.2") public interface TargetArrayDataType extends TargetDataType { public class DefaultTargetArrayDataType implements TargetArrayDataType { protected final TargetDataType elementType; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetBitfieldDataType.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetBitfieldDataType.java index 743db31ec5..24544e1c93 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetBitfieldDataType.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetBitfieldDataType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,8 +21,12 @@ import com.google.gson.JsonObject; /** * A bitfield-modified data type * + *

* This is only applicable to fields of structures. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface TargetBitfieldDataType extends TargetDataType { public class DefaultTargetBitfieldDataType implements TargetBitfieldDataType { protected final TargetDataType fieldType; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetDataType.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetDataType.java index 1239eee50b..fc511c9eb4 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetDataType.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetDataType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,7 @@ import com.google.gson.JsonElement; import ghidra.dbg.attributes.TargetPrimitiveDataType.DefaultTargetPrimitiveDataType; import ghidra.dbg.attributes.TargetPrimitiveDataType.PrimitiveKind; +@Deprecated(forRemoval = true, since = "11.2") public interface TargetDataType { TargetDataType UNDEFINED1 = new DefaultTargetPrimitiveDataType(PrimitiveKind.UNDEFINED, 1); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetObjectList.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetObjectList.java index 512a807b0e..b2d682d758 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetObjectList.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetObjectList.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,6 +19,7 @@ import java.util.*; import ghidra.dbg.target.TargetObject; +@Deprecated(forRemoval = true, since = "11.2") public interface TargetObjectList extends List { public static class EmptyTargetObjectRefList extends AbstractList implements TargetObjectList { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetPointerDataType.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetPointerDataType.java index 8c005b7596..4856717b7c 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetPointerDataType.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetPointerDataType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,6 +18,7 @@ package ghidra.dbg.attributes; import com.google.gson.JsonElement; import com.google.gson.JsonObject; +@Deprecated(forRemoval = true, since = "11.2") public interface TargetPointerDataType extends TargetDataType { public class DefaultTargetPointerDataType implements TargetPointerDataType { protected final TargetDataType referentType; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetPrimitiveDataType.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetPrimitiveDataType.java index ddd6a337fa..73068cd0ac 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetPrimitiveDataType.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetPrimitiveDataType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,8 +15,9 @@ */ package ghidra.dbg.attributes; -import com.google.gson.*; +import com.google.gson.JsonObject; +@Deprecated(forRemoval = true, since = "11.2") public interface TargetPrimitiveDataType extends TargetDataType { public static final TargetDataType VOID = new DefaultTargetPrimitiveDataType(PrimitiveKind.VOID, 0); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetStringList.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetStringList.java index 0d9960711d..72a13a8aea 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetStringList.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/attributes/TargetStringList.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,6 +21,7 @@ import org.apache.commons.collections4.list.AbstractListDecorator; import ghidra.dbg.util.CollectionUtils.AbstractEmptyList; +@Deprecated(forRemoval = true, since = "11.2") public interface TargetStringList extends List { public static class EmptyTargetStringList extends AbstractEmptyList implements TargetStringList { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerIgnorableException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerIgnorableException.java index 6488661ba7..1501954ab8 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerIgnorableException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerIgnorableException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,10 @@ import ghidra.async.AsyncUtils; * shutting down. Exceptions raised by those requests can likely be ignored. Please note, clients * will likely need to apply {@link AsyncUtils#unwrapThrowable(Throwable)} in order to determine * whether the exception is ignorable. Alternatively, use {@link #isIgnorable(Throwable)}. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerIgnorableException extends DebuggerRuntimeException { public static boolean isIgnorable(Throwable ex) { Throwable u = AsyncUtils.unwrapThrowable(ex); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerIllegalArgumentException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerIllegalArgumentException.java index af2b5f37f0..4d1fd01a39 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerIllegalArgumentException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerIllegalArgumentException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,12 +19,14 @@ package ghidra.dbg.error; * A model method was given an illegal argument. * * If the argument is an object, but of the wrong type, please use - * {@link DebuggerModelTypeException} instead. If the argument is a path which doesn't exist - * in the model, use {@link DebuggerModelNoSuchPathException} instead. + * {@link DebuggerModelTypeException} instead. If the argument is a path which doesn't exist in the + * model, use {@link DebuggerModelNoSuchPathException} instead. * * @implNote I am not re-using {@link IllegalArgumentException} here, as I don't want any of those * thrown internally to be passed to the client. + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerIllegalArgumentException extends DebuggerRuntimeException { public DebuggerIllegalArgumentException(String message) { super(message); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerMemoryAccessException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerMemoryAccessException.java index b20615957e..8da5a11784 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerMemoryAccessException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerMemoryAccessException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,7 +26,10 @@ import ghidra.program.model.address.Address; *

* If the underlying debugger is simply in a state that prevents the request from being fulfilled, * e.g., the target process is running, then use {@link DebuggerModelAccessException} instead. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerMemoryAccessException extends DebuggerRuntimeException { public DebuggerMemoryAccessException(String message, Throwable cause) { super(message, cause); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelAccessException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelAccessException.java index 7348a015af..bdfbb86a6c 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelAccessException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelAccessException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,7 +26,10 @@ import ghidra.dbg.util.PathUtils; * In general, this exception should be considered a temporary condition, meaning the client should * just try again later. If a UI is involved, the error, if displayed at all, should be displayed in * the least obtrusive manner possible. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerModelAccessException extends DebuggerRuntimeException { public DebuggerModelAccessException(String message, Throwable cause) { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelNoSuchPathException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelNoSuchPathException.java index b453bb457c..66d5859223 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelNoSuchPathException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelNoSuchPathException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,6 +15,7 @@ */ package ghidra.dbg.error; +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerModelNoSuchPathException extends DebuggerRuntimeException { public DebuggerModelNoSuchPathException(String message, Throwable cause) { super(message, cause); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelTerminatingException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelTerminatingException.java index b9f9dcedc5..d527add714 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelTerminatingException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelTerminatingException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,10 @@ package ghidra.dbg.error; /** * A request was rejected, because the model is shutting down + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerModelTerminatingException extends DebuggerIgnorableException { public DebuggerModelTerminatingException(String message, Throwable cause) { super(message, cause); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelTypeException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelTypeException.java index c67581e75f..47de2f39d7 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelTypeException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerModelTypeException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,9 @@ import ghidra.dbg.util.PathUtils; * * @implNote I am not re-using {@link ClassCastException} here, as I don't want any of those thrown * internally to be passed to the client. + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerModelTypeException extends DebuggerRuntimeException { public static DebuggerModelTypeException typeRequired(Object got, List path, Class expected) { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerRegisterAccessException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerRegisterAccessException.java index de2b7d9ab3..a72a9f5664 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerRegisterAccessException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerRegisterAccessException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,10 @@ import ghidra.dbg.target.TargetRegisterBank; *

* If the underlying debugger is simply in a state that prevents the request from being fulfilled, * e.g., the target process is running, then use {@link DebuggerModelAccessException} instead. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerRegisterAccessException extends DebuggerRuntimeException { public DebuggerRegisterAccessException(String message, Throwable cause) { super(message, cause); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerRuntimeException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerRuntimeException.java index 0590c8e90f..d12053a39a 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerRuntimeException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerRuntimeException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -15,6 +15,7 @@ */ package ghidra.dbg.error; +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerRuntimeException extends RuntimeException { public DebuggerRuntimeException(String message, Throwable cause) { super(message, cause); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerUserException.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerUserException.java index e5597cd43f..3c7e73a94c 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerUserException.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/error/DebuggerUserException.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,7 +17,10 @@ package ghidra.dbg.error; /** * The request generated an error with a message for the user + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerUserException extends DebuggerRuntimeException { public DebuggerUserException(String message) { super(message); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/CachedMemory.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/CachedMemory.java index a4894e040c..3d2ec28298 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/CachedMemory.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/CachedMemory.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -51,7 +51,10 @@ import ghidra.util.Msg; * unnecessary reads, there is little motivation to implement an automatic eviction strategy. The * debugger client implementation must clear the cache at each execution step, unless it can * accurately determine that certain ranges of memory cannot be affected by a given step. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class CachedMemory implements MemoryReader, MemoryWriter { private final SemisparseByteArray memory = new SemisparseByteArray(); private final NavigableMap pendingByLoc = diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/MemoryReader.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/MemoryReader.java index 8e9f0508e0..cac770070f 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/MemoryReader.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/MemoryReader.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,9 @@ import java.util.concurrent.CompletableFuture; * The functional interface for reads from a cached memory * * @see CachedMemory + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface MemoryReader { /** * Read target memory diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/MemoryWriter.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/MemoryWriter.java index 8445114cda..f19645afb5 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/MemoryWriter.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/memory/MemoryWriter.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,9 @@ import java.util.concurrent.CompletableFuture; * The functional interface for writes to a cached memory * * @see CachedMemory + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface MemoryWriter { /** * Write target memory diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAccessConditioned.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAccessConditioned.java index 518ce58038..cc5c42d0db 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAccessConditioned.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAccessConditioned.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; * granularity of accessibility is the entire object, including its children (excluding links). If, * e.g., an object can process memory commands but not control commands, it should be separated into * two objects. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Access") public interface TargetAccessConditioned extends TargetObject { String ACCESSIBLE_ATTRIBUTE_NAME = PREFIX_INVISIBLE + "accessible"; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetActivatable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetActivatable.java index 873d7c07e0..52919b0719 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetActivatable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetActivatable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,7 +36,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; *

* We cannot just use the presence or absence of a suitable activation method as a proxy for this * interface, because the registry is only available when the back end is alive. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Activatable") public interface TargetActivatable extends TargetObject { // No methods diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetActiveScope.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetActiveScope.java index 90b973c94d..009970807a 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetActiveScope.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetActiveScope.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; * *

* "Active" here describes which object in a given class the target should operate on + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("ActiveScope") public interface TargetActiveScope extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAggregate.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAggregate.java index 2e7301c2b9..53f93ee546 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAggregate.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAggregate.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,7 +23,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; *

* Often applied to processes and sessions, this causes ancestry traversals to include this object's * children when visited. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Aggregate") public interface TargetAggregate extends TargetObject { } diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAttachable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAttachable.java index 1681590dca..ad59e673fc 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAttachable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAttachable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,7 +19,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; /** * An object, usually process, to which the debugger can attach + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Attachable") public interface TargetAttachable extends TargetObject { // These are fairly opaque diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAttacher.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAttacher.java index 1f935f97a5..6c948a59f3 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAttacher.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetAttacher.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,10 @@ import ghidra.dbg.util.CollectionUtils.AbstractEmptySet; /** * An object which is capable of attaching to a {@link TargetAttachable} + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Attacher") public interface TargetAttacher extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocation.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocation.java index 000fec54b3..98ec553fc9 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocation.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocation.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,10 @@ import ghidra.program.model.address.AddressRange; * breakpoint objects should implement both the specification and location interfaces. If the * location is user-togglable independent of its specification, it should implement * {@link TargetTogglable} as well. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("BreakpointLocation") public interface TargetBreakpointLocation extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocationContainer.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocationContainer.java index 17b47aa2ac..6d0d45d2de 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocationContainer.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointLocationContainer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -26,7 +26,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; * indicate that a location applies to a target is for it to be a successor of that target, at least * by linking. To ease discovery, the breakpoint location container for the target must be a * canonical successor of the target. The locations in the container may be canonical or links. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("BreakpointLocationContainer") public interface TargetBreakpointLocationContainer extends TargetObject { // Nothing here aside from a marker diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointSpec.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointSpec.java index f2bc882480..31c1306b78 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointSpec.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointSpec.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -41,7 +41,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; * breakpoint specifications can be toggled should declare this interface explicitly. When the * specification is user togglable, toggling it should effectively toggle all locations -- whether * or not the locations are user togglable. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("BreakpointSpec") public interface TargetBreakpointSpec extends TargetObject, /*@Transitional*/ TargetTogglable { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointSpecContainer.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointSpecContainer.java index f79345f895..fdf30000b7 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointSpecContainer.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetBreakpointSpecContainer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -40,7 +40,10 @@ import ghidra.program.model.address.*; * passing {@link TargetBreakpointLocation}. A client seeking to place breakpoints should use * {@link TargetObjectSchema#searchForSuitable(Class, java.util.List)}, passing * {@link TargetBreakpointSpecContainer}. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("BreakpointSpecContainer") public interface TargetBreakpointSpecContainer extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetCmdLineLauncherEx.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetCmdLineLauncherEx.java index 38ce9a060f..5f41954fc6 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetCmdLineLauncherEx.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetCmdLineLauncherEx.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,6 +22,7 @@ import java.util.concurrent.CompletableFuture; import ghidra.dbg.target.TargetMethod.ParameterDescription; import ghidra.dbg.target.TargetMethod.TargetParameterMap; +@Deprecated(forRemoval = true, since = "11.2") public interface TargetCmdLineLauncherEx extends TargetLauncher { String CMDLINE_ARGS_NAME = "args"; @@ -38,13 +39,13 @@ public interface TargetCmdLineLauncherEx extends TargetLauncher { TargetParameterMap PARAMETERS = TargetMethod.makeParameters(PARAMETER_CMDLINE_ARGS); /** - * Check if the given image path contains spaces, and surround it in double quotes - * ({@code "}) if necessary. + * Check if the given image path contains spaces, and surround it in double quotes ({@code "}) + * if necessary. * *

- * Without the quotes the launcher will likely confuse the spaces for separating arguments. - * When constructing the command-line to launch a program, this method must be used, even if - * the image is the only "argument." + * Without the quotes the launcher will likely confuse the spaces for separating arguments. When + * constructing the command-line to launch a program, this method must be used, even if the + * image is the only "argument." * * @param imagePath the path to the image on the target platform. * @return the path, possibly surrounded in quotes. @@ -65,9 +66,9 @@ public interface TargetCmdLineLauncherEx extends TargetLauncher { * Launch a target using the given arguments * *

- * This is mostly applicable to user-space contexts, in which case, this usually means to - * launch a new process with the given arguments, where the first argument is the path to - * the executable image on the target host's file system. + * This is mostly applicable to user-space contexts, in which case, this usually means to launch + * a new process with the given arguments, where the first argument is the path to the + * executable image on the target host's file system. * * @param args the arguments * @return a future which completes when the command has been processed diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetConfigurable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetConfigurable.java index 975635dcb7..30dfebbaff 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetConfigurable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetConfigurable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -41,7 +41,10 @@ import ghidra.dbg.target.TargetMethod.ParameterDescription; * Furthermore, writing an option should not be the means of triggering an action. Though certainly, * the model may react to their modification. Actions, in general, should instead be exposed as * {@link TargetMethod}s. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Configurable") public interface TargetConfigurable extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetConsole.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetConsole.java index 0fb61d5a82..1c68e2fa1e 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetConsole.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetConsole.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,8 +34,10 @@ import ghidra.lifecycle.Experimental; * E.g., implementing the CLI as a {@link TargetConsole} requires the server to buffer and parse * line input; whereas, implementing the CLI as a {@link TargetInterpreter} requires the client to * parse line input. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ -@Experimental +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Console") public interface TargetConsole extends TargetObject { Charset CHARSET = Charset.forName("utf-8"); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDataTypeMember.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDataTypeMember.java index 9bf70a9340..4b1d11b2b5 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDataTypeMember.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDataTypeMember.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,10 @@ import ghidra.dbg.util.TargetDataTypeConverter; *

* TODO: Document the conventions. Most, if not all, are implemented in * {@link TargetDataTypeConverter}. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("TypeMember") public interface TargetDataTypeMember extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDataTypeNamespace.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDataTypeNamespace.java index 87e0358b84..1e270351f9 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDataTypeNamespace.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDataTypeNamespace.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,7 +28,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; * The debugger should present these in as granular of units as possible. Consider a desktop * application, for example. The debugger should present each module as a namespace rather than the * entire target (or worse, the entire session) as a single namespace. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("DataTypeNamespace") public interface TargetDataTypeNamespace extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDeletable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDeletable.java index d085f1d2ac..7255bc7050 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDeletable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDeletable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; /** * An object which can be removed by the user + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Deletable") public interface TargetDeletable extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDetachable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDetachable.java index 40f30219ce..2cce59d0d6 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDetachable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetDetachable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; /** * A target which can be detached from the debugger + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Detachable") public interface TargetDetachable extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetEnvironment.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetEnvironment.java index 04886fca12..20e4582bb5 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetEnvironment.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetEnvironment.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,7 +34,9 @@ import ghidra.dbg.target.schema.TargetAttributeType; * update a target's environment attributes before reporting that it has started. Relaxing * this requirement is TODO. Note that targets which do not support * {@link TargetExecutionStateful} are assumed started by virtue of their creation. + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Environment") public interface TargetEnvironment extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetEventScope.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetEventScope.java index a599a5599b..47f312f584 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetEventScope.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetEventScope.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,7 +23,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; * *

* Most often, this interface is supported by the (root) session. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("EventScope") public interface TargetEventScope extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetExecutionStateful.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetExecutionStateful.java index b9accd2d84..9b3c2ae669 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetExecutionStateful.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetExecutionStateful.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,7 +20,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; /** * An object which has an execution life cycle + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("ExecutionStateful") public interface TargetExecutionStateful extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetFocusScope.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetFocusScope.java index cea02bbe8d..b5d530333a 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetFocusScope.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetFocusScope.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,7 +28,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; * Focus is usually communicated via various UI hints, but also semantically implies that actions * taken within this scope apply to the focused object. The least confusing option is to implement * this at the root, but that need not always be the case. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("FocusScope") public interface TargetFocusScope extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetInterpreter.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetInterpreter.java index 7f8070ba8c..52d7fc252c 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetInterpreter.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetInterpreter.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; /** * A command interpreter, usually that of a native debugger + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Interpreter") public interface TargetInterpreter extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetInterruptible.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetInterruptible.java index 70f2f42285..a66f2183b1 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetInterruptible.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetInterruptible.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,10 @@ import ghidra.dbg.target.TargetExecutionStateful.TargetExecutionState; /** * A target that can be interrupted + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Interruptible") public interface TargetInterruptible extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetKillable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetKillable.java index ad445ca7b5..ebd599ec8c 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetKillable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetKillable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; /** * A target which can be killed (terminated) + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Killable") public interface TargetKillable extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetLauncher.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetLauncher.java index 9f08318f9d..a10a0403b7 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetLauncher.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetLauncher.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,7 +29,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; * *

* The targets this launcher creates ought to appear in its successors. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Launcher") public interface TargetLauncher extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMemory.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMemory.java index f58b4c686b..0644758cf0 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMemory.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMemory.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -37,7 +37,10 @@ import ghidra.program.model.address.Address; * distinguished by the memory objects? I'm leaning toward the latter. Duplicate locations for * regions may just be an efficiency bit, if used at all. This decision is primarily because, at the * moment, read and write belong to the memory interface, not the region. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Memory") public interface TargetMemory extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMemoryRegion.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMemoryRegion.java index 65218756e0..b928dcffcd 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMemoryRegion.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMemoryRegion.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,6 +19,7 @@ import ghidra.dbg.DebuggerTargetObjectIface; import ghidra.dbg.target.schema.TargetAttributeType; import ghidra.program.model.address.AddressRange; +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("MemoryRegion") public interface TargetMemoryRegion extends TargetObject { String RANGE_ATTRIBUTE_NAME = PREFIX_INVISIBLE + "range"; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMethod.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMethod.java index d45514f027..bdd50e1e42 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMethod.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetMethod.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,7 +42,10 @@ import utilities.util.reflection.ReflectionUtilities; * *

* TODO: Should parameters and return type be something incorporated into Schemas? + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Method") public interface TargetMethod extends TargetObject { String PARAMETERS_ATTRIBUTE_NAME = PREFIX_INVISIBLE + "parameters"; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetModule.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetModule.java index 296f8aafec..1f2e047bb5 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetModule.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetModule.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,10 @@ import ghidra.program.model.address.AddressRange; *

* If the debugger cares to parse the modules for section information, those sections should be * presented as successors to the module. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Module") public interface TargetModule extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetModuleContainer.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetModuleContainer.java index c8132552a3..030d3921f3 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetModuleContainer.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetModuleContainer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -39,7 +39,10 @@ import ghidra.lifecycle.Experimental; * modules, but it doesn't technically have to be. If we don't eventually go forward with synthetic * modules, then we could remove this interface altogether. A client searching for the module * container should use {@link TargetObjectSchema#searchForCanonicalContainer(Class)}. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("ModuleContainer") public interface TargetModuleContainer extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetNamedDataType.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetNamedDataType.java index 345f68e51b..e0c8f99c08 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetNamedDataType.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetNamedDataType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,7 +45,9 @@ import ghidra.dbg.util.TargetDataTypeConverter; * See {@link TargetDataTypeConverter} to get a grasp of the conventions * * @param the type of this object + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("DataType") public interface TargetNamedDataType extends TargetObject, TargetDataType { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetObject.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetObject.java index d44d896f14..ce8c240842 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetObject.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetObject.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -162,7 +162,10 @@ import ghidra.lifecycle.Internal; * in the object-model schema, which survives in the trace database. For some of the interfaces, we * already have defined equivalent interfaces in the trace object manager. We will probably port * additional interfaces over and eventually remove all of these. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public interface TargetObject extends Comparable { Set> ALL_INTERFACES = diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetObjectPath.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetObjectPath.java index 07dd4ca80e..6d79dba944 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetObjectPath.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetObjectPath.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,6 +22,7 @@ import ghidra.dbg.DebuggerObjectModel; import ghidra.dbg.util.PathUtils; import ghidra.dbg.util.PathUtils.PathComparator; +@Deprecated(forRemoval = true, since = "11.2") public class TargetObjectPath implements Comparable { protected final DebuggerObjectModel model; protected final List keyList; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetProcess.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetProcess.java index 107b49b29d..c9f3310053 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetProcess.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetProcess.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; * model implies that it is {@link TargetExecutionState#ALIVE}. TODO: Should allow association via * convention to a different {@link TargetExecutionStateful}, but that may have to wait until * schemas are introduced. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Process") public interface TargetProcess extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegister.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegister.java index d285cecd28..bd0fc294ce 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegister.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegister.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -48,7 +48,10 @@ import ghidra.dbg.util.PathUtils; * architectures. If we settle on this convention, we will probably remove the * {@link TargetRegisterContainer} interface in favor of using {@link TargetRegisterBank}. We may * also formally introduce a {@code TargetRegisterGroup} interface. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Register") public interface TargetRegister extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegisterBank.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegisterBank.java index b9417ff5d9..5f3512c800 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegisterBank.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegisterBank.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,7 +32,10 @@ import ghidra.util.Msg; *

* The bank allows access to registers' values; whereas, a {@link TargetRegisterContainer} * allows reflection of the registers' names and structures. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("RegisterBank") public interface TargetRegisterBank extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegisterContainer.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegisterContainer.java index 126117f3cf..7066278fa7 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegisterContainer.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetRegisterContainer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,10 @@ import ghidra.dbg.target.schema.TargetObjectSchema; * client searching for a register (description) container should use * {@link TargetObjectSchema#searchForCanonicalContainer(Class)}, or discover the bank first, and * ask for its descriptions. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("RegisterContainer") public interface TargetRegisterContainer extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetResumable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetResumable.java index 0c12d82838..6d07b602fa 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetResumable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetResumable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; /** * A target which can be resumed, i.e., continued + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Resumable") public interface TargetResumable extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSection.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSection.java index 0ac6de76fd..cbe48d6a1a 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSection.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSection.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,10 @@ import ghidra.program.model.address.AddressRange; * *

* TODO: Present all sections, but include isAllocated? + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Section") public interface TargetSection extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSectionContainer.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSectionContainer.java index 586373df31..f01416115c 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSectionContainer.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSectionContainer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,8 +21,11 @@ import ghidra.dbg.DebuggerTargetObjectIface; * A place for breakpoint locations to reside * *

- * This is just a marker interface for finding where a target's sections are given. + * This is just a marker interface for finding where a target's sections are given. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("SectionContainer") public interface TargetSectionContainer extends TargetObject { // Nothing here aside from a marker diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetStack.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetStack.java index 0ab2468392..2cb585b29f 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetStack.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetStack.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,7 +31,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; *

* TODO: Probably remove this. It serves only as a container of {@link TargetStackFrame}, which can * be discovered using the schema. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Stack") public interface TargetStack extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetStackFrame.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetStackFrame.java index 80beed985a..8f9109d01b 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetStackFrame.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetStackFrame.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,10 @@ import ghidra.program.model.address.Address; /** * One frame (call record) of an execution stack + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("StackFrame") public interface TargetStackFrame extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSteppable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSteppable.java index beb64e8430..281ac61ff9 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSteppable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSteppable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -27,7 +27,10 @@ import ghidra.dbg.util.CollectionUtils.AbstractEmptySet; /** * A target whose execution can be single stepped + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Steppable") public interface TargetSteppable extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSymbol.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSymbol.java index c91ce22bdb..aef2067acb 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSymbol.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSymbol.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,7 +29,9 @@ import ghidra.program.model.data.DataTypeManager; * The description of a debugging symbol * * @see TargetSymbolNamespace + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Symbol") public interface TargetSymbol extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSymbolNamespace.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSymbolNamespace.java index dbc2d71c5d..bff41f6161 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSymbolNamespace.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetSymbolNamespace.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,7 +28,10 @@ import ghidra.dbg.DebuggerTargetObjectIface; * The debugger should present these in as granular of units as possible. Consider a desktop * application, for example. The debugger should present each module as a namespace rather than the * entire target (or worse, the entire session) as a single namespace. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("SymbolNamespace") public interface TargetSymbolNamespace extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetThread.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetThread.java index 834d9f8c05..f919bd1607 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetThread.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetThread.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,7 +24,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; *

* This object must be associated with a suitable {@link TargetExecutionStateful}. In most cases, * the object should just implement it. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Thread") public interface TargetThread extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetTogglable.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetTogglable.java index d87858e48a..6d6309b48e 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetTogglable.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/TargetTogglable.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -22,7 +22,10 @@ import ghidra.dbg.target.schema.TargetAttributeType; /** * An object which can be toggled + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @DebuggerTargetObjectIface("Togglable") public interface TargetTogglable extends TargetObject { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/AnnotatedSchemaContext.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/AnnotatedSchemaContext.java index fb0c785bda..81ac2179d5 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/AnnotatedSchemaContext.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/AnnotatedSchemaContext.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -24,8 +24,8 @@ import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.reflect.TypeUtils; -import ghidra.dbg.DebuggerTargetObjectIface; import ghidra.dbg.DebuggerObjectModel.RefreshBehavior; +import ghidra.dbg.DebuggerTargetObjectIface; import ghidra.dbg.target.TargetMethod; import ghidra.dbg.target.TargetObject; import ghidra.dbg.target.schema.DefaultTargetObjectSchema.DefaultAttributeSchema; @@ -35,6 +35,7 @@ import ghidra.dbg.target.schema.TargetObjectSchema.SchemaName; import ghidra.util.Msg; import utilities.util.reflection.ReflectionUtilities; +@Deprecated(forRemoval = true, since = "11.2") public class AnnotatedSchemaContext extends DefaultSchemaContext { public static class AnnotatedAttributeSchema extends DefaultAttributeSchema { @@ -102,7 +103,8 @@ public class AnnotatedSchemaContext extends DefaultSchemaContext { static Set> getBoundsOfFetchElements( Class cls) { try { - Method method = cls.getMethod("fetchElements", new Class[] { RefreshBehavior.class }); + Method method = + cls.getMethod("fetchElements", new Class[] { RefreshBehavior.class }); Type ret = method.getGenericReturnType(); Map, Type> argsCf = TypeUtils.getTypeArguments(ret, CompletableFuture.class); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/DefaultSchemaContext.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/DefaultSchemaContext.java index b733bbd989..e4b324b911 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/DefaultSchemaContext.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/DefaultSchemaContext.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,6 +19,11 @@ import java.util.*; import ghidra.dbg.target.schema.TargetObjectSchema.SchemaName; +/** + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public class DefaultSchemaContext implements SchemaContext { private final Map schemas = new LinkedHashMap<>(); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/DefaultTargetObjectSchema.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/DefaultTargetObjectSchema.java index 21221412ff..d1f9522690 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/DefaultTargetObjectSchema.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/DefaultTargetObjectSchema.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,11 @@ import java.util.*; import ghidra.dbg.DebuggerObjectModel; import ghidra.dbg.target.TargetObject; +/** + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public class DefaultTargetObjectSchema implements TargetObjectSchema, Comparable { private static final String INDENT = " "; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/EnumerableTargetObjectSchema.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/EnumerableTargetObjectSchema.java index 543684dc7b..81b0fd4049 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/EnumerableTargetObjectSchema.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/EnumerableTargetObjectSchema.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,6 +29,11 @@ import ghidra.dbg.util.PathMatcher; import ghidra.program.model.address.Address; import ghidra.program.model.address.AddressRange; +/** + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public enum EnumerableTargetObjectSchema implements TargetObjectSchema { /** * The top-most type descriptor diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/SchemaBuilder.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/SchemaBuilder.java index a1498eae64..91171c81bc 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/SchemaBuilder.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/SchemaBuilder.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,11 @@ import java.util.*; import ghidra.dbg.target.TargetObject; import ghidra.dbg.target.schema.TargetObjectSchema.*; +/** + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public class SchemaBuilder { private final DefaultSchemaContext context; private final SchemaName name; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/SchemaContext.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/SchemaContext.java index dd5fd2c9cd..f87f537006 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/SchemaContext.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/SchemaContext.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -21,7 +21,11 @@ import ghidra.dbg.target.schema.TargetObjectSchema.SchemaName; /** * A collection of related schemas + * + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. */ +@Deprecated(since = "11.2") public interface SchemaContext { /** * Resolve a schema in this context by name diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetAttributeType.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetAttributeType.java index 3c0a764a97..68d5f96cb4 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetAttributeType.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetAttributeType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,7 +25,10 @@ import ghidra.dbg.target.TargetObject; *

* It can be used in {@link TargetObjectSchemaInfo#attributes()} or be applied to a public, possibly * inherited, getter method for the attribute. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") @Target(ElementType.METHOD) @Retention(RetentionPolicy.RUNTIME) public @interface TargetAttributeType { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetElementType.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetElementType.java index e00a05a038..cfb76de67a 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetElementType.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetElementType.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,6 +19,10 @@ import java.lang.annotation.*; import ghidra.dbg.target.TargetObject; +/** + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + */ +@Deprecated(forRemoval = true, since = "11.2") @Target({}) @Retention(RetentionPolicy.RUNTIME) public @interface TargetElementType { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetObjectSchema.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetObjectSchema.java index 755e85e060..67d689ea82 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetObjectSchema.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetObjectSchema.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -48,7 +48,11 @@ import ghidra.util.Msg; * The schema can specify attribute aliases, which implies that a particular key ("from") will * always have the same value as another ("to"). As a result, the schemas of aliased keys will also * implicitly match. + * + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. */ +@Deprecated(since = "11.2") public interface TargetObjectSchema { public static final ResyncMode DEFAULT_ELEMENT_RESYNC = ResyncMode.NEVER; public static final ResyncMode DEFAULT_ATTRIBUTE_RESYNC = ResyncMode.NEVER; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetObjectSchemaInfo.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetObjectSchemaInfo.java index 172dd161e6..fccf379dee 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetObjectSchemaInfo.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/TargetObjectSchemaInfo.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,6 +19,10 @@ import java.lang.annotation.*; import ghidra.dbg.target.schema.TargetObjectSchema.ResyncMode; +/** + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + */ +@Deprecated(forRemoval = true, since = "11.2") @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface TargetObjectSchemaInfo { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/XmlSchemaContext.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/XmlSchemaContext.java index c7484bdba7..cdd40b4fb9 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/XmlSchemaContext.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/target/schema/XmlSchemaContext.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -28,6 +28,11 @@ import ghidra.dbg.target.schema.TargetObjectSchema.*; import ghidra.util.Msg; import ghidra.util.xml.XmlUtilities; +/** + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public class XmlSchemaContext extends DefaultSchemaContext { protected static final String ELEM_CONTEXT = "context"; protected static final String ATTR_CANONICAL = "canonical"; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/CollectionUtils.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/CollectionUtils.java index d80f13b855..7b715bf4a8 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/CollectionUtils.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/CollectionUtils.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -18,6 +18,10 @@ package ghidra.dbg.util; import java.util.*; import java.util.function.*; +/** + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + */ +@Deprecated(forRemoval = true, since = "11.2") public enum CollectionUtils { ; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ConfigurableFactory.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ConfigurableFactory.java index aa98844877..d4e2234fc2 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ConfigurableFactory.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ConfigurableFactory.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,6 +29,10 @@ import ghidra.framework.plugintool.AutoConfigState.ConfigFieldCodec; import ghidra.framework.plugintool.AutoConfigState.ConfigStateField; import ghidra.util.Msg; +/** + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + */ +@Deprecated(forRemoval = true, since = "11.2") public interface ConfigurableFactory { @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ConversionUtils.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ConversionUtils.java index beeb3f318f..d903252f13 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ConversionUtils.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ConversionUtils.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,14 +17,11 @@ package ghidra.dbg.util; import java.math.BigInteger; import java.util.Arrays; -import java.util.stream.Collectors; - -import ghidra.dbg.attributes.TargetStringList; -import ghidra.dbg.attributes.TargetStringList.MutableTargetStringList; -import ghidra.dbg.target.TargetMemory; -import ghidra.program.model.address.AddressFactory; -import ghidra.program.model.address.AddressSpace; +/** + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + */ +@Deprecated(forRemoval = true, since = "11.2") public enum ConversionUtils { ; /** @@ -55,17 +52,4 @@ public enum ConversionUtils { } return result; } - - /** - * @deprecated Since removing getAddressFactory from {@link TargetMemory}, I don't think this is - * needed anymore. - */ - @Deprecated(forRemoval = true) - public static TargetStringList addressFactoryToSpaceNameSet(AddressFactory factory) { - return Arrays.asList(factory.getAddressSpaces()) - .stream() - // TODO .filter - .map(AddressSpace::getName) - .collect(Collectors.toCollection(MutableTargetStringList::new)); - } } diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/DebuggerCallbackReorderer.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/DebuggerCallbackReorderer.java index 92c15695f9..eaeaf2a29d 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/DebuggerCallbackReorderer.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/DebuggerCallbackReorderer.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -37,7 +37,10 @@ import ghidra.util.Msg; *

* When this is added to the model, {@code replay} must be true, or behavior of the mechanism is * undefined. + * + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class DebuggerCallbackReorderer implements DebuggerModelListener { private class ObjectRecord { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/HandlerMap.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/HandlerMap.java index 2b4d7b8d31..5adf25ddba 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/HandlerMap.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/HandlerMap.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -32,7 +32,11 @@ import java.util.function.BiFunction; * @param the root type for all handlers and passed objects * @param the type of custom additional argument * @param the type of result returned by the handler + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + * Anymore, the use case this supported can be accomplished with Java's new switch + * statements on types. */ +@Deprecated(forRemoval = true, since = "11.2") public class HandlerMap { private LinkedHashMap, BiFunction> map = new LinkedHashMap<>(); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathMatcher.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathMatcher.java index 92a5361e8b..ba6c8b19cc 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathMatcher.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathMatcher.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -20,6 +20,11 @@ import java.util.function.Predicate; import org.apache.commons.lang3.StringUtils; +/** + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public class PathMatcher implements PathPredicates { protected static final Set WILD_SINGLETON = Set.of(""); diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathPattern.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathPattern.java index d0c7d906fa..b0a7c312c8 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathPattern.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathPattern.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,6 +17,11 @@ package ghidra.dbg.util; import java.util.*; +/** + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public class PathPattern implements PathPredicates { private final List pattern; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathPredicates.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathPredicates.java index 46f14a18e1..7d8ece9f19 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathPredicates.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathPredicates.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,6 +25,11 @@ import ghidra.dbg.target.TargetObject; import ghidra.dbg.util.PathUtils.PathComparator; import ghidra.util.ReversedListIterator; +/** + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public interface PathPredicates { PathPredicates EMPTY = new PathPredicates() { @Override diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathUtils.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathUtils.java index 8315c8dd82..5b522f7329 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathUtils.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PathUtils.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -30,7 +30,11 @@ import ghidra.dbg.target.TargetObject; * Element indices are enclosed in brackets {@code []}, may be multidimensional, and may be any type * encoded as a string. Method invocations contain {@code (...)}. The root object has the empty * path. + * + * @deprecated This will be moved/refactored into trace database. In general, it will still exist, + * but things depending on it are now back on shifting sand. */ +@Deprecated(since = "11.2") public enum PathUtils { ; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PrefixMap.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PrefixMap.java index 4458663bb8..f4811bb095 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PrefixMap.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/PrefixMap.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -36,7 +36,9 @@ import utility.function.ExceptionalFunction; * * @param the base class for the parser types * @param the base class for checked exceptions that must be handled by callers + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. */ +@Deprecated(forRemoval = true, since = "11.2") public class PrefixMap extends LinkedHashMap> { diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ShellUtils.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ShellUtils.java index 60731e9359..e0efd3a912 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ShellUtils.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ShellUtils.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -19,6 +19,11 @@ import java.nio.file.Paths; import java.util.*; import java.util.stream.Collectors; +/** + * @deprecated This will be moved/refactored. In general, it will still exist, but things depending + * on it are now back on shifting sand. + */ +@Deprecated(since = "11.2") public class ShellUtils { enum State { NORMAL, NORMAL_ESCAPE, DQUOTE, DQUOTE_ESCAPE, SQUOTE, SQUOTE_ESCAPE; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/TargetDataTypeConverter.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/TargetDataTypeConverter.java index 7307af57fd..2d52267c5b 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/TargetDataTypeConverter.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/TargetDataTypeConverter.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,6 +29,10 @@ import ghidra.dbg.util.PathUtils.TargetObjectKeyComparator; import ghidra.program.model.data.*; import ghidra.util.Msg; +/** + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + */ +@Deprecated(forRemoval = true, since = "11.2") public class TargetDataTypeConverter { protected static class ConvertedMember { protected final TargetDataTypeMember member; diff --git a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ValueUtils.java b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ValueUtils.java index 01c271c0f5..5328727eed 100644 --- a/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ValueUtils.java +++ b/Ghidra/Debug/Framework-Debugging/src/main/java/ghidra/dbg/util/ValueUtils.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -17,6 +17,10 @@ package ghidra.dbg.util; import ghidra.util.Msg; +/** + * @deprecated Will be removed in 11.3. Portions may be refactored into trace object database. + */ +@Deprecated(forRemoval = true, since = "11.2") public enum ValueUtils { ; public static final boolean INCLUDE_STACK = false; diff --git a/Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/test/AbstractDebuggerModelTest.java b/Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/test/AbstractDebuggerModelTest.java index 8ad5ae6ce1..3cb4163e8b 100644 --- a/Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/test/AbstractDebuggerModelTest.java +++ b/Ghidra/Debug/Framework-Debugging/src/test/java/ghidra/dbg/test/AbstractDebuggerModelTest.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -40,7 +40,11 @@ import ghidra.util.Msg; *

  • TODO: ensure order: created(Thread), event(THREAD_CREATED), created(RegisterBank) ?
    • *
  • TODO: ensure registersUpdated(RegisterBank) immediately upon created(RegisterBank) ?
    • * + * + * @deprecated All derivative tests are now ignored, since running them is no longer of any real + * value. */ +@Deprecated(forRemoval = true, since = "11.2") public abstract class AbstractDebuggerModelTest extends AbstractGhidraHeadedIntegrationTest implements TestDebuggerModelProvider, DebuggerModelTestUtils { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/PluginInstallerTableModel.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/PluginInstallerTableModel.java index f93413e0b0..78b5ef1437 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/PluginInstallerTableModel.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/dialog/PluginInstallerTableModel.java @@ -4,9 +4,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -50,13 +50,12 @@ class PluginInstallerTableModel public static final Icon EXPERIMENTAL_ICON = Icons.WARNING_ICON; public static final Icon DEV_ICON = Icons.STRONG_WARNING_ICON; + public static final Icon DEPRECATED_ICON = Icons.WARNING_ICON; - private static Map statusIconMap = new HashMap<>(); - - static { - statusIconMap.put(PluginStatus.UNSTABLE, DEV_ICON); - statusIconMap.put(PluginStatus.STABLE, EXPERIMENTAL_ICON); - } + private static Map statusIconMap = Map.ofEntries( + Map.entry(PluginStatus.UNSTABLE, DEV_ICON), + Map.entry(PluginStatus.STABLE, EXPERIMENTAL_ICON), + Map.entry(PluginStatus.DEPRECATED, DEPRECATED_ICON)); private PluginConfigurationModel model; private List pluginDescriptions; @@ -66,8 +65,8 @@ class PluginInstallerTableModel * Constructs a new data model. * * @param tool the current tool - * @param parentComponent the ui component that should be forced to refresh if a plugin's - * state changes. + * @param parentComponent the ui component that should be forced to refresh if a plugin's state + * changes. * @param pluginDescriptions the list of plugin descriptions to display * @param model the main plugin configuration model */ @@ -116,8 +115,7 @@ class PluginInstallerTableModel } /** - * Overridden to handle the case where a user has toggled the installation column - * checkbox. + * Overridden to handle the case where a user has toggled the installation column checkbox. */ @Override public void setValueAt(Object aValue, int rowIndex, int columnIndex) { @@ -177,8 +175,8 @@ class PluginInstallerTableModel } /** - * Column for displaying the interactive checkbox, allowing the user to install - * or uninstall the plugin. + * Column for displaying the interactive checkbox, allowing the user to install or uninstall the + * plugin. */ private class PluginInstalledColumn extends AbstractDynamicTableColumn> { diff --git a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginStatus.java b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginStatus.java index 4443390ae0..ea60a56408 100644 --- a/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginStatus.java +++ b/Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/util/PluginStatus.java @@ -19,7 +19,12 @@ public enum PluginStatus { RELEASED("Released (Tested and Documented)"), STABLE("Useable, but not fully tested or documented"), UNSTABLE("This plugin is under Development. Use of this plugin is not recommended."), - HIDDEN("This plugin is not available via the plugin configuration GUI"); + HIDDEN("This plugin is not available via the plugin configuration GUI"), + /** + * Developers should include in the plugin description the version when the plugin became + * deprecated and, if subject to removal, the version that removal is expected. + */ + DEPRECATED("This plugin is useable, but deprecated and may soon be removed"); private String description;