Merge pull request #134 from gchq/release-0.7.5

Updating master with release 0.7.5

.gitignore

@@ -25,4 +25,5 @@ target/
 .idea
 */.classpath
 __pycache__
-*.pem
+*.pem
+*.pyc

.travis.yml

@@ -3,21 +3,34 @@ cache:
   timeout: 1000
   directories:
   - $HOME/.m2
+dist: trusty
 jdk:
   - oraclejdk8
 sudo: false
 addons:
+  firefox: latest
   apt:
     packages:
-      - oracle-java8-installer
+      - python3
 env:
   global:
     - secure: "G58eMiza1eSFALXesop4TO+mWELR3fj9BSgxZ1kW8+mrGAmaI7OdKIcloyNoPE06+BoO2vJGGoyA9H7RqPOOh4PG71VJY0R8o9KGJMtTGyWMiKHhnrKC1/LUb7d+yAXYGxJE6abZ+JsU551zI7i4/Y8/8G0EkxXpny3MyLdMbZ2ZuQsdKPyQfQMhknhv0MxyE5StbZzV3d+UVSCadMSb1sMk698D7QnUi+QVXzPhdiq2+YBqJBXE++z8sZmF/9I1NbU5r6s+IFMUaqCgLHg3BxCko4UXxB5M8CuDr35Bkto9QJmUIaJawN3JmEotmBwplz1wVPDW0fVXILegCOznm1AbNbuu+LGPIPemAmQDh8G6H2QXoMJipyBNuW5kwscST5IL7PWyyRc/vd0BJQZvuZDY1pnM/8IAjEDT6WyDhS9ARBOlNjh9fEA9BEvZ9uVvjYldXcqpvOaItunPTGygmegTeky9FwaQJXHXyWqSRttgrs0ePVCfKH8U8sNfuiFo+4WMuSlIfuPwuPWIncuaImWIE8WTRroLShq1Or8bADdS1GmVXMYWOoW61nzgQjFVJx/pNJu05Eu1uChAtH371Y804R5vVUlmmC9Rn3VmVLwJxTcSSLKxsiOzJxGDT6kp9BfP3h+3gCpEhKfKVkc1wcpHAthzS7w4G613GfaFcx0="
     - secure: "WB3RAYXuywSb3jR8nNnIHzjksZnRyOCmlR3FcQCr8Pwo5FPmyq9xhhS2RCizbZ9Pvhut0dEY3mtdYw97LdbZGb2B0h26bf09472oQt0Wewwl1HScG+wliQr4QpERnCB+Ql01acznSYqG4uibKe2tF2oaCvom0TYS5tFIPkT0IjHRE5lLsa0q6x9hUC9oXguPPLCw4Yqr/DspUvwWgkOAOBNLu2giAbwuyGm1N0EG8oVq6qyIXWcdAqEhbQjvhF9ssJYvz9F0EW4Fcqee8v/12capcBcnBsa0K0edP5NmJOcvlh6hr8lVCG2g3SOHGupIC54f7tjeFzq7b5RLhjfbYc+KzzorUGCKl6fzN7gArzURWhaGXc5OI7UO977gguPzaLL9qb2Bv+Z3z2fKqKqH6wiChjR39mlFe615yy3LaGcVfBlnTjNVKOPX3L4C28lLND/LtskDrcc3miOiLk2YvDY51MaptIZXSOlkJUIHO/Lr72Ur7FCPtRDKM7lJxOeYQ1pjhgJ9x8y2X73yF+owDXcQ16Y1DNimUN5YUXI5CGiFI8Xi+54vVqVdGe1r7WCGuWFpgSFSI0951VH559N+X/YxMapvl3onrKWPHQ477fopTGtu53AwLdBdptSrKAs7dmNjdB2ppgoDwhUHaq0ynkAT9UrJYbx+5dbQKFp04+4="
     - 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
-script: mvn -q test -P travis,build-extras -B
+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,travis,road-traffic-demo -pl ui &
+  - sleep 2m
+  - 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
   - travis_wait 45 ./cd/deploy.sh

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

federated-rest/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.4.1</version>
+        <version>0.7.5</version>
     </parent>
     <artifactId>federated-rest</artifactId>
     <packaging>war</packaging>

graffer-ql/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.4.1</version>
+        <version>0.7.5</version>
     </parent>
 
     <artifactId>graffer-ql</artifactId>

mini-accumulo-cluster/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.4.1</version>
+        <version>0.7.5</version>
     </parent>
 
     <artifactId>mini-accumulo-cluster</artifactId>

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.4.1</version>
+    <version>0.7.5</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>

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:

python-shell/src/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

