updated tests, jetty

Author: fehguy

samples/client/petstore/objc/PetstoreClient/PetstoreClientTests/PetApiTest.m

@@ -90,9 +90,7 @@ - (void) testUpdatePet {
         [photos addObject:url];
     }
     [petToAdd setPhotoUrls:photos];
-    dispatch_semaphore_t sema = dispatch_semaphore_create(0);
 
-    static bool hasResponse = false;
     [api addPetWithCompletionBlock:petToAdd completionHandler:^(NSError *error) {
         if(error) {
             XCTFail(@"got error %@", error);
@@ -143,20 +141,15 @@ - (void) testUpdatePet {
 
 - (void)testGetPetByStatus {
     XCTestExpectation *expectation = [self expectationWithDescription:@"testGetPetByStatus"];
-    static NSMutableArray* pets = nil;
-    static NSError * gError = nil;
     [api findPetsByStatusWithCompletionBlock:@"available" completionHandler:^(NSArray *output, NSError *error) {
         if(error) {
-            gError = error;
+            XCTFail(@"got error %@", error);
         }
         if(output == nil){
-            NSLog(@"failed to fetch pets");
+            XCTFail(@"failed to fetch pets");
         }
         else {
-            pets = [[NSMutableArray alloc]init];
-            for(SWGPet* pet in output) {
-                [pets addObject:[[SWGPet alloc] initWithValues:[pet asDictionary]]];
-            }
+            [expectation fulfill];
         }
     }];
     [self waitForExpectationsWithTimeout:2.0 handler:nil];

samples/client/petstore/objc/pom.xml

@@ -22,47 +22,27 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.mortbay.jetty</groupId>
+        <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-maven-plugin</artifactId>
         <version>${jetty-version}</version>
         <configuration>
-          <useTestScope>true</useTestScope>
-          <stopWait>15</stopWait>
           <war>${project.build.directory}/swagger-java-jersey-sample-app-${webapp-version}.war</war>
-          <webAppConfig>
-            <contextPath>/</contextPath>
-          </webAppConfig>
-          <stopPort>8079</stopPort>
-          <stopKey>stopit</stopKey>
-          <connectors>
-            <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-              <port>8002</port>
-              <maxIdleTime>60000</maxIdleTime>
-              <confidentialPort>8443</confidentialPort>
-            </connector>
-          </connectors>
+          <stopKey>alpha</stopKey>
+          <stopPort>9099</stopPort>
+          <httpConnector>
+            <port>8002</port>
+          </httpConnector>
         </configuration>
         <executions>
           <execution>
             <id>start-jetty</id>
             <phase>pre-integration-test</phase>
             <goals>
-              <goal>run-war</goal>
-            </goals>
-            <configuration>
-              <scanIntervalSeconds>0</scanIntervalSeconds>
-              <daemon>true</daemon>
-            </configuration>
-          </execution>
-          <execution>
-            <id>stop-jetty</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>stop</goal>
+              <goal>deploy-war</goal>
             </goals>
           </execution>
-        </executions>
-      </plugin>
+         </executions>
+        </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
@@ -110,8 +90,8 @@
       <artifactId>swagger-java-jersey-sample-app</artifactId>
       <version>${webapp-version}</version>
       <type>war</type>
-      <scope>test</scope>
     </dependency>
+  </dependencies>
   <repositories>
     <repository>
       <id>sonatype-snapshots</id>
@@ -123,6 +103,6 @@
   </repositories>
   <properties>
     <webapp-version>1.5.4-M1-SNAPSHOT</webapp-version>
-    <jetty-version>8.1.11.v20130520</jetty-version>
+    <jetty-version>9.2.9.v20150224</jetty-version>
   </properties>
 </project>