Skip to content

Commit 091877e

Browse files
committed
chore: update NEWS.txt cleanup leftovers after migration to RobotFramework.
Addressed to #530 No functional changes.
1 parent c34186f commit 091877e

File tree

15 files changed

+4
-907
lines changed

15 files changed

+4
-907
lines changed

Dangerfile

Lines changed: 2 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ if File.file?(spotbugs_report)
608608
print_errors_summary 'spotbugs-maven-plugin', errors_count
609609
end
610610

611-
# Handle `mvn robotframework:run` report
611+
# Handle `mvn robotframework:run` (`mvn verify`) report
612612
#
613613
# Example:
614614
# <suite source="/home/coder/mystamps/src/test/robotframework/category/access.robot" name="Access" id="s1-s1-s1">
@@ -661,48 +661,7 @@ if File.file?(rf_report)
661661
file = github.html_link("#{file}#{line}")
662662
fail("robotframework-maven-plugin error in #{file}:\nTest case `#{testcase}` fails with message:\n#{msg}")
663663
end
664-
# FIXME: add link to wiki page (#530)
665-
print_errors_summary 'robotframework-maven-plugin', errors_count
666-
end
667-
668-
# Handle `mvn verify`
669-
#
670-
# Example:
671-
# <testng-results skipped="0" failed="1" total="114" passed="113">
672-
# <test name="When user at index page" duration-ms="559" started-at="2017-03-05T19:34:06Z" finished-at="2017-03-05T19:34:06Z">
673-
# <class name="ru.mystamps.web.tests.cases.WhenUserAtIndexPage">
674-
# <test-method status="FAIL" signature="shouldExistsLinkForListingCategories()[pri:0, instance:ru.mystamps.web.tests.cases.WhenUserAtIndexPage@2187fff7]" name="shouldExistsLinkForListingCategories" duration-ms="3" started-at="2017-03-05T20:34:06Z" finished-at="2017-03-05T20:34:06Z">
675-
# <exception class="java.lang.AssertionError">
676-
# <message>
677-
# <![CDATA[should exists link to page for listing categories]]>
678-
# </message>
679-
# <full-stacktrace>
680-
# <![CDATA[java.lang.AssertionError: should exists link to page for listing categories
681-
# at ru.mystamps.web.tests.cases.WhenUserAtIndexPage.shouldExistsLinkForListingCategories(WhenUserAtIndexPage.java:78)
682-
# at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
683-
# ...
684-
#
685-
failsafe_report = 'target/failsafe-reports/testng-results.xml'
686-
if File.file?(failsafe_report)
687-
errors_count = 0
688-
doc = Nokogiri::XML(File.open(failsafe_report))
689-
results = doc.xpath('/testng-results').first
690-
failures = results['failed'].to_i
691-
if failures > 0
692-
doc.xpath('//test-method[@status="FAIL"]').each do |node|
693-
errors_count += 1
694-
695-
clazz = node.parent['name']
696-
file = 'src/test/java/' + clazz.gsub(/\./, '/') + '.java'
697-
file = github.html_link(file)
698-
testcase = clazz.split('.')[-1] + '.' + node['name']
699-
msg = node.xpath('./exception/message').text.strip
700-
# FIXME: highlight line number
701-
fail("maven-failsafe-plugin error in #{file}:\nTest case `#{testcase}` fails with error:\n#{msg}")
702-
end
703-
704-
print_errors_summary 'maven-failsafe-plugin', errors_count, 'https://github.com/php-coder/mystamps/wiki/integration-tests'
705-
end
664+
print_errors_summary 'robotframework-maven-plugin', errors_count, 'https://github.com/php-coder/mystamps/wiki/integration-tests'
706665
end
707666

708667
if github.pr_body !~ /Addressed to #\d+/

NEWS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
- (functionality) suggest a possible category on a series creation page
2828
- (functionality) show similar series on a page with series info
2929
- (infrastructure) add ability to send e-mails via Mailgun API
30+
- (infrastructure) port the integration tests to Robot Framework. Also remove TestNG and FEST assertions
3031

