Merge branch 'develop' into gh-20-travis-python

gchq · Jun 28, 2017 · 1c2c5d0 · 1c2c5d0
2 parents cdf1714 + 404367c
commit 1c2c5d0
Show file tree

Hide file tree

Showing 28 changed files with 351 additions and 62 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,13 +3,14 @@ cache:
   timeout: 1000
   directories:
   - $HOME/.m2
+dist: trusty
 jdk:
   - oraclejdk8
 sudo: false
 addons:
+  firefox: latest
   apt:
     packages:
-      - oracle-java8-installer
       - python3
 env:
   global:
@@ -18,11 +19,18 @@ env:
     - secure: "UXLzQaMHjae+k9tAulrjsbh9Bj3/a/8dCJpJuNXRwtsEJPD58v7hWK18+00D5BLekfLb5t8tng/n6Pl7KMjpZxCoQd3gQ06V74I08ex/bR1BYSIPh0orc7Eg7CHLfHyafaxdpPzLJSRV1Ar886qn68MHlaKhQ5wgzFCXJ3lp9090XEKv26vwVCQGkY+IlqNMJp43Dhu+wgI73HArxskBKeRxNYCdp8KpoK7q+hIja5o2ptQPG3EiclWNE05BsRe7APMTnszWH1IVJomcXtpQYIuie+GXsdaPeSBgmnbnN5ZYj6kaOWoqgPQ0iEq+k4TTV1vzvANawjxaLkcJFPpcM0P/Pm2ujpMMY7Vs4YZEokkzXrqxvP+zOXNAujCJu8HUe8moWPB7aJpq7ZqhCPqlCxwbM8xg/3ZOTSbqwAf1ygYfgf0fo6giKB/crKLQ49vq8m9CQb3ikjMU3D5ksppjWh7DBASOi2B7ok0ENnAy8gdw/8rJ+RnJGlMolsWFkk65i0q+rtvbS9nHGbejKA3+MmKQYNaT29mweRibjNZ6IbhLLndG2iz+AW5DAVHa3JcY3OTy9BQmKr+1gwnJvLnG0mQ+77JMDo5cVkEeS8bqwl36vgeFnJRN24PbpcXSn+m5GViBIZfxZd/d9r1XI3f6VcHCv1h1PG+APQPtTrIgalQ="
     - secure: "2mIgYi3USn9sB+3gQ0ULyRXspQUmpR/5M8StHzfMQ2aBGeSV9MaZ3mHxBZGoGIMejpLxE1dGLFagUZRbuH/gk+OI7tphEanfYN7quAdou0f/SzEMXEi5hlBkqFjl3eXE3FpMt5huxO5hBj2UD7dpMTe2AmIAM2LcEr1zybrQ78G19fDVJX6L5C5APC/5IKpPY4l50iFpv/A9GyT/i2Ax/FskCp73K3z5u3vCX+FsAAKu5iS63VKSdVzmjP5B+vRvLOZd80SvldDMmQM6gXTzpGiM6PoH+gehINT3Csq54mTsh6qDGMn1fPiFaczIRXc5Goe31UzhdN3aCVsnhPSoT+hTMwgNeCFcJRZbBntXoO9oUHtkjRkE9Vaz+0i//Yz6xs5k1CyN3Cm/iAQmSPsc3uS9sAlTTKH+oO6U4vcr7CAEUI78wUGLYMxiy0YEVfHHpFFiSyiPVwiVo4Y+EN1qtJp0zN4z7xecWpxgcnz7tORkK07QICiYpOnRKgbnM4Sz+8a//j9JZnZh/MTLudTCwZtWyJfqQkdWiKO4hHHWXiNF1rRY61EHrScx9w331Esk+EILSjuyZiqTIDlG/cd9gWIR26XxRiE2c4o4vELZMGngB0EWiIzlnSssh3nZ4XBjN2YX6S9ZNUE/hoQjBjCFivqUWZ7NOdV439eNx8zvBPE="
 install: mvn -q install -P quick,travis -B -V
