From e1f008ccdaa74811e92cce7d2a9bc82d08eff3de Mon Sep 17 00:00:00 2001
From: Vincent Dechenaux <vincent.dechenaux@gmail.com>
Date: Wed, 3 Oct 2018 23:55:32 +0200
Subject: [PATCH] Fix test detection when tests extends atoum\test

Tests should extends \atoum (cf doc) but you can also extends \atoum\test and it was not supported since #82
---
 .../atoum/intellij/plugin/atoum/Utils.java    |  4 ++--
 .../plugin/atoum/tests/UtilsTest.java         | 24 +++++++++++++++++++
 .../atoum/tests/fixtures/TestSimpleClass2.php | 10 ++++++++
 .../fixtures/TestSimpleClassWithoutUse2.php   |  8 +++++++
 .../plugin/atoum/tests/fixtures/atoum.php     | 11 +++++++--
 travis.sh                                     |  8 +++----
 6 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100644 tests/org/atoum/intellij/plugin/atoum/tests/fixtures/TestSimpleClass2.php
 create mode 100644 tests/org/atoum/intellij/plugin/atoum/tests/fixtures/TestSimpleClassWithoutUse2.php

diff --git a/src/org/atoum/intellij/plugin/atoum/Utils.java b/src/org/atoum/intellij/plugin/atoum/Utils.java
index d4bbbf6..927df7f 100644
--- a/src/org/atoum/intellij/plugin/atoum/Utils.java
+++ b/src/org/atoum/intellij/plugin/atoum/Utils.java
@@ -31,7 +31,7 @@ public static Boolean isClassAtoumTest(PhpClass checkedClass)
         PhpClass loopCheckedClass = checkedClass;
         while (loopCheckedClass.getSuperClass() != null) {
             PhpClass parent = loopCheckedClass.getSuperClass();
-            if (parent.getFQN().equals("\\atoum")) {
+            if (parent.getFQN().equals("\\atoum") || parent.getFQN().equals("\\atoum\\test")) {
                 return true;
             }
             loopCheckedClass = parent;
@@ -42,7 +42,7 @@ public static Boolean isClassAtoumTest(PhpClass checkedClass)
             List<ClassReference> extendsList = checkedClass.getExtendsList().getReferenceElements();
             if (extendsList.iterator().hasNext()) {
                 ClassReference ref = extendsList.iterator().next();
-                if (ref.getFQN() != null && ref.getFQN().equals("\\atoum")) {
+                if (ref.getFQN() != null && (ref.getFQN().equals("\\atoum") || ref.getFQN().equals("\\atoum\\test"))) {
                     return true;
                 }
             }
diff --git a/tests/org/atoum/intellij/plugin/atoum/tests/UtilsTest.java b/tests/org/atoum/intellij/plugin/atoum/tests/UtilsTest.java
index 2d03747..a20231d 100644
--- a/tests/org/atoum/intellij/plugin/atoum/tests/UtilsTest.java
+++ b/tests/org/atoum/intellij/plugin/atoum/tests/UtilsTest.java
@@ -36,6 +36,12 @@ public void testGetFirstTestClassFromFile() {
         assertNotNull(phpClass);
         assertEquals("\\PhpStormPlugin\\tests\\units\\TestSimpleClass", phpClass.getFQN());
 
+        phpClass = Utils.getFirstTestClassFromFile((PhpFile) myFixture.configureByFile(
+                "TestSimpleClass2.php"
+        ));
+        assertNotNull(phpClass);
+        assertEquals("\\PhpStormPlugin\\tests\\units\\TestSimpleClass2", phpClass.getFQN());
+
         phpClass = Utils.getFirstTestClassFromFile((PhpFile) myFixture.configureByFile(
             "TestMultipleClassNotFirst.php"
         ));
@@ -48,6 +54,12 @@ public void testGetFirstTestClassFromFile() {
         assertNotNull(phpClass);
         assertEquals("\\PhpStormPlugin\\tests\\units\\TestSimpleClassWithoutUse", phpClass.getFQN());
 
+        phpClass = Utils.getFirstTestClassFromFile((PhpFile) myFixture.configureByFile(
+                "TestSimpleClassWithoutUse2.php"
+        ));
+        assertNotNull(phpClass);
+        assertEquals("\\PhpStormPlugin\\tests\\units\\TestSimpleClassWithoutUse2", phpClass.getFQN());
+
         phpClass = Utils.getFirstTestClassFromFile((PhpFile) myFixture.configureByFile(
             "TestWithParentClass.php"
         ));
@@ -72,6 +84,12 @@ public void testGetFirstTestClassFromFileWithoutStubs() {
         assertNotNull(phpClass);
         assertEquals("\\PhpStormPlugin\\tests\\units\\TestSimpleClass", phpClass.getFQN());
 
+        phpClass = Utils.getFirstTestClassFromFile((PhpFile) myFixture.configureByFile(
+                "TestSimpleClass2.php"
+        ));
+        assertNotNull(phpClass);
+        assertEquals("\\PhpStormPlugin\\tests\\units\\TestSimpleClass2", phpClass.getFQN());
+
         phpClass = Utils.getFirstTestClassFromFile((PhpFile) myFixture.configureByFile(
                 "TestMultipleClassNotFirst.php"
         ));
@@ -84,6 +102,12 @@ public void testGetFirstTestClassFromFileWithoutStubs() {
         assertNotNull(phpClass);
         assertEquals("\\PhpStormPlugin\\tests\\units\\TestSimpleClassWithoutUse", phpClass.getFQN());
 
+        phpClass = Utils.getFirstTestClassFromFile((PhpFile) myFixture.configureByFile(
+                "TestSimpleClassWithoutUse2.php"
+        ));
+        assertNotNull(phpClass);
+        assertEquals("\\PhpStormPlugin\\tests\\units\\TestSimpleClassWithoutUse2", phpClass.getFQN());
+
         phpClass = Utils.getFirstTestClassFromFile((PhpFile) myFixture.configureByFile(
                 "TestWithParentClass.php"
         ));
diff --git a/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/TestSimpleClass2.php b/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/TestSimpleClass2.php
new file mode 100644
index 0000000..160a3c0
--- /dev/null
+++ b/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/TestSimpleClass2.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace PhpStormPlugin\tests\units;
+
+use \atoum\test;
+
+class TestSimpleClass2 extends test
+{
+
+}
diff --git a/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/TestSimpleClassWithoutUse2.php b/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/TestSimpleClassWithoutUse2.php
new file mode 100644
index 0000000..a313c61
--- /dev/null
+++ b/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/TestSimpleClassWithoutUse2.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace PhpStormPlugin\tests\units;
+
+class TestSimpleClassWithoutUse2 extends \atoum\test
+{
+
+}
diff --git a/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/atoum.php b/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/atoum.php
index de5c6ae..03d0ee7 100644
--- a/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/atoum.php
+++ b/tests/org/atoum/intellij/plugin/atoum/tests/fixtures/atoum.php
@@ -1,6 +1,13 @@
 <?php
 
-class atoum
+namespace atoum
 {
-
+    class test
+    {
+    }
 }
+
+class atoum extends atoum\test
+{
+
+}
\ No newline at end of file
diff --git a/travis.sh b/travis.sh
index 56ab944..98f56e9 100755
--- a/travis.sh
+++ b/travis.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-ideaVersion="2017.1.5"
-ideaPluginVersion="2017.1"
+ideaVersion="2018.2.4"
+ideaPluginVersion="182.4505.42"
 
 travisCache=".cache"
 
@@ -49,8 +49,8 @@ if [ -d ./plugins ]; then
     echo "created plugin dir"
 fi
 
-download "http://phpstorm.espend.de/files/proxy/phpstorm-${ideaPluginVersion}-php.zip"
-unzip -qo $travisCache/phpstorm-${ideaPluginVersion}-php.zip -d ./plugins
+download "https://plugins.jetbrains.com/files/6610/50359/php-${ideaPluginVersion}.zip"
+unzip -qo $travisCache/php-${ideaPluginVersion}.zip -d ./plugins
 
 # Run the tests
 if [ "$1" = "-d" ]; then