Update the Testcases + Travis Integration

Tests now have a seperate workspace for easier execution and to make them more robust. Currently the tests are running in a third Travis Build, next to the maven and yarn builds. However, since the tests require maven and yarn to be run, these tests could be put together in the future. Right now two tests are failing due to eclipsesource#103. Signed-off-by: Simon Graband <[email protected]>
sgraband · Apr 14, 2020 · 981f9b1 · 981f9b1
1 parent de808d7
commit 981f9b1
Show file tree

Hide file tree

Showing 11 changed files with 18,022 additions and 388 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -47,4 +47,40 @@ matrix:
           - xvfb
           - libx11-dev
           - libxkbfile-dev
-      install: false
+      install: skip
+
+    - dist: bionic
+
+      services:
+        - xvfb 
+
+      language: node_js
+      node_js: '10'
+      before_script:
+        - cd server
+        - mvn install -U
+        - cd ../client
+        - fluxbox >/dev/null 2>&1 &
+        - sleep 3
+        - yarn
+      script: yarn e2etest
+      cache:
+        yarn: true
+        directories:
+          - node_modules
+      env:
+        global:
+          - CXX=g++-4.8
+          - NODE_OPTIONS="--max_old_space_size=4096"
+      addons:
+        firefox: latest
+        chrome: stable
+        apt:
+          update: true
+          packages:
+          - g++-4.8
+          - libsecret-1-dev
+          - xvfb
+          - libx11-dev
+          - libxkbfile-dev
+      install: skip
diff --git a/client/package.json b/client/package.json
@@ -11,7 +11,7 @@
     "publish:next": "lerna publish --exact --canary=next --npm-tag=next --yes",
     "theia:start": "cd browser-app && yarn start",
     "testcafe:start": "testcafe chrome tests/test.ts",
