Skip to content

Commit

Permalink
Merge pull request #332 from FischerRene/development
Browse files Browse the repository at this point in the history
Reworks comments and names of file tests
  • Loading branch information
FrankSchnicke authored Jul 31, 2023
2 parents a48f9f7 + 6e98855 commit a999def
Showing 1 changed file with 16 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -394,9 +394,13 @@ public void testUpdateElementInSmElementCollection() {
assertEquals(321, value.intValue());
}

/**
* Test getting a file in a collection having the "File" keyword as the start of
* its IdShort.
*/
@SuppressWarnings("unchecked")
@Test
public void collectionIdShortFileCollision() {
public void getFileFromCollectionWithFileKeywordCollision() {
VABElementProxy submodelProxy = getConnectionManager().connectToVABElement(submodelAddr);

String colIdShort = "Files";
Expand All @@ -419,18 +423,22 @@ public void collectionIdShortFileCollision() {
}

/**
* Test getting a File with "File" as IdShort
* Test getting a file with a non colliding IdShort.
*/
@Test
public void getFileSubmodelElement() {
public void getSimpleFileSubmodelElement() {
VABElementProxy submodelProxy = getConnectionManager().connectToVABElement(submodelAddr);
String fileIdShort = "MySimpleFile";
createSimpleFile(submodelProxy, fileIdShort);
assertSimpleFileValue(submodelProxy, fileIdShort);
}

/**
* Test getting a property that happens to have the "File" keyword as its
* IdShort.
*/
@Test
public void getIdShortCollision() {
public void getPropertyWithFileKeywordCollision() {
VABElementProxy submodelProxy = getConnectionManager().connectToVABElement(submodelAddr);
String fileIdShort = "File";

Expand All @@ -441,8 +449,11 @@ public void getIdShortCollision() {
assertSimplePropertyValue(submodelProxy, fileIdShort);
}

/**
* Test getting a File with the "File" keyword as its IdShort.
*/
@Test
public void getFileIdShortCollision() {
public void getFileWithFileKeywordCollision() {
VABElementProxy submodelProxy = getConnectionManager().connectToVABElement(submodelAddr);
String fileIdShort = "File";
createSimpleFile(submodelProxy, fileIdShort);
Expand Down

0 comments on commit a999def

Please sign in to comment.