python-shell/src/gafferpy/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.7.4"
+__version__ = "0.7.5"
 
 __title__ = "gafferpy"
 __description__ = "Gaffer Python Shell"

python-shell/src/gafferpy/gaffer.py

@@ -35,6 +35,12 @@ def to_json(self):
         """
         raise NotImplementedError('Use an implementation')
 
+    def __str__(self):
+        return str(self.to_json())
+
+    def __eq__(self, other):
+        return self.to_json() == other.to_json()
+
 
 class ResultConverter:
     @staticmethod
@@ -114,12 +120,12 @@ def __init__(self, source, destination, directed):
         super().__init__()
         self.source = source
         self.destination = destination
-        if isinstance(directed, DirectedType):
+        if isinstance(directed, str):
             self.directed = directed
         elif directed:
-            self.directed = True
+            self.directed = DirectedType.DIRECTED
         else:
-            self.directed = False
+            self.directed = DirectedType.UNDIRECTED
 
     def to_json(self):
         return {

python-shell/src/test/test_connector.py

@@ -0,0 +1,47 @@
+#
+# Copyright 2016 Crown Copyright
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import unittest
+
+from gafferpy import gaffer as g
+from gafferpy import gaffer_connector
+
+
+class GafferConnectorTest(unittest.TestCase):
+    def test_execute_operation(self):
+        gc = gaffer_connector.GafferConnector('http://localhost:8080/rest/v1')
+        elements = gc.execute_operation(
+            g.GetElements(
+                seeds=[
+                    g.EntitySeed('M5:10')
+                ],
+                view=g.View(
+                    edges=[
+                        g.ElementDefinition(
+                            group='JunctionLocatedAt'
+                        )
+                    ]
+                )
+            )
+        )
+
+        self.assertEqual(
+            [g.Edge("JunctionLocatedAt", "M5:10", "390466,225615", True, {})],
+            elements)
+
+
+if __name__ == "__main__":
+    unittest.main()

python-shell/src/test/test_example.py

@@ -0,0 +1,28 @@
+#
+# Copyright 2016 Crown Copyright
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import unittest
+
+import example
+
+
+class ExampleTest(unittest.TestCase):
+    def test_example_does_not_error(self):
+        example.run('http://localhost:8080/rest/v1')
+
+
+if __name__ == "__main__":
+    unittest.main()

python-shell/src/test/test_gaffer.py

@@ -0,0 +1,76 @@
+#
+# Copyright 2016 Crown Copyright
+#
+# Licensed under the Apache License, Version 2.0 (the 'License');
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an 'AS IS' BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+import unittest
+
+from gafferpy import gaffer as g
+
+
+class GafferTest(unittest.TestCase):
+    def test_create_edge_seed(self):
+        self.assertEqual(
+            {
+                'class': 'uk.gov.gchq.gaffer.operation.data.EdgeSeed',
+                'source': 'src',
+                'destination': 'dest',
+                'directed': 'DIRECTED'
+            },
+            g.EdgeSeed("src", "dest", g.DirectedType.DIRECTED).to_json()
+        )
+
+        self.assertEqual(
+            {
+                'class': 'uk.gov.gchq.gaffer.operation.data.EdgeSeed',
+                'source': 'src',
+                'destination': 'dest',
+                'directed': 'UNDIRECTED'
+            },
+            g.EdgeSeed("src", "dest", g.DirectedType.UNDIRECTED).to_json()
+        )
+
+        self.assertEqual(
+            {
+                'class': 'uk.gov.gchq.gaffer.operation.data.EdgeSeed',
+                'source': 'src',
+                'destination': 'dest',
+                'directed': 'EITHER'
+            },
+            g.EdgeSeed("src", "dest", g.DirectedType.EITHER).to_json()
+        )
+
+        self.assertEqual(
+            {
+                'class': 'uk.gov.gchq.gaffer.operation.data.EdgeSeed',
+                'source': 1,
+                'destination': 2,
+                'directed': 'DIRECTED'
+            },
+            g.EdgeSeed(1, 2, True).to_json()
+        )
+
+        self.assertEqual(
+            {
+                'class': 'uk.gov.gchq.gaffer.operation.data.EdgeSeed',
+                'source': 1,
+                'destination': 2,
+                'directed': 'UNDIRECTED'
+            },
+            g.EdgeSeed(1, 2, False).to_json()
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

schema-builder/pom.xml

@@ -19,7 +19,7 @@
     <parent>
         <groupId>uk.gov.gchq.gaffer</groupId>
         <artifactId>gaffer-tools</artifactId>
-        <version>0.7.4.1</version>
+        <version>0.7.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>