Skip to content

Commit

Permalink
Merge pull request #141 from OP-TED/feature/EPO-730
Browse files Browse the repository at this point in the history
Feature/epo 730
  • Loading branch information
Dragos0000 authored Feb 28, 2023
2 parents 8d8e8af + 34be326 commit 68fe634
Show file tree
Hide file tree
Showing 53 changed files with 49,404 additions and 1,133,279 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Tests

on:
push:
branches: [ feature/* , main, hotfix/*, release/* ]
# pull_request:
# branches: [ main, release/* ]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
build:
name: Build and Run Tests
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Build and Run Tests
run: mvn install
- name: current dir
run: pwd
- name: current dir
run: ls -la ./target/surefire-reports
- name: Publish Test Report
uses: mikepenz/action-junit-report@v3
if: success() || failure() # always run even if the previous step fails
with:
report_paths: '**/target/surefire-reports/test-*.xml'
detailed_summary: true

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ xspec
transform/*.jar
transform/doc
output
target
bin/
lib64
pyvenv.cfg
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ init: get-saxon get-xspec get-rdflib
############################ Main tasks ##############################################
# Run unit_tests
unit-tests:
@ant -lib ${SAXON} unit_tests
@mvn install

update-metadata.xml-to-test-data:
@echo "${MODEL2OWL_DIR}/test/testData ${MODEL2OWL_DIR}/test/test-multi-xmi ${MODEL2OWL_DIR}/test/test-merge-xmi" | xargs -n 1 cp -v ${MODEL2OWL_DIR}/config/metadata.xml
Expand Down
76 changes: 0 additions & 76 deletions build.xml

This file was deleted.

47 changes: 47 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>ws.meaningfy.model2owl</groupId>
<artifactId>model2owl</artifactId>
<version>1</version>
<build>
<plugins>
<plugin>
<groupId>com.nkutsche</groupId>
<artifactId>xspec-maven-plugin</artifactId>
<version>2.0.0</version>
<executions>
<execution>
<goals>
<goal>run-xspec</goal>
</goals>
</execution>
</executions>
<configuration>
<testDir>${project.basedir}/test/unitTests</testDir>
<generateSurefireReport>true</generateSurefireReport>
<xspecProperties>
<xspec.fail>false</xspec.fail>
</xspecProperties>
</configuration>
<!-- <dependencies>-->
<!-- <dependency>-->
<!-- <groupId>io.xspec</groupId>-->
<!-- <artifactId>xspec</artifactId>-->
<!-- <version>2.2.4</version>-->
<!-- <classifier>enduser-files</classifier>-->
<!-- <type>zip</type>-->
<!-- </dependency>-->
<!-- <dependency>-->
<!-- <groupId>name.dmaus.schxslt</groupId>-->
<!-- <artifactId>schxslt</artifactId>-->
<!-- <version>1.8.6</version>-->
<!-- </dependency>-->
<!-- </dependencies>-->
</plugin>
</plugins>
</build>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@
"
/>
</xsl:template>

<!-- TODO Do we need the rule below?-->

<xd:doc>
<xd:desc>[class-attribute-type-24] - The attribute $attributeName$ type is deprecated.
Expand Down
20 changes: 10 additions & 10 deletions test/testData/ePO-CM-v2.0.1-2020-03-27_test.eap.xmi
Original file line number Diff line number Diff line change
Expand Up @@ -27064,7 +27064,7 @@
<coords ordered="0" scale="0"/>
<containment containment="Not Specified" position="2"/>
<stereotype/>
<bounds lower="1" upper="1"/>
<bounds lower="0" upper="*"/>
<options/>
<style/>
<styleex value="volatile=0;union=0;"/>
Expand Down Expand Up @@ -27100,9 +27100,9 @@
<attributes>
<attribute xmi:idref="EAID_9727E53F_8961_479b_A300_BAA2DBEF459D" name="epo:ID" scope="Public">
<initial/>
<documentation value="Identifies the criterion unambiguously and uniquely across all procurement procedures.."/>
<documentation/>
<model ea_localid="55" ea_guid="{9727E53F-8961-479b-A300-BAA2DBEF459D}"/>
<properties type="Identifier" collection="false" static="0" duplicates="0" changeability="changeable"/>
<properties type="epo:Identifier" collection="false" static="0" duplicates="0" changeability="changeable"/>
<coords ordered="0"/>
<containment containment="Not Specified" position="0"/>
<stereotype/>
Expand All @@ -27117,7 +27117,7 @@
<initial/>
<documentation value="The method to interpret the threshold value as minimum or a maximum.&#xA;&#xA;WG Approval 17/09/2019 "/>
<model ea_localid="1172" ea_guid="{1A9EA88C-E8D9-48a9-B832-5EE01758F3A2}"/>
<properties type="Code" collection="false" static="0" duplicates="0" changeability="changeable"/>
<properties type="epo:Code" collection="false" static="0" duplicates="0" changeability="changeable"/>
<coords ordered="0"/>
<containment containment="Not Specified" position="0"/>
<stereotype/>
Expand Down Expand Up @@ -32483,11 +32483,11 @@
<initial/>
<documentation/>
<model ea_localid="2039" ea_guid="{89ACE32E-7513-48cd-8763-8038F66E55AF}"/>
<properties type="Text" collection="false" static="0" duplicates="0" changeability="changeable"/>
<properties collection="false" static="0" duplicates="0" changeability="changeable"/>
<coords ordered="0"/>
<containment containment="Not Specified" position="2"/>
<stereotype/>
<bounds lower="1" upper="1"/>
<bounds lower="1" upper="*"/>
<options/>
<style/>
<styleex value="volatile=0;"/>
Expand Down Expand Up @@ -33899,7 +33899,7 @@
<initial/>
<documentation/>
<model ea_localid="1488" ea_guid="{65A994A6-47DE-446f-A010-BB272F058EE5}"/>
<properties type="Identifier" collection="false" static="0" duplicates="0" changeability="changeable"/>
<properties type="xsd:integer" collection="false" static="0" duplicates="0" changeability="changeable"/>
<coords ordered="0"/>
<containment containment="Not Specified" position="1"/>
<stereotype/>
Expand Down Expand Up @@ -42763,7 +42763,7 @@
<xrefs value="$XREFPROP=$XID={E43F26B3-5DA7-4492-9F86-85418A83EA38}$XID;$NAM=Stereotypes$NAM;$TYP=connector property$TYP;$VIS=Public$VIS;$PAR=0$PAR;$DES=@STEREO;Name=disjoint;GUID={882EF110-F020-415a-9C66-B300176EE3F3};@ENDSTEREO;$DES;$CLT={6D81F842-43D3-4649-A090-5529FD788939}$CLT;$SUP=&lt;none&gt;$SUP;$ENDXREF;"/>
<tags/>
</connector>
<connector xmi:idref="EAID_74BF0929_B7E7_4a70_8233_F2011B993369">
<connector xmi:idref="EAID_74BF0929_B7E7_4a70_8233_F2011B993369" >
<source xmi:idref="EAID_1E157B1E_F107_492b_B385_821B904A8FDA">
<model ea_localid="636" type="Note"/>
<role visibility="Public" targetScope="instance"/>
Expand Down Expand Up @@ -54064,7 +54064,7 @@
<xrefs/>
<tags/>
</connector>
<connector xmi:idref="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00" name="(inherits from Document &quot;relates To&quot;)">
<connector xmi:idref="EAID_5A3E83F2_4A0C_4707_ACA1_C8D3B87F7C00" name="Name">
<source xmi:idref="EAID_5983899F_3291_4d88_9CAC_77BD3A82D0D0">
<model ea_localid="350" type="Class" name="epo:PriorInformationNotice"/>
<role visibility="Public" targetScope="instance"/>
Expand Down Expand Up @@ -54202,7 +54202,7 @@
<xrefs/>
<tags/>
</connector>
<connector xmi:idref="EAID_537D539F_60E6_496c_9216_47D07F0D86EB" name="(inherits from Document &quot;relates To&quot;)">
<connector xmi:idref="EAID_537D539F_60E6_496c_9216_47D07F0D86EB" name="Good">
<source xmi:idref="EAID_5983899F_3291_4d88_9CAC_77BD3A82D0D0">
<model ea_localid="350" type="Class" name="epo:PriorInformationNotice"/>
<role visibility="Public" targetScope="instance"/>
Expand Down
Loading

0 comments on commit 68fe634

Please sign in to comment.