Add unit tests and fix headers

anathashavit · anathashavit · commit aee0dfae7263 · 2016-06-30T11:06:31.000+03:00
diff --git a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/model/SolrClusterResizeRequest.java b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/model/SolrClusterResizeRequest.java
@@ -1,14 +1,15 @@
-/*
- * BEGIN_COPYRIGHT
- *
- * IBM Confidential OCO Source Materials
- *
- * 5725-Y07 (C) Copyright IBM Corp. 2016 All Rights Reserved.
- *
- * The source code for this program is not published or otherwise divested of its trade secrets,
- * irrespective of what has been deposited with the U.S. Copyright Office.
- *
- * END_COPYRIGHT
+/**
+ * Copyright 2016 IBM Corp. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.ibm.watson.developer_cloud.retrieve_and_rank.v1.model;
 
diff --git a/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/model/SolrClusterSizeResponse.java b/src/main/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/model/SolrClusterSizeResponse.java
@@ -1,16 +1,15 @@
-/* BEGIN_COPYRIGHT
- *
- * IBM Confidential
- * OCO Source Materials
- *
- * 5725-Y07
- * (C) Copyright IBM Corp. 2016 All Rights Reserved.
- *
- * The source code for this program is not published or otherwise
- * divested of its trade secrets, irrespective of what has been
- * deposited with the U.S. Copyright Office.
- *
- * END_COPYRIGHT
+/**
+ * Copyright 2016 IBM Corp. All Rights Reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
  */
 package com.ibm.watson.developer_cloud.retrieve_and_rank.v1.model;
 
diff --git a/src/test/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankIT.java b/src/test/java/com/ibm/watson/developer_cloud/retrieve_and_rank/v1/RetrieveAndRankIT.java
@@ -13,19 +13,14 @@
  */
 package com.ibm.watson.developer_cloud.retrieve_and_rank.v1;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 
-import com.ibm.watson.developer_cloud.service.exception.NotFoundException;
-
 import org.junit.Assume;
 import org.junit.AssumptionViolatedException;
 import org.junit.Before;
@@ -41,8 +36,10 @@
 import com.ibm.watson.developer_cloud.retrieve_and_rank.v1.model.SolrCluster;
 import com.ibm.watson.developer_cloud.retrieve_and_rank.v1.model.SolrCluster.Status;
 import com.ibm.watson.developer_cloud.retrieve_and_rank.v1.model.SolrClusterOptions;
+import com.ibm.watson.developer_cloud.retrieve_and_rank.v1.model.SolrClusterSizeResponse;
 import com.ibm.watson.developer_cloud.retrieve_and_rank.v1.model.SolrClusterStats;
 import com.ibm.watson.developer_cloud.service.exception.BadRequestException;
+import com.ibm.watson.developer_cloud.service.exception.NotFoundException;
 
 /**
  * The Class RetrieveAndRankIT.
@@ -320,4 +317,28 @@ public void testUploadAndDeleteSolrClusterConfigurationZip() {
     }
   }
 
+  /**
+   * Test solr cluster resize.
+   *
+   * @throws InterruptedException
+   */
+  @Test
+  public void testSolrClusterResize() throws InterruptedException {
+    SolrClusterSizeResponse resizeRequestResponse =
+        service.resizeSolrCluster(clusterId, 2).execute();
+    assertTrue(resizeRequestResponse.geClusterId().equals(clusterId));
+    assertTrue(resizeRequestResponse.getCurrentSize().equals(CREATED_CLUSTER_SIZE_ONE));
+    assertTrue(resizeRequestResponse.getTargetSize().equals(2));
+    try {
+      for (int x = 0; x < 60 && resizeRequestResponse.getCurrentSize() != 2; x++) {
+        Thread.sleep(10000);
+        resizeRequestResponse = service.getSolrClusterResizeStatus(clusterId).execute();
+      }
+      assertTrue(resizeRequestResponse.geClusterId().equals(clusterId));
+      assertTrue(resizeRequestResponse.getCurrentSize().equals(2));
+      assertNull(resizeRequestResponse.getTargetSize());
+    } finally {
+      service.deleteSolrCluster(clusterId).execute();
+    }
+  }
 }
