Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue573 #597

Merged
merged 7 commits into from
Dec 2, 2021
Merged

Issue573 #597

merged 7 commits into from
Dec 2, 2021

Conversation

russell-d-e
Copy link
Contributor

#573 and #576

Added ontology for Test Procedure and test Logs.

Also created new Ontology for Hardware Components

@AbhaMoitra
Copy link
Contributor

@russell-d-e : We have the following
" TEST_PROCEDURE is a COLLECTION of TEST_STEP which in turn is a COLLECTION of TEST"
and associated with these we have respectively
" TEST_LOG, TEST_RECORD and TEST_RESULT"
While the "note" tells us that TEST_LOG is for TEST_PROCEDURE" etc. that may not be something people have in their mental model and they may not have easy access to the "note".
Q. So, do you think we should rename TEST_LOG and TEST_RECORD?
Q. We have 3 levels in this hierarchy - just checking. You know this much better.

We have the following
TEST_RECORD (note "a TEST_RECORD is a collection of TEST_RESULTs assoicated with a TEST_STEP") is a type of COLLECTION.
content of TEST_RECORD only has values of type TEST_RESULT.
nextRecord (note "The next TEST_RECORD that is the next in a sequence " ) describes TEST_STEP with a single value of type TEST_RECORD.
logs (note "The next TEST_STEP from which the TEST_RECORD is captured" ) describes TEST_STEP with a single value of type TEST_STEP.
logs is a type of wasImpactedBy.

  • correct the spelling of "assoicated"
  • did we want domain of nextRecord to be TEST_RECORD? Do we typically navigate by going to "next test step" and looking at the results (in which case the property name could be "record" instead of "nextRecord") or we go from "result" to "next result"?
  • also we have log: TEST_STEP -> TEST_STEP?

corrected domain for nextRecord and logs
@kityansiu
Copy link
Contributor

Putting a comment here in case git merge doesn't resolve it. Be sure to remove from TESTING.sadl the following lines:

under TEST
producedBy (note "TEST_DEVELOPMENT activity(s) this test belongs to") describes TEST with values of type ACTIVITY.
producedBy is a type of wasGeneratedBy.

under TEST_RESULT
executedBy (note "ACTIVITY(s) that created this test result") describes TEST_RESULT with values of type ACTIVITY.
executedBy is a type of wasGeneratedBy.

@russell-d-e
Copy link
Contributor Author

@kityansiu and @AbhaMoitra

I think I have merged all the changes back from master into this branch. could you do one more quick check just because the merge got a bit messy. If it looks good we can merge and remove the branch.

Copy link
Contributor

@tuxji tuxji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, although I'll defer to Kit and Abha for approval. I just wanted to say that I hope we'll stop updating OWL and CDR files soon and remove them from git since the CI jobs automatically generate new OWL and CDR files now (meaning that the files in git don't make it to the rack-box dev image anyway).

@@ -0,0 +1,40 @@
/AGENTS.owl
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this file. We don't need it since 1) ignoring OWL files already in git doesn't work, and 2) when the time comes, we'll remove OWL files from git and put *.owl in RACK/.gitignore at the root level.

@tuxji
Copy link
Contributor

tuxji commented Dec 2, 2021

@russell-d-e, another suggestion too. As you said, this branch has a messy git history because of its multiple merges and commits. When I look at the "Files Changed" tab, I see a pretty small changeset (changes to a handful of SADL files) that could easily fit into a single commit with a single commit message. GitHub has a dropdown button which allows you to select how to merge the pull request into the main branch: 1) Create a merge commit; 2) Squash and merge; 3) Rebase and merge. You want to pick 2) Squash and merge, which will squash the branch's messy git history into a single commit. I've used GitHub's Squash and merge button before and the UI works well. After you press the button, the multiple commits become one commit and you're shown a text editor pane which allows you to edit the combined commit messages however you want. You can clean up that commit message so you end up with a single commit with a single commit message that mentions only the changes to the SADL files.

@kityansiu kityansiu merged commit 09962dd into master Dec 2, 2021
@kityansiu kityansiu deleted the Issue573 branch December 2, 2021 19:47
describes HWCOMPONENT with a single value of type COMPONENT_TYPE.
partitions describes HWCOMPONENT with values of type PARTITION.

PARTITION (note "a PARTIION divides a HWCOMPOENTS resources into protected, isolated execution space for software components.") is a type of ENTITY.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"PARTITION", "HWCOMPONENTS"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in #620

@kityansiu kityansiu restored the Issue573 branch December 3, 2021 18:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants