Merge pull request #20 from zebraxxl/master

Java Bindings 0.2.0
2gis · Nov 12, 2015 · af7c650 · af7c650
2 parents 39872e7 + f35bcdb
commit af7c650
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 317 deletions.
diff --git a/java/CHANGELOG.md b/java/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Change Log
 
 <!--## Unreleased-->
+## v0.2.0-1
+
+- added Winium.WebDriver as dependence (WiniumDriver moved to it)
+- selenium web driver version updated to 2.48.2
+
 ## v0.1.0-1
 
 - combobox (collapse, expand, is expanded, find selected item, scroll to item)

diff --git a/java/README.md b/java/README.md
@@ -18,16 +18,11 @@ With the help of Winium.Elements you could simplify interaction with such comple
         <dependency>
             <groupId>com.github.2gis.winium</groupId>
             <artifactId>winium-elements-desktop</artifactId>
-            <version>0.1.0-1</version>
+            <version>0.2.0-1</version>
         </dependency>
     </dependencies>
     ```
-2. Use WiniumDriver instead of RemoteWebDriver.
-
-    ```java
-    WiniumDriver driver = new WiniumDriver("http://localhost:9999", desiredCapabilities);
-    ```
-3. Find element and convert it to [ElementType] using WebElementExtensions.to[ElementType] method.
+2. Find element and convert it to [ElementType] using WebElementExtensions.to[ElementType] method.
 
     ```java
     WebElement element = driver.findElementById("data_grid");

diff --git a/java/pom.xml b/java/pom.xml
@@ -4,26 +4,33 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
+    <groupId>com.github.2gis.winium</groupId>
+    <artifactId>winium-elements-desktop</artifactId>
+    <version>0.2.0-1</version>
+
     <name>Winium.Elements.Desktop</name>
     <url>https://github.com/2gis/Winium.Elements/tree/master/java</url>
     <description>With the help of Winium.Elements you could simplify interaction
         with such complex elements like DataGrid, ComboBox, Menu and etc.</description>
     <licenses>
-        <license></license>
+        <license>
+            <name>Mozilla Public License, version 2.0</name>
+            <url>https://www.mozilla.org/en-US/MPL/2.0/</url>
+        </license>
     </licenses>
     <scm>
         <url>https://github.com/2gis/Winium.Elements/</url>
     </scm>
     <developers>
         <developer>
-            <name>Artem</name>
+            <name>Artem Pryanichnikov</name>
             <url>https://github.com/zebraxxl</url>
         </developer>
     </developers>
 
-    <groupId>com.github.2gis.winium</groupId>
-    <artifactId>winium-elements-desktop</artifactId>
-    <version>0.1.0-1</version>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
 
     <distributionManagement>
         <snapshotRepository>
@@ -36,20 +43,13 @@
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
-            <version>2.47.1</version>
+            <version>2.48.2</version>
         </dependency>
 
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>2.0.31-beta</version>
-            <scope>test</scope>
+            <groupId>com.github.2gis.winium</groupId>
+            <artifactId>winium-webdriver</artifactId>
+            <version>0.1.0-1</version>
         </dependency>
     </dependencies>
 

diff --git a/java/scripts/ci.ps1 b/java/scripts/ci.ps1
@@ -15,10 +15,10 @@ else
 
 $projectDir = Join-Path $PSScriptRoot "../"
 
-# Compile & Test
-& $mvnPath -f $projectDir test
+# Compile
+& $mvnPath -f $projectDir compile
 if ($LASTEXITCODE -ne 0)
 {
-    Write-Output "Compile or test failed. See output"
+    Write-Output "Compile failed. See output"
     Exit $LASTEXITCODE
 }
diff --git a/java/src/main/java/winium/elements/desktop/WiniumDriver.java b/java/src/main/java/winium/elements/desktop/WiniumDriver.java
diff --git a/java/src/test/java/winium/elements/desktop/MockedDriver.java b/java/src/test/java/winium/elements/desktop/MockedDriver.java
diff --git a/java/src/test/java/winium/elements/desktop/Responses.java b/java/src/test/java/winium/elements/desktop/Responses.java
diff --git a/java/src/test/java/winium/elements/desktop/TestsComboBox.java b/java/src/test/java/winium/elements/desktop/TestsComboBox.java
diff --git a/java/src/test/java/winium/elements/desktop/TestsDataGrid.java b/java/src/test/java/winium/elements/desktop/TestsDataGrid.java
diff --git a/java/src/test/java/winium/elements/desktop/TestsListBox.java b/java/src/test/java/winium/elements/desktop/TestsListBox.java