+before_script:
+  - "export DISPLAY=:99.0"
+  - "sh -e /etc/init.d/xvfb start"
+  - curl -OL https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-linux64.tar.gz
+  - tar -xf geckodriver-v0.17.0-linux64.tar.gz
+  - mv geckodriver ui/
 script:
   - mvn -q test -P travis,build-extras -B
-  - mvn install -P quick,road-traffic-demo -pl ui &
+  - mvn install -P quick,travis,road-traffic-demo -pl ui &
   - sleep 2m
-  - cd python-shell && python3 -m unittest discover -s src
+  - mvn verify -P travis,system-test -Dwebdriver.gecko.driver=geckodriver -pl ui
+  - cd python-shell && python3 -m unittest discover -s src && cd ../
 after_success:
   - ./cd/before_deploy.sh
-  - ./cd/deploy.sh
+  - travis_wait 45 ./cd/deploy.sh
diff --git a/NOTICES b/NOTICES
@@ -20,7 +20,7 @@ Gaffer tools is built using maven. This process will automatically pull in depen
  projects below.
 
 
-Gaffer (uk.gov.gchq.gaffer:gaffer2:0.7.4):
+Gaffer (uk.gov.gchq.gaffer:gaffer2:0.7.5):
 
 - Apache License, Version 2.0
 
@@ -47,6 +47,11 @@ mike-hogan/jarjar-forkfork:
 - Apache License, Version 2.0
 
 
+Selenium (org.seleniumhq.selenium:selenium-server:3.4.0)
+
+- Apache License, Version 2.0
+
+
 ----------------------------------------------------------------------
 
 The UI contains the following javascript dependencies

diff --git a/federated-rest/pom.xml b/federated-rest/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
     <artifactId>federated-rest</artifactId>
     <packaging>war</packaging>

diff --git a/graffer-ql/pom.xml b/graffer-ql/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>graffer-ql</artifactId>

diff --git a/mini-accumulo-cluster/pom.xml b/mini-accumulo-cluster/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>mini-accumulo-cluster</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -21,11 +21,11 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer2</artifactId>
-        <version>0.7.4</version>
+        <version>0.7.5</version>
     </parent>
 
     <artifactId>gaffer-tools</artifactId>
-    <version>0.7.5-SNAPSHOT</version>
+    <version>0.7.6-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
@@ -38,7 +38,7 @@
     </modules>
 
     <properties>
-        <gaffer.version>0.7.4</gaffer.version>
+        <gaffer.version>0.7.5</gaffer.version>
         <scm.url>
             https://github.com/gchq/gaffer-tools
         </scm.url>
@@ -72,4 +72,64 @@
         </license>
     </licenses>
 
