Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
ZNTA-519 - allow _-. in doc name
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Feb 11, 2016
1 parent 51b2c4c commit 1453801
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 18 deletions.
26 changes: 26 additions & 0 deletions zanata-war/src/test/java/org/zanata/rest/compat/CompatibilityBase.java
View file
Expand Up @@ -36,6 +36,7 @@
import org.zanata.apicompat.rest.dto.resource.ResourceMeta;
import org.zanata.apicompat.rest.dto.resource.TranslationsResource;
import org.zanata.apicompat.rest.dto.stats.ContainerTranslationStatistics;
import org.zanata.apicompat.rest.dto.stats.contribution.ContributionStatistics;
import org.zanata.apicompat.rest.service.AccountResource;
import org.zanata.apicompat.rest.service.SourceDocResource;
import org.zanata.apicompat.rest.service.StatisticsResource;
Expand Down Expand Up @@ -408,6 +409,31 @@ protected void onResponse(ClientResponse response) {
return (ContainerTranslationStatistics) resourceRequest.runWithResult()
.getEntity(ContainerTranslationStatistics.class);
}

@Override
public ContributionStatistics getContributionStatistics(String projectSlug,
String versionSlug,
String username, String dateRange, @DefaultValue("false") boolean includeAutomatedEntry) {
ResourceRequest resourceRequest = new ResourceRequest(
getRestEndpointUrl(String.format("/stats/project/%s/version/%s/contributor/%s/%s",
projectSlug, versionSlug, username, dateRange)),
"GET") {
@Override
protected void prepareRequest(ClientRequest request) {
request.header(HttpHeaders.ACCEPT,
MediaType.APPLICATION_JSON);
request.queryParameter("includeAutomatedEntry",
String.valueOf(includeAutomatedEntry));
}

@Override
protected void onResponse(ClientResponse response) {
}

};
return (ContributionStatistics) resourceRequest.runWithResult()
.getEntity(ContributionStatistics.class);
}
};
}

Expand Down
16 changes: 1 addition & 15 deletions zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
View file
Expand Up @@ -20,34 +20,20 @@
*/
package org.zanata.rest.compat;

import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;

import org.dbunit.operation.DatabaseOperation;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.resteasy.client.ClientRequest;
import org.jboss.resteasy.client.ClientResponse;
import org.junit.Before;
import org.junit.Test;
import org.zanata.RestTest;
import org.zanata.apicompat.rest.MediaTypes;
import org.zanata.apicompat.rest.dto.ProjectIteration;
import org.zanata.provider.DBUnitProvider;
import org.zanata.apicompat.rest.client.IStatisticsResource;
import org.zanata.apicompat.rest.dto.stats.ContainerTranslationStatistics;
import org.zanata.apicompat.rest.dto.stats.TranslationStatistics;
import org.zanata.apicompat.rest.service.StatisticsResource;
import org.zanata.rest.ResourceRequest;

import com.google.common.collect.Lists;
import org.zanata.provider.DBUnitProvider;

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.zanata.util.RawRestTestUtils.assertJsonUnmarshal;
import static org.zanata.util.RawRestTestUtils.jsonUnmarshal;

/**
* @author Carlos Munoz <a
Expand Down
31 changes: 28 additions & 3 deletions zanata-war/src/test/java/org/zanata/rest/service/raw/ResourceServiceRestITCase.java
View file
Expand Up @@ -21,13 +21,15 @@
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.zanata.common.ContentType;
import org.zanata.rest.ResourceRequest;
import org.zanata.rest.StringSet;
import org.zanata.rest.dto.resource.Resource;
import org.zanata.rest.dto.resource.ResourceMeta;
import org.zanata.rest.service.ResourceTestObjectFactory;
import org.zanata.rest.service.ResourceTestUtil;
import org.zanata.rest.service.SourceDocResource;
import org.zanata.util.RawRestTestUtils;

import com.google.common.collect.ImmutableList;

Expand Down Expand Up @@ -151,9 +153,11 @@ public void testPostNoExtensionGetResource() {
Resource base = resourceTestFactory.getTextFlowTest();
ResourceTestUtil.clearRevs(base);
ResourceTestUtil.clearRevs(get);
log.debug("expect:" + base.toString());
log.debug("actual:" + get.toString());
assertThat(get.toString(), is(base.toString()));
String expected = RawRestTestUtils.jaxbMarhsal(base);
log.debug("expect:" + expected);
String got = RawRestTestUtils.jaxbMarhsal(get);
log.debug("actual:" + got);
assertThat(got, is(expected));
}

@Test
Expand Down Expand Up @@ -248,4 +252,25 @@ public void testDeleteResource() {
is(Status.NOT_FOUND.getStatusCode()));
}

@Test
@RunAsClient
public void testPostGetResourceWithUnderscoreInFileNameWithExtension() {
Resource resource = new Resource("_test1.file-a");
resource.setContentType(sr.getContentType());
resource.setExtensions(sr.getExtensions());
resource.setLang(sr.getLang());
resource.setType(sr.getType());
getSourceDocResource().post(resource, new StringSet("gettext;comment"), false);
Resource get = getResourceFromResponse(
getSourceDocResource().getResource(resource.getName(),
new StringSet("gettext;comment")));
ResourceTestUtil.clearRevs(resource);
ResourceTestUtil.clearRevs(get);
String expected = RawRestTestUtils.jaxbMarhsal(resource);
log.debug("expect:" + expected);
String got = RawRestTestUtils.jaxbMarhsal(get);
log.debug("actual:" + got);
assertThat(got, is(expected));
}

}

0 comments on commit 1453801

Please sign in to comment.