3132
0.3
3233
- (functionality) implemented possibility to user to add series to his collection

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,5 +45,5 @@ If you are programmer/sysadmin or you just feeling that you are able to run a lo
4545
* *Validation*: JSR-303 (Hibernate Validator)
4646
* *Logging*: Slf4j (Logback)
4747
* *Unit tests*: Groovy and Spock Framework (for Java code), jasmine (for JavaScript code)
48-
* *Integration tests*: Selenium2, RobotFramework, WireMock, TestNG and fest-assert
48+
* *Integration tests*: Selenium2, RobotFramework, WireMock
4949
* *Others*: Lombok, Togglz, WebJars

pom.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -390,13 +390,6 @@
390390
<scope>test</scope>
391391
</dependency>
392392

393-
<dependency>
394-
<groupId>org.easytesting</groupId>
395-
<artifactId>fest-assert-core</artifactId>
396-
<version>${fest.assert.version}</version>
397-
<scope>test</scope>
398-
</dependency>
399-
400393
<dependency>
401394
<groupId>org.hamcrest</groupId>
402395
<artifactId>hamcrest-library</artifactId>
@@ -447,13 +440,6 @@
447440
<scope>test</scope>
448441
</dependency>
449442

450-
<dependency>
451-
<groupId>org.testng</groupId>
452-
<artifactId>testng</artifactId>
453-
<version>${testng.version}</version>
454-
<scope>test</scope>
455-
</dependency>
456-
457443
<dependency>
458444
<groupId>org.togglz</groupId>
459445
<artifactId>togglz-testing</artifactId>
@@ -503,7 +489,6 @@
503489
<error-prone-javac.version>9+181-r4173-1</error-prone-javac.version>
504490
<error-prone.version>2.3.3</error-prone.version>
505491
<failsafe.plugin.version>2.22.0</failsafe.plugin.version>
506-
<fest.assert.version>2.0M8</fest.assert.version>
507492
<gmavenplus.plugin.version>1.5</gmavenplus.plugin.version>
508493

509494
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.5.20.RELEASE/spring-boot-dependencies/pom.xml) -->
@@ -592,7 +577,6 @@
592577
<start-class>ru.mystamps.web.support.spring.boot.ApplicationBootstrap</start-class>
593578

594579
<surefire.plugin.version>2.22.0</surefire.plugin.version>
595-
<testng.version>6.8.8</testng.version>
596580
<thumbnailator.version>0.4.8</thumbnailator.version>
597581

598582
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.5.20.RELEASE/spring-boot-dependencies/pom.xml) -->
@@ -868,9 +852,6 @@
868852
<configuration>
869853
<useFile>false</useFile>
870854
<disableXmlReport>true</disableXmlReport>
871-
<suiteXmlFiles>
872-
<suiteXmlFile>${basedir}/src/test/config/testng.xml</suiteXmlFile>
873-
</suiteXmlFiles>
874855
</configuration>
875856
<!-- Use default <execution> configuration from spring-boot-starter-parent -->
876857
</plugin>
@@ -935,8 +916,6 @@
935916
<configuration>
936917
<skipTests>${skipUnitTests}</skipTests>
937918
<disableXmlReport>${disableXmlReport}</disableXmlReport>
938-
<!-- Run junit tests only (see #SUREFIRE-377) -->
939-
<testNGArtifactName>none:none</testNGArtifactName>
940919
</configuration>
941920
</plugin>
942921

src/main/config/checkstyle-suppressions.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55

66
<suppressions>
77

8-
<!-- These files will be removed during porting integration tests to Cucumber JVM (see #18) -->
9-
<suppress checks="ImportOrder" files="ru.mystamps.web.tests" />
10-
118
<!-- false positives because these files contain SQL queries -->
129
<suppress checks="Translation" files="src[/\\]main[/\\]resources[/\\]sql" />
1310

src/test/config/testng.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/test/java/ru/mystamps/web/config/TestContext.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/test/java/ru/mystamps/web/tests/TranslationUtils.java

Lines changed: 0 additions & 83 deletions
This file was deleted.

src/test/java/ru/mystamps/web/tests/WebDriverFactory.java

Lines changed: 0 additions & 40 deletions
This file was deleted.

src/test/java/ru/mystamps/web/tests/WebElementUtils.java

Lines changed: 0 additions & 52 deletions
This file was deleted.

0 commit comments

Comments
 (0)