Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added
- Adding some utility methods [#368](https://github.com/ie3-institute/simonaAPI/issues/368)
- Extending flex option handling in `ExtInputContainer` [#371](https://github.com/ie3-institute/simonaAPI/issues/371)
- Enhancing `ExtInputContainer` with `hasData` methods [#382](https://github.com/ie3-institute/simonaAPI/issues/382)

### Changed
- Changes to sent and received em data [#2366](https://github.com/ie3-institute/simonaAPI/issues/366)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,19 @@ public Optional<Long> getMaybeNextTick() {
return maybeNextTick;
}

/** Returns {@code true} if this container holds primary data. */
public boolean hasPrimaryData() {
return !primaryData.isEmpty();
}

/** Returns {@code true} if this container holds em data. */
public boolean hasEmData() {
return !flexRequests.isEmpty()
|| !flexOptions.isEmpty()
|| !setPoints.isEmpty()
|| !emMessages.isEmpty();
}

// add data

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,30 @@ class ExtInputContainerTest extends Specification {
expect:
def container1 = new ExtInputContainer(0L)
container1.empty
!container1.hasPrimaryData()
!container1.hasEmData()
container1.addPrimaryValue(UUID.randomUUID(), null)
!container1.empty
container1.hasPrimaryData()
!container1.hasEmData()

def container2 = new ExtInputContainer(0L)
container2.empty
!container2.hasPrimaryData()
!container2.hasEmData()
container2.addFlexComMessage(null)
!container2.empty
!container2.hasPrimaryData()
container2.hasEmData()

def container3 = new ExtInputContainer(0L)
container3.empty
!container3.hasPrimaryData()
!container3.hasEmData()
container3.addRequest(UUID.randomUUID())
!container3.empty
!container3.hasPrimaryData()
container3.hasEmData()
}

def "An ExtInputContainer should add primary data correctly"() {
Expand Down