Merge pull request #5 from aleksandr-kotlyar/pom-cleanup

Remove unused dependencies and configurations
aleksandr-kotlyar · Feb 23, 2020 · 583931a · 583931a
2 parents d0d2dfd + f1430c9
commit 583931a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 74 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,10 +6,9 @@
 
     <groupId>java-sitemap-checker</groupId>
     <artifactId>java-sitemap-checker</artifactId>
-    <version>2.0-SNAPSHOT</version>
+    <version>1.2-SNAPSHOT</version>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <aspectj.version>1.8.10</aspectj.version>
     </properties>
 
     <build>
@@ -28,88 +27,24 @@
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.20</version>
                 <dependencies>
-                    <dependency>
-                        <groupId>org.aspectj</groupId>
-                        <artifactId>aspectjweaver</artifactId>
-                        <version>${aspectj.version}</version>
-                    </dependency>
                     <dependency>
                         <groupId>org.apache.maven.surefire</groupId>
                         <artifactId>surefire-junit47</artifactId>
                         <version>2.20</version>
                     </dependency>
                 </dependencies>
-                <configuration>
-                    <argLine>
-                        -javaagent:"${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar"
-                    </argLine>
-                    <properties>
-                        <property>
-                            <name>listener</name>
-                            <value>io.qameta.allure.junit4.AllureJunit4</value>
-                        </property>
-                    </properties>
-                    <systemProperties>
-                        <property>
-                            <name>allure.results.directory</name>
-                            <value>${project.build.directory}/allure-results</value>
-                        </property>
-                        <property>
-                            <name>allure.link.issue.pattern</name>
-                            <value>https://github.com/alexander-kotlyar/qiwi_pet_project/issues/{}</value>
-                        </property>
-                    </systemProperties>
-                    <!--<parallel>classes</parallel>-->
-                    <!--<rerunFailingTestsCount>2</rerunFailingTestsCount>-->
-                    <!--<threadCount>1</threadCount>-->
-                    <reuseForks>true</reuseForks>
-                    <forkCount>1</forkCount>
-                </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.aspectj</groupId>
-                <artifactId>aspectjweaver</artifactId>
-                <version>1.8.10</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
     <dependencies>
 
-        <dependency>
-            <groupId>com.codeborne</groupId>
-            <artifactId>selenide</artifactId>
-            <version>4.8</version>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
         </dependency>
 
-        <dependency>
-            <groupId>io.qameta.allure</groupId>
-            <artifactId>allure-junit4</artifactId>
-            <version>2.0-BETA18</version>
-        </dependency>
-
-        <dependency>
-            <groupId>io.qameta.allure</groupId>
-            <artifactId>allure-rest-assured</artifactId>
-            <version>2.0-BETA19</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.seleniumhq.selenium</groupId>
-            <artifactId>htmlunit-driver</artifactId>
-            <version>2.24</version>
-        </dependency>
-
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
@@ -128,6 +63,14 @@
             <version>1.7.21</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.11.3</version>
+            <scope>test</scope>
+        </dependency>
+
+
     </dependencies>
 
 </project>
diff --git a/src/test/java/sitemap/StepsLogger.java b/src/test/java/sitemap/StepsLogger.java
@@ -1,15 +1,12 @@
 package sitemap;
 
-import io.qameta.allure.Step;
-
 import java.util.logging.Logger;
 
 /**
  * Created by Aleksandr Kotlyar on 09.11.2017. 22:45
  */
 public class StepsLogger {
 
-    @Step
     protected void assertion(String assertion, Runnable r) {
         try {
             r.run();
@@ -20,7 +17,6 @@ protected void assertion(String assertion, Runnable r) {
         }
     }
 
-    @Step
     protected void act(String act, Runnable r) {
         try {
             r.run();
@@ -32,7 +28,6 @@ protected void act(String act, Runnable r) {
     }
 
 
-    @Step
     protected void arrange(String arrange, Runnable r) {
         try {
             r.run();

diff --git a/src/test/java/sitemap/tests/SitemapTest.java b/src/test/java/sitemap/tests/SitemapTest.java
@@ -1,7 +1,6 @@
 package sitemap.tests;
 
 import sitemap.StepsLogger;
-import io.qameta.allure.Issue;
 import io.restassured.response.Response;
 import org.assertj.core.api.SoftAssertions;
 import org.jsoup.Jsoup;
@@ -23,7 +22,7 @@ public class SitemapTest extends StepsLogger {
     private SoftAssertions softAssertions = new SoftAssertions();
 
     @Before
-    public void checkBonusSiteMapIsAvailable() throws Exception {
+    public void checkSitemapIsAvailable() throws Exception {
         given().header("user-agent", "yandex").when().get(SITEMAP_URL).then().statusCode(200);
     }
 
@@ -33,7 +32,6 @@ public void checkBonusSiteMapIsAvailable() throws Exception {
      * 3.Check each link availability (200 response status code)
      */
     @Test
-    @Issue("1")
     public void testAvailabilityOfAllSitemapLinks() throws Exception {
         System.setProperty("java.util.concurrent.ForkJoinPool.common.parallelism", "150");
         arrange("Get sitemap source", () ->