-    "e2etest": "npm-run-all --parallel --aggregate-output theia:start testcafe:start"
+    "e2etest": "npm-run-all --parallel --race --aggregate-output theia:start testcafe:start"
   },
   "devDependencies": {
     "lerna": "2.4.0",

diff --git a/client/tests/test.ts b/client/tests/test.ts
diff --git a/client/tests/workspace/UML.ecore b/client/tests/workspace/UML.ecore
diff --git a/client/tests/workspace/empty.ecore b/client/tests/workspace/empty.ecore
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="testpackage" nsURI="testpackage" nsPrefix="testpackage"/>
diff --git a/client/tests/workspace/test.ecore b/client/tests/workspace/test.ecore
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="Test" nsURI="testURI" nsPrefix="testPrefix">
+  <eClassifiers xsi:type="ecore:EClass" name="Class">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="reference" eType="//Abstract"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Abstract" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Interface" interface="true" eSuperTypes="//Abstract">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="containment" eType="//Class" containment="true"/>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Enum"/>
+  <eClassifiers xsi:type="ecore:EDataType" name="DataType" instanceClassName="java.lang.Object"/>
+</ecore:EPackage>
diff --git a/client/tests/workspace/test.enotation b/client/tests/workspace/test.enotation
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="ASCII"?>
+<enotation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enotation="http://www.eclipsesource.com/glsp/ecore/notation">
+  <semanticElement uri="/"/>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Class"/>
+    <position x="462.828125" y="129.0"/>
+    <size width="91.015625" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Abstract"/>
+    <position x="240.84375" y="293.83333333333337"/>
+    <size width="115.8125" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Interface"/>
+    <position x="121.0" y="96.83333333333334"/>
+    <size width="118.828125" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Enum"/>
+    <position x="12.0" y="12.0"/>
+    <size width="93.25" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Edge">
+    <semanticElement uri="//NewEClass0/neweclass1s"/>
+    <bendPoints x="511.75" y="319.33333333333337"/>
+  </elements>
+  <elements xsi:type="enotation:Edge">
+    <semanticElement uri="//NewEClass2/neweclass0s"/>
+    <bendPoints x="180.4140625" y="159.33333333333334"/>
+    <bendPoints x="261.328125" y="159.33333333333334"/>
+    <bendPoints x="261.328125" y="148.5"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Class"/>
+    <position x="11.0" y="247.0"/>
+    <size width="91.015625" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Abstract"/>
+    <position x="191.0" y="103.0"/>
+    <size width="115.8125" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Interface"/>
+    <position x="312.0" y="270.0"/>
+    <size width="118.828125" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Enum"/>
+    <position x="6.0" y="7.0"/>
+    <size width="93.25" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//DataType"/>
+    <position x="291.0" y="10.0"/>
+    <size width="167.875" height="75.015625"/>
+  </elements>
+  <elements xsi:type="enotation:Edge">
+    <semanticElement uri="//Class/abstracts"/>
+  </elements>
+  <elements xsi:type="enotation:Edge">
+    <semanticElement uri="//Interface/classs"/>
+    <bendPoints x="722.4140625" y="354.5"/>
+    <bendPoints x="348.5078125" y="354.5"/>
+  </elements>
+  <elements xsi:type="enotation:Edge">
+    <semanticElement uri="//Class/reference"/>
+    <bendPoints x="138.90625" y="268.5"/>
+    <bendPoints x="138.90625" y="124.5"/>
+  </elements>
+  <elements xsi:type="enotation:Edge">
+    <semanticElement uri="//Interface/containment"/>
+    <bendPoints x="371.4140625" y="358.5"/>
+    <bendPoints x="56.5078125" y="358.5"/>
+  </elements>
+</enotation:Diagram>
diff --git a/client/tests/workspace/testNodesOnly.ecore b/client/tests/workspace/testNodesOnly.ecore
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="testNodesOnly" nsURI="testNodesOnly" nsPrefix="testNodesOnly">
+  <eClassifiers xsi:type="ecore:EClass" name="Class"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Interface" interface="true"/>
+  <eClassifiers xsi:type="ecore:EClass" name="Abstract" abstract="true"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="Enum"/>
+</ecore:EPackage>
diff --git a/client/tests/workspace/testNodesOnly.enotation b/client/tests/workspace/testNodesOnly.enotation
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ASCII"?>
+<enotation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enotation="http://www.eclipsesource.com/glsp/ecore/notation">
+  <semanticElement uri="/"/>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Class"/>
+    <position x="73.0" y="168.0"/>
+    <size width="91.015625" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Interface"/>
+    <position x="275.0" y="72.0"/>
+    <size width="118.828125" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Abstract"/>
+    <position x="424.0" y="275.0"/>
+    <size width="115.8125" height="43.0"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Enum"/>
+    <position x="82.0" y="334.0"/>
+    <size width="93.25" height="43.0"/>
+  </elements>
+</enotation:Diagram>
diff --git a/client/tests/workspace/testNodesWithAttributes.ecore b/client/tests/workspace/testNodesWithAttributes.ecore
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="testNodesWithAttributes" nsURI="testNodesWithAttributes" nsPrefix="testNodesWithAttributes">
+  <eClassifiers xsi:type="ecore:EClass" name="Class">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ClassAttribute">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Abstract" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="AbstractAttribute">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="Interface" interface="true">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="InterfaceAttribute">
+      <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    </eStructuralFeatures>
+  </eClassifiers>
+  <eClassifiers xsi:type="ecore:EEnum" name="Enum">
+    <eLiterals name="EnumLiteral" value="7"/>
+  </eClassifiers>
+</ecore:EPackage>
diff --git a/client/tests/workspace/testNodesWithAttributes.enotation b/client/tests/workspace/testNodesWithAttributes.enotation
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ASCII"?>
+<enotation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:enotation="http://www.eclipsesource.com/glsp/ecore/notation">
+  <semanticElement uri="/"/>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Class"/>
+    <position x="12.0" y="12.0"/>
+    <size width="246.75" height="75.015625"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Abstract"/>
+    <position x="8.0" y="134.0"/>
+    <size width="270.109375" height="75.015625"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Interface"/>
+    <position x="280.0" y="12.0"/>
+    <size width="274.5625" height="75.015625"/>
+  </elements>
+  <elements xsi:type="enotation:Shape">
+    <semanticElement uri="//Enum"/>
+    <position x="310.015625" y="135.0"/>
+    <size width="146.71875" height="75.015625"/>
+  </elements>
+</enotation:Diagram>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?xml version="1.0" encoding="UTF-8"?>
		<ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="testpackage" nsURI="testpackage" nsPrefix="testpackage"/>