You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/11/06 01:15:11 UTC
[25/50] git commit: spacing changes
spacing changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4e107f33
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4e107f33
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4e107f33
Branch: refs/heads/two-dot-o
Commit: 4e107f339d9d05108cd905007f8fde94b7376f6e
Parents: d68967c
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Nov 3 10:48:30 2014 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Nov 3 10:48:30 2014 -0700
----------------------------------------------------------------------
.../usergrid/scenarios/ApplicationScenarios.scala | 6 ++++++
.../usergrid/scenarios/OrganizationScenarios.scala | 15 +++++++--------
.../apache/usergrid/scenarios/TokenScenarios.scala | 1 -
3 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4e107f33/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
index d125f9d..2db49ff 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/ApplicationScenarios.scala
@@ -43,4 +43,10 @@ object ApplicationScenarios {
)
+ val checkApplication = exec(http("Create Application")
+ .get(Settings.baseUrl + "/management/organizations/"+Settings.org+"/applications/"+Settings.app)
+ .headers(Headers.jsonAnonymous)
+ .check(status.not(400).saveAs("applicationStatus"))
+ )
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4e107f33/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
index c790d81..c7ba274 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/OrganizationScenarios.scala
@@ -34,13 +34,12 @@ import io.gatling.http.Predef._
object OrganizationScenarios {
//register the org with the randomly generated org
- val createOrgAndAdmin = exec(http("Create Organization")
- .post(Settings.baseUrl+"/management/organizations")
- .headers(Headers.jsonAnonymous)
- .body(StringBody("{\"organization\":\"" + Settings.org + "\",\"username\":\"" + Settings.admin + "\",\"name\":\"${entityName}\",\"email\":\"${entityName}@apigee.com\",\"password\":\""+Settings.password+"\"}"))
- .check(status.in(200 to 400))
- )
-
-
+ val createOrgAndAdmin =
+ exec(http("Create Organization")
+ .post(Settings.baseUrl + "/management/organizations")
+ .headers(Headers.jsonAnonymous)
+ .body(StringBody("{\"organization\":\"" + Settings.org + "\",\"username\":\"" + Settings.admin + "\",\"name\":\"${entityName}\",\"email\":\"${entityName}@apigee.com\",\"password\":\"" + Settings.password + "\"}"))
+ .check(status.in(200 to 400))
+ )
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4e107f33/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
----------------------------------------------------------------------
diff --git a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
index 40366a5..aa30296 100755
--- a/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
+++ b/stack/loadtests/src/main/scala/org/apache/usergrid/scenarios/TokenScenarios.scala
@@ -17,7 +17,6 @@
package org.apache.usergrid.scenarios
import io.gatling.core.Predef._
- import io.gatling.http.Predef.StringBody
import io.gatling.http.Predef._
import io.gatling.http.request.StringBody
import org.apache.usergrid.settings.Headers