+    <profiles>
+        <profile>
+            <id>system-test</id>
+            <properties>
+                <skip.surefire.tests>true</skip.surefire.tests>
+                <skip.failsafe.tests>false</skip.failsafe.tests>
+            </properties>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${failsafe.version}</version>
+                        <executions>
+                            <execution>
+                                <id>system-test</id>
+                                <goals>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <skipITs>${skip.failsafe.tests}</skipITs>
+                            <excludes>
+                                <exclude>**/*$*</exclude>
+                                <exclude>**/performance/**</exclude>
+                            </excludes>
+                            <includes>
+                                <include>**/*SystemTest.java</include>
+                                <include>**/*ST.java</include>
+                                <include>**/*STs.java</include>
+                                <include>**/*SystemTests.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-checkstyle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>validate</id>
+                                <phase>none</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>findbugs-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>analyze-compile</id>
+                                <phase>none</phase>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>
diff --git a/python-shell/README.md b/python-shell/README.md
@@ -59,7 +59,7 @@ This creates a distributable Python wheel which can installed locally to provide
 The wheel file is install using pip:
 
 ```bash
-pip3 install gaffer_shell-0.7.4-py2.py3-none-any.whl
+pip3 install gaffer_shell-0.7.5-py2.py3-none-any.whl
 ```
 
 After installation the shell can be imported into an application as below:

diff --git a/python-shell/src/__init__.py b/python-shell/src/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

diff --git a/python-shell/src/gafferpy/__init__.py b/python-shell/src/gafferpy/__init__.py
@@ -1,4 +1,4 @@
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

diff --git a/schema-builder/pom.xml b/schema-builder/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/schema-builder/schema-builder-rest/pom.xml b/schema-builder/schema-builder-rest/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>schema-builder</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>schema-builder-rest</artifactId>

diff --git a/schema-builder/schema-builder-rest/src/main/resources/log4j.xml b/schema-builder/schema-builder-rest/src/main/resources/log4j.xml
@@ -41,7 +41,7 @@
     </logger>
 
     <root>
-        <priority value="debug"/>
+        <priority value="info"/>
         <appender-ref ref="console"/>
     </root>
 </log4j:configuration>
diff --git a/schema-builder/schema-builder-ui/src/app/schema/schema.component.ts b/schema-builder/schema-builder-ui/src/app/schema/schema.component.ts
@@ -131,10 +131,10 @@ export class SchemaComponent implements OnInit {
         };
         if (this.schema.hasOwnProperty('types')) {
             _.forEach(this.schema.types, (type: any) => {
-                if (type.aggregateFunction !== null || type.serialiserClass !== null) {
+                if (type.aggregateFunction !== null || type.serialiser !== null) {
                     const formattedType = {
                         aggregateFunction: type.aggregateFunction || null,
-                        serialiserClass: type.serialiserClass || null
+                        serialiser: type.serialiser || null
                     };
                     if(formattedType.aggregateFunction && Object.keys(formattedType.aggregateFunction).length === 0) {
                         formattedType.aggregateFunction = null;

diff --git a/schema-builder/schema-builder-ui/src/app/shared/graphql-type.interface.ts b/schema-builder/schema-builder-ui/src/app/shared/graphql-type.interface.ts
@@ -2,7 +2,7 @@ import { GraphQLAggregate } from './graphql-aggregate.interface';
 
 export interface GraphQLType {
     aggregateFunction?: GraphQLAggregate,
-    serialiserClass?: any,
+    serialiser?: any,
     validateFunctions?: Array<any>,
     class?: string,
     index?: number,

diff --git a/schema-builder/schema-builder-ui/src/app/types/type-form/type-form.component.html b/schema-builder/schema-builder-ui/src/app/types/type-form/type-form.component.html
@@ -26,17 +26,17 @@
             </md-input-container>
         </div>
         <div class="input-field" *ngIf="functions && functions.valid && !_type.node">
-            <md-select class="full-width" id="serialiserClass" placeholder="Serialiser class" (change)="changeType(_type.serialiserClass, 'serialiserClass')"
-                [(ngModel)]="_type.serialiserClass">
+            <md-select class="full-width" id="serialiserClass" placeholder="Serialiser class" (change)="changeType(_type.serialiser, 'serialiser', 'class')"
+                [(ngModel)]="_type.serialiser">
                 <md-option value="NULL">null</md-option>
                 <md-option *ngFor="let serialiser of functions.serialiserClasses" [value]="serialiser">
                     {{ serialiser }}
                 </md-option>
             </md-select>
         </div>
         <div class="input-field" *ngIf="functions && functions.valid && !_type.node">
-            <md-select class="full-width" id="aggregateFunction" placeholder="Aggregator class" (change)="changeType(_type.aggregateFunction.class, 'aggregateFunction', 'class')"
-                [(ngModel)]="_type.aggregateFunction.class">
+            <md-select class="full-width" id="aggregateFunction" placeholder="Aggregator class" (change)="changeType(_type.aggregateFunction, 'aggregateFunction', 'class')"
+                [(ngModel)]="_type.aggregateFunction">
                 <md-option value="NULL">null</md-option>
                 <md-option *ngFor="let aggregator of functions.aggregateClasses" [value]="aggregator">
                     {{ aggregator }}

diff --git a/schema-builder/schema-builder-ui/src/app/types/type-form/type-form.component.ts b/schema-builder/schema-builder-ui/src/app/types/type-form/type-form.component.ts
@@ -90,7 +90,9 @@ export class TypeFormComponent implements OnInit {
         } else {
             this.functions = undefined;
         }
-        this._type.aggregateFunction = {};
+        if(!this._type.aggregateFunction) {
+            this._type.aggregateFunction = {};
+        }
     }
 
     changeValidations(checked: boolean, validator: any) {

diff --git a/schema-builder/schema-builder-ui/src/app/types/types.component.html b/schema-builder/schema-builder-ui/src/app/types/types.component.html
@@ -47,7 +47,8 @@ <h3 md-line><b>Class</b></h3>
                                 </md-list-item>
                                 <md-list-item>
                                     <h3 md-line><b>Serialiser</b></h3>
-                                    <p md-line>{{type.serialiserClass || 'null'}}</p>
+                                    <p md-line *ngIf="type.serialiser && type.serialiser.class">{{type.serialiser.class}}</p>
+                                    <p md-line *ngIf="!type.serialiser || !type.serialiser.class">null</p>
                                 </md-list-item>
                                 <md-list-item>
                                     <h3 md-line><b>Aggregator</b></h3>

diff --git a/schema-builder/schema-builder-ui/src/app/types/types.component.ts b/schema-builder/schema-builder-ui/src/app/types/types.component.ts
@@ -79,7 +79,7 @@ export class TypesComponent implements OnInit {
         this.types.push({
             type: 'new type',
             aggregateFunction: null,
-            serialiserClass: null,
+            serialiser: null,
             class: '',
             validateFunctions: null
         });

diff --git a/slider/pom.xml b/slider/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
 
     <artifactId>slider</artifactId>

diff --git a/ui/example/road-traffic/schema/storeTypes.json b/ui/example/road-traffic/schema/storeTypes.json
@@ -29,7 +29,9 @@
       "aggregateFunction": {
         "class": "uk.gov.gchq.gaffer.sketches.binaryoperator.HyperLogLogPlusAggregator"
       },
-      "serialiserClass": "uk.gov.gchq.gaffer.sketches.serialisation.HyperLogLogPlusSerialiser"
+      "serialiser": {
+        "class": "uk.gov.gchq.gaffer.sketches.serialisation.HyperLogLogPlusSerialiser"
+      }
     }
   }
 }
diff --git a/ui/pom.xml b/ui/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.5-SNAPSHOT</version>
+        <version>0.7.6-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>ui</artifactId>
@@ -28,7 +28,23 @@
         <standalone-ui-path>ui</standalone-ui-path>
         <standalone-rest-path>rest</standalone-rest-path>
         <standalone-port>8080</standalone-port>
+        <selenium.version>3.4.0</selenium.version>
     </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-server</artifactId>
+            <version>${selenium.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>21.0</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
     <build>
         <plugins>
             <plugin>

diff --git a/ui/src/main/webapp/app/controller.js b/ui/src/main/webapp/app/controller.js
@@ -546,5 +546,9 @@ angular.module('app').controller('AppController',
       $scope.editingOperations = false;
    }
 
+   $scope.onInOutFlagChange = function(newInOutFlag) {
+       $scope.inOutFlag = newInOutFlag;
+   }
+
   $scope.initialise();
 } ]);
diff --git a/ui/src/main/webapp/app/graph/addSeedDialog.html b/ui/src/main/webapp/app/graph/addSeedDialog.html
@@ -26,10 +26,10 @@ <h2>Add Seed</h2>
 
         <md-dialog-actions layout="row">
             <span flex></span>
-            <md-button ng-click="addSeedCancel()">
+            <md-button id="add-seed-cancel" ng-click="addSeedCancel()">
                 Cancel
             </md-button>
-            <md-button ng-click="addSeedAdd()">
+            <md-button id="add-seed-confirm" ng-click="addSeedAdd()">
                 Add
             </md-button>
         </md-dialog-actions>