Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-02-17 08:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GT-3418_ryanmkurtz_PR-1361_jlacomis_typo-fix'

Browse Source
This commit is contained in:
Ryan Kurtz 2019-12-19 14:37:37 -05:00
commit d0538bfe6a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ghidra/Features/Base/src/test.slow/java/ghidra/program/database/ProgramUserDataTest.java
View File

@ -103,7 +103,7 @@ public class ProgramUserDataTest extends AbstractGhidraHeadedIntegrationTest {
try {
if (value instanceof String) {
StringPropertyMap map =
userData.getStringPropery(testName.getMethodName(), propertyName, true);
userData.getStringProperty(testName.getMethodName(), propertyName, true);
map.add(addr, (String) value);
}
else {
@ -176,7 +176,7 @@ public class ProgramUserDataTest extends AbstractGhidraHeadedIntegrationTest {
// Verify user data content
ProgramUserData userData = program.getProgramUserData();
StringPropertyMap map =
userData.getStringPropery(testName.getMethodName(), "STRING", false);
userData.getStringProperty(testName.getMethodName(), "STRING", false);
assertEquals("Str0", map.getString(space.getAddress(0)));
assertEquals("Str10", map.getString(space.getAddress(10)));
assertNull(map.getString(space.getAddress(20)));
@ -241,7 +241,7 @@ public class ProgramUserDataTest extends AbstractGhidraHeadedIntegrationTest {
// Verify user data content
ProgramUserData userData = program.getProgramUserData();
StringPropertyMap map =
userData.getStringPropery(testName.getMethodName(), "STRING", false);
userData.getStringProperty(testName.getMethodName(), "STRING", false);
assertEquals("Str0", map.getString(space.getAddress(0)));
assertEquals("Str10", map.getString(space.getAddress(10)));
assertNull(map.getString(space.getAddress(20)));
@ -264,7 +264,7 @@ public class ProgramUserDataTest extends AbstractGhidraHeadedIntegrationTest {
// Verify user data content
ProgramUserData userData = program.getProgramUserData();
StringPropertyMap map =
userData.getStringPropery(testName.getMethodName(), "STRING", false);
userData.getStringProperty(testName.getMethodName(), "STRING", false);
assertEquals("Str0", map.getString(space.getAddress(0)));
assertEquals("Str10a", map.getString(space.getAddress(10)));
assertEquals("Str20a", map.getString(space.getAddress(20)));
@ -314,7 +314,7 @@ public class ProgramUserDataTest extends AbstractGhidraHeadedIntegrationTest {
// Verify user data content
ProgramUserData userData = program.getProgramUserData();
StringPropertyMap map =
userData.getStringPropery(testName.getMethodName(), "STRING", false);
userData.getStringProperty(testName.getMethodName(), "STRING", false);
assertEquals("Str0", map.getString(space.getAddress(0)));
assertEquals("Str10", map.getString(space.getAddress(10)));
assertNull(map.getString(space.getAddress(20)));

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/database/ProgramUserDataDB.java
View File

@ -604,7 +604,7 @@ class ProgramUserDataDB extends DomainObjectAdapterDB implements ProgramUserData
}
@Override
public synchronized StringPropertyMap getStringPropery(String owner, String propertyName,
public synchronized StringPropertyMap getStringProperty(String owner, String propertyName,
boolean create) throws PropertyTypeMismatchException {
return (StringPropertyMap) getPropertyMap(owner, propertyName, PROPERTY_TYPE_STRING, null,
create);

2
Ghidra/Framework/SoftwareModeling/src/main/java/ghidra/program/model/listing/ProgramUserData.java
View File

@ -45,7 +45,7 @@ public interface ProgramUserData extends UserData {
* @return property map
* @throws PropertyTypeMismatchException if a conflicting map definition was found
*/
public StringPropertyMap getStringPropery(String owner, String propertyName, boolean create)
public StringPropertyMap getStringProperty(String owner, String propertyName, boolean create)
throws PropertyTypeMismatchException;
/**

4
Ghidra/Test/IntegrationTest/src/test.slow/java/ghidra/framework/main/ProjectInfoFilesystemTest.java
View File

@ -231,7 +231,7 @@ public class ProjectInfoFilesystemTest extends AbstractGhidraHeadedIntegrationTe
int txId = programUserData.startTransaction();
try {
StringPropertyMap propertyMap =
programUserData.getStringPropery("TEST", "userProp1", true);
programUserData.getStringProperty("TEST", "userProp1", true);
propertyMap.add(addressFactory.getAddress("0100"), "userValue100");
propertyMap.add(addressFactory.getAddress("0200"), "userValue200");
}
@ -271,7 +271,7 @@ public class ProjectInfoFilesystemTest extends AbstractGhidraHeadedIntegrationTe
AddressFactory addressFactory = p.getAddressFactory();
ProgramUserData programUserData = p.getProgramUserData();
StringPropertyMap propertyMap =
programUserData.getStringPropery("TEST", "userProp1", false);
programUserData.getStringProperty("TEST", "userProp1", false);
AddressIterator propertyIterator = propertyMap.getPropertyIterator();
Address addr = addressFactory.getAddress("0100");
assertEquals(addr, propertyIterator.next());