Merge branch 'master' into release

Author: yaroslaw.ekimov

Jenkinsfile

@@ -46,28 +46,6 @@ node('words-linux') {
 	cleanWs()
     if (!params.branch.contains("release")) {
 	    runtests("java-sdk")
-
-        stage('wait for publish confirmation'){
-            timeout(time:1, unit:'DAYS') {
-                input message:'Publish packet?'
-            }
-        }
-
-        stage('Merge master to release'){
-            if (params.branch.contains("master")) {
-                    checkout([$class: 'GitSCM', branches: [[name: '*/release']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-java.git']]])
-                    sh "git config user.email '[email protected]'"
-			        sh "git config user.name 'jenkins'"
-                    sh "git checkout --merge release"
-                    sh "git reset --hard origin/release"
-                    sh "git merge --no-ff --allow-unrelated-histories origin/master"
-                    sh "git diff --name-status"			
-                    sh 'git commit -am "Merged master branch to release" || exit 0'
-                    withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'gitPass', usernameVariable: 'gitUsername')]) {
-                        sh "git push https://$gitUsername:$gitPass@git.auckland.dynabic.com/words-cloud/words-cloud-java.git release"
-                    }
-            }  
-        }
     }
 
 }

src/test/java/com/aspose/words/cloud/DocumentElements/TestTables.java

@@ -129,11 +129,11 @@ public void testGetBorder() throws ApiException, FileNotFoundException {
         String fileName = "TablesGet.docx";
         String remoteName = "TestGetBorder.docx";
         String sourcePath = "sections/0/tables/2/rows/0";
-        Integer index = 0;
+        String borderType = "left";
 
         TestInitializer.UploadFile(Paths.get(TestInitializer.LocalTestFolder, testFolder, fileName).toString(), Paths.get(TestInitializer.RemoteTestFolder, testFolder, remoteName).toString().replace("\\", "/"));
 
-        GetBorderRequest request = new GetBorderRequest(remoteName, sourcePath, index,
+        GetBorderRequest request = new GetBorderRequest(remoteName, sourcePath, borderType,
                 Paths.get(TestInitializer.RemoteTestFolder, testFolder).toString(), null, null,
                 null);
 
@@ -563,13 +563,13 @@ public void testUpdateTableRowFormat() throws ApiException, FileNotFoundExceptio
 public void testDeleteBorder() throws ApiException, FileNotFoundException {
         String fileName = "TablesGet.docx";
         String remoteName = "TestDeleteTableBorder.docx";
-        Integer index = 0;
+        String borderType = "left";
         String sourcePath = "tables/1/rows/0/cells/0/";
         String destName = Paths.get(TestInitializer.RemoteTestOut, remoteName).toString();
 
         TestInitializer.UploadFile(Paths.get(TestInitializer.LocalTestFolder, testFolder, fileName).toString(), Paths.get(TestInitializer.RemoteTestFolder, testFolder, remoteName).toString().replace("\\", "/"));
 
-        DeleteBorderRequest request = new DeleteBorderRequest(remoteName, sourcePath, index,
+        DeleteBorderRequest request = new DeleteBorderRequest(remoteName, sourcePath, borderType,
                 Paths.get(TestInitializer.RemoteTestFolder, testFolder).toString(), null, null,
                 null, destName, null, null);
 
@@ -604,14 +604,14 @@ public void testDeleteBorders() throws ApiException, FileNotFoundException {
 public void testUpdateBorder() throws ApiException, FileNotFoundException {
         String fileName = "TablesGet.docx";
         String remoteName = "TestUpdateBorder.docx";
-        Integer index = 0;
+        String borderType = "left";
         String sourcePath = "tables/1/rows/0/cells/0/";
         Border body = new Border().borderType(Border.BorderTypeEnum.LEFT).color(new XmlColor().alpha(2)).distanceFromText(6.0)
                 .lineStyle(Border.LineStyleEnum.DASHDOTSTROKER).lineWidth(2.0).shadow(true);
 
         TestInitializer.UploadFile(Paths.get(TestInitializer.LocalTestFolder, testFolder, fileName).toString(), Paths.get(TestInitializer.RemoteTestFolder, testFolder, remoteName).toString().replace("\\", "/"));
 
-        UpdateBorderRequest request = new UpdateBorderRequest(remoteName, body, sourcePath, index,
+        UpdateBorderRequest request = new UpdateBorderRequest(remoteName, body, sourcePath, borderType,
                 Paths.get(TestInitializer.RemoteTestFolder, testFolder).toString(), null, null,
                 null, null, null, null);