Add tests and change query param order for simulations

client/client.go

@@ -37,7 +37,7 @@ const (
 // for common operations.  If the operation needed is not found in Client, use the "genclient" package using this client
 // as an example of how to utilize the genclient.  PRs are welcome if more functionality is wanted in this client package.
 type Client interface {
-	Simulations(organizationID int32, status []string, sort []string, limit, offset int32) ([]*models.Simulation, error)
+	Simulations(organizationID int32, status []string, sort []string, offset, limit int32) ([]*models.Simulation, error)
 	StartSimulation(simulationID int32) error
 	ThermalSimulation(simulationID int32) (*models.ThermalSimulation, error)
 	SingleBeadSimulation(simulationID int32) (*models.SingleBeadSimulation, error)
@@ -212,7 +212,7 @@ func (c *client) PostLog(simulationID int32, message string) error {
 	return c.PostLogWithTime(simulationID, time.Now().UTC(), message)
 }
 
-func (c *client) Simulations(organizationID int32, status []string, sort []string, limit, offset int32) ([]*models.Simulation, error) {
+func (c *client) Simulations(organizationID int32, status []string, sort []string, offset, limit int32) ([]*models.Simulation, error) {
 	token, err := c.tokenFetcher.Token(c.audience)
 	if err != nil {
 		return nil, err

client/client_test.go

@@ -611,3 +611,106 @@ func TestAssumedStrainSimulationWhenSuccessfulExpectsAssumedStrainSimulationRetu
 	assert.Equal(t, assumedStrainSimulationToReturn.ID, assumedStrainSimulation.ID, "Expected IDs to match")
 	assert.EqualValues(t, assumedStrainSimulationToReturn.ElasticModulus, assumedStrainSimulation.ElasticModulus, "Expected ElasticModulus values to match")
 }
+
+func TestSimulationsWhenNilValuesExpectsSuccess(t *testing.T) {
+	// arrange
+	var organizationID int32 = 10
+	offset := 2
+	limit := 10
+
+	// Token
+	mockTokenFetcher := &mocks.TokenFetcher{}
+	mockTokenFetcher.On("Token", audience).Return("Token", nil)
+
+	// Simulation
+	simulationsToReturn := []models.Simulation{
+		models.Simulation{
+			ID: 1,
+		},
+		models.Simulation{
+			ID: 2,
+		},
+	}
+
+	simulationsHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		assert.NotEmpty(t, r.Header.Get("Authorization"), "Authorization header should not be empty")
+		assert.Equal(t, strconv.Itoa(offset), r.URL.Query().Get("offset"), "Expected offset to be passed as query param")
+		assert.Equal(t, strconv.Itoa(limit), r.URL.Query().Get("limit"), "Expected limit to be passed as query param")
+		bytes, err := json.Marshal(simulationsToReturn)
+		if err != nil {
+			t.Error("Failed to marshal simulations")
+		}
+		w.Write(bytes)
+	})
+
+	// Setup routes
+	r := mux.NewRouter()
+	simulationEndpoint := "/" + SimulationAPIBasePath + "/simulations"
+	r.HandleFunc(simulationEndpoint, simulationsHandler)
+	testServer := httptest.NewServer(r)
+	defer testServer.Close()
+	simulationService := New(mockTokenFetcher, testServer.URL, audience)
+
+	// act
+	simulations, err := simulationService.Simulations(organizationID, nil, nil, int32(offset), int32(limit))
+
+	// assert
+	mockTokenFetcher.AssertExpectations(t)
+	assert.Nil(t, err, "Expected no error returned")
+	assert.Len(t, simulations, 2, "Expected 2 simulations returned.")
+}
+
+func TestSimulationsWhenNonNilValuesExpectsSuccess(t *testing.T) {
+	// arrange
+	var organizationID int32 = 10
+	offset := 2
+	limit := 10
+	sort := "field1:asc"
+	status := models.SimulationStatusInProgress
+
+	// Token
+	mockTokenFetcher := &mocks.TokenFetcher{}
+	mockTokenFetcher.On("Token", audience).Return("Token", nil)
+
+	// Simulation
+	simulationsToReturn := []models.Simulation{
+		models.Simulation{
+			ID: 1,
+		},
+		models.Simulation{
+			ID: 2,
+		},
+	}
+
+	simulationsHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		w.Header().Set("Content-Type", "application/json")
+		assert.NotEmpty(t, r.Header.Get("Authorization"), "Authorization header should not be empty")
+		assert.Equal(t, strconv.Itoa(offset), r.URL.Query().Get("offset"), "Expected offset to be passed as query param")
+		assert.Equal(t, strconv.Itoa(limit), r.URL.Query().Get("limit"), "Expected limit to be passed as query param")
+		assert.Equal(t, status, r.URL.Query().Get("status"), "Expected status to be passed as query param")
+		assert.Equal(t, sort, r.URL.Query().Get("sort"), "Expected sort to be passed as query param")
+		bytes, err := json.Marshal(simulationsToReturn)
+		if err != nil {
+			t.Error("Failed to marshal simulations")
+		}
+		w.Write(bytes)
+	})
+
+	// Setup routes
+	r := mux.NewRouter()
+	simulationEndpoint := "/" + SimulationAPIBasePath + "/simulations"
+	r.HandleFunc(simulationEndpoint, simulationsHandler)
+	testServer := httptest.NewServer(r)
+	defer testServer.Close()
+	simulationService := New(mockTokenFetcher, testServer.URL, audience)
+
+	// act
+	simulations, err := simulationService.Simulations(organizationID, []string{status}, []string{sort},
+		int32(offset), int32(limit))
+
+	// assert
+	mockTokenFetcher.AssertExpectations(t)
+	assert.Nil(t, err, "Expected no error returned")
+	assert.Len(t, simulations, 2, "Expected 2 simulations returned.")
+}

version.properties

@@ -1 +1 @@
-VERSION_TAG=0.3.1
+VERSION_TAG=0.3.2