Skip to content

Commit

Permalink
Remove some trailing comments (#427)
Browse files Browse the repository at this point in the history
  • Loading branch information
@seanf
seanf committed Jul 19, 2017
1 parent 8ea283a commit b0bc650
Show file tree
Hide file tree
Showing 17 changed files with 190 additions and 112 deletions.
8 changes: 4 additions & 4 deletions server/zanata-war/src/test/java/org/zanata/provider/DBUnitProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,8 @@ protected void disableReferentialIntegrity(IDatabaseConnection con) {
try {
con.getConnection()
.prepareStatement("set referential_integrity FALSE")
.execute(); // HSQL
// DB
// HSQLDB
.execute();
} catch (Exception ex) {
throw new RuntimeException(ex);
}
Expand All @@ -294,8 +294,8 @@ protected void enableReferentialIntegrity(IDatabaseConnection con) {
try {
con.getConnection()
.prepareStatement("set referential_integrity TRUE")
.execute(); // HSQL
// DB
// HSQLDB
.execute();
} catch (Exception ex) {
throw new RuntimeException(ex);
}
Expand Down
6 changes: 4 additions & 2 deletions server/zanata-war/src/test/java/org/zanata/rest/compat/AccountRawCompatibilityITCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {

@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(), is(200)); // Ok
// Ok
assertThat(response.getStatus(), is(200));
String entityString = response.readEntity(String.class);
assertJsonUnmarshal(entityString, Account.class);
Account account = jsonUnmarshal(entityString, Account.class);
Expand Down Expand Up @@ -107,7 +108,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {

@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(), is(200)); // Ok
// Ok
assertThat(response.getStatus(), is(200));
String entityString = response.readEntity(String.class);
assertJaxbUnmarshal(entityString, Account.class);
Account account = jaxbUnmarshal(entityString, Account.class);
Expand Down
18 changes: 12 additions & 6 deletions ...nata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {
@Override
protected void onResponse(Response response)
throws IOException {
assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
String entityString = response.readEntity(String.class);
assertJsonUnmarshal(entityString, ProjectIteration.class);

Expand All @@ -102,7 +103,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {

@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
String entityString = response.readEntity(String.class);
assertJaxbUnmarshal(entityString, ProjectIteration.class);

Expand Down Expand Up @@ -140,8 +142,9 @@ public void invoke(Invocation.Builder builder) {

@Override
protected void onResponse(Response response) {
// 201
assertThat(response.getStatus(),
is(Status.CREATED.getStatusCode())); // 201
is(Status.CREATED.getStatusCode()));
}

}.run();
Expand All @@ -160,7 +163,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {

@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
String entityString = response.readEntity(String.class);
assertJsonUnmarshal(entityString, ProjectIteration.class);
ProjectIteration it =
Expand Down Expand Up @@ -197,8 +201,9 @@ public void invoke(Invocation.Builder builder) {

@Override
protected void onResponse(Response response) {
// 201
assertThat(response.getStatus(),
is(Status.CREATED.getStatusCode())); // 201
is(Status.CREATED.getStatusCode()));
}

}.run();
Expand All @@ -216,7 +221,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {

@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
String entityString = response.readEntity(String.class);
assertJaxbUnmarshal(entityString, ProjectIteration.class);

Expand Down
15 changes: 10 additions & 5 deletions server/zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {
@Override
protected void onResponse(Response response)
throws IOException {
assertThat(response.getStatus(), is(200)); // Ok
// Ok
assertThat(response.getStatus(), is(200));
assertHeaderPresent(response, HttpHeaders.ETAG);
}
}.run();
Expand All @@ -114,7 +115,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {

@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(), is(200)); // Ok
// Ok
assertThat(response.getStatus(), is(200));
String entityString = response.readEntity(String.class);
assertJsonUnmarshal(entityString, Project.class);
Project project = jsonUnmarshal(entityString, Project.class);
Expand All @@ -141,7 +143,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {

@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(), is(200)); // Ok
// Ok
assertThat(response.getStatus(), is(200));
List<Project> projects = jsonParse(response);
Project sampleProject = null;

Expand Down Expand Up @@ -176,7 +179,8 @@ protected Invocation.Builder prepareRequest(ResteasyWebTarget webTarget) {

@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(), is(200)); // Ok
// Ok
assertThat(response.getStatus(), is(200));
String entityString = response.readEntity(String.class);
assertJaxbUnmarshal(entityString, Projects.class);
Projects projects = jaxbUnmarshal(entityString, Projects.class);
Expand Down Expand Up @@ -227,7 +231,8 @@ public void invoke(Invocation.Builder builder) {
@Override
protected void onResponse(Response response) {
assertThat(response.getStatus(),
is(Status.CREATED.getStatusCode())); // 201
// 201
is(Status.CREATED.getStatusCode()));
}
}.run();
}
Expand Down
17 changes: 8 additions & 9 deletions server/zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,9 +89,8 @@ public void getStatisticsForIteration() throws Exception {
int mssgStatCount = 0;

assertThat(stats.getStats().size(), greaterThan(0));
assertThat(stats.getDetailedStats().size(), greaterThan(0)); // Has
// document
// stats
// Has document stats
assertThat(stats.getDetailedStats().size(), greaterThan(0));
for (TranslationStatistics langStats : stats.getStats()) {
assertThat(
langStats.getTotal(),
Expand Down Expand Up @@ -172,11 +171,10 @@ public void getStatisticsForIterationAndLocale() throws Exception {
statsResource.getStatistics("sample-project", "1.0", true,
false, new String[] { "as" });

assertThat(stats.getStats().size(), is(1)); // Just one locale and no
// word level stats
assertThat(stats.getDetailedStats().size(), greaterThan(0)); // Has
// document
// stats
// Just one locale and no word level stats
assertThat(stats.getStats().size(), is(1));
// Has document stats
assertThat(stats.getDetailedStats().size(), greaterThan(0));
for (TranslationStatistics langStats : stats.getStats()) {
assertThat(
langStats.getTotal(),
Expand Down Expand Up @@ -209,7 +207,8 @@ public void getStatisticsForDocumentAndLocale() throws Exception {
statsResource.getStatistics("sample-project", "1.0",
"my/path/document.txt", true, new String[] { "as" });

assertThat(stats.getStats().size(), is(2)); // Just one locale
// Just one locale
assertThat(stats.getStats().size(), is(2));
for (TranslationStatistics langStats : stats.getStats()) {
assertThat(
langStats.getTotal(),
Expand Down
62 changes: 40 additions & 22 deletions server/zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ public void postResource() throws Exception {
sourceDocClient.post(res, new StringSet(PoHeader.ID + ";"
+ SimpleComment.ID), true);

assertThat(response.getStatus(), is(Status.CREATED.getStatusCode())); // 201
// 201
assertThat(response.getStatus(), is(Status.CREATED.getStatusCode()));
response.close();

// Verify that it was created successfully
Expand All @@ -108,8 +109,8 @@ public void postResource() throws Exception {
assertThat(createdResource.getType(), is(res.getType()));
assertThat(createdResource.getContentType(), is(res.getContentType()));
assertThat(createdResource.getLang(), is(res.getLang()));
assertThat(createdResource.getRevision(), is(1)); // Created, so
// revision 1
// Created, so revision 1
assertThat(createdResource.getRevision(), is(1));

// Extensions
assertThat(createdResource.getExtensions(true).size(),
Expand All @@ -125,7 +126,8 @@ public void postResource() throws Exception {
assertThat(createdTf.getContents().get(0), is(tf1.getContents().get(0)));
assertThat(createdTf.getId(), is(tf1.getId()));
assertThat(createdTf.getLang(), is(tf1.getLang()));
assertThat(createdTf.getRevision(), is(1)); // Create, so revision 1
// Create, so revision 1
assertThat(createdTf.getRevision(), is(1));

// Text Flow extensions
assertThat(createdTf.getExtensions(true).size(), is(1));
Expand All @@ -151,15 +153,17 @@ public void doublePostResource() throws Exception {
sourceDocClient.post(res, new StringSet(PoHeader.ID + ";"
+ SimpleComment.ID), true);

assertThat(response.getStatus(), is(Status.CREATED.getStatusCode())); // 201
// 201
assertThat(response.getStatus(), is(Status.CREATED.getStatusCode()));
response.close();

// Post Twice (should conflict)
response =
sourceDocClient.post(res, new StringSet(PoHeader.ID + ";"
+ SimpleComment.ID), true);

assertThat(response.getStatus(), is(Status.CONFLICT.getStatusCode())); // 409
// 409
assertThat(response.getStatus(), is(Status.CONFLICT.getStatusCode()));
response.close();
}

Expand All @@ -183,7 +187,8 @@ public void putResource() throws Exception {
sourceDocClient.putResource(res.getName(), res, new StringSet(
PoHeader.ID + ";" + SimpleComment.ID), false);

assertThat(response.getStatus(), is(Status.CREATED.getStatusCode())); // 201
// 201
assertThat(response.getStatus(), is(Status.CREATED.getStatusCode()));
response.close();

// Verify that it was created successfully
Expand All @@ -196,8 +201,8 @@ public void putResource() throws Exception {
assertThat(createdResource.getType(), is(res.getType()));
assertThat(createdResource.getContentType(), is(res.getContentType()));
assertThat(createdResource.getLang(), is(res.getLang()));
assertThat(createdResource.getRevision(), is(1)); // Created, so
// revision 1
// Created, so revision 1
assertThat(createdResource.getRevision(), is(1));

// Extensions
assertThat(createdResource.getExtensions(true).size(),
Expand All @@ -213,7 +218,8 @@ public void putResource() throws Exception {
assertThat(createdTf.getContents().get(0), is(tf1.getContents().get(0)));
assertThat(createdTf.getId(), is(tf1.getId()));
assertThat(createdTf.getLang(), is(tf1.getLang()));
assertThat(createdTf.getRevision(), is(1)); // Create, so revision 1
// Create, so revision 1
assertThat(createdTf.getRevision(), is(1));

// Text Flow extensions
assertThat(createdTf.getExtensions(true).size(), is(1));
Expand Down Expand Up @@ -273,21 +279,24 @@ public void deleteResource() throws Exception {
sourceDocClient.putResource(res.getName(), res, new StringSet(
PoHeader.ID + ";" + SimpleComment.ID), false);

assertThat(response.getStatus(), is(Status.CREATED.getStatusCode())); // 201
// 201
assertThat(response.getStatus(), is(Status.CREATED.getStatusCode()));
response.close();

// Delete the resource
Response deleteResponse =
sourceDocClient.deleteResource(res.getName());

assertThat(deleteResponse.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(deleteResponse.getStatus(), is(Status.OK.getStatusCode()));
deleteResponse.close();

// try to fetch it again
Response getResponse =
sourceDocClient.getResource(res.getName(), null);
// 404
assertThat(getResponse.getStatus(),
is(Status.NOT_FOUND.getStatusCode())); // 404
is(Status.NOT_FOUND.getStatusCode()));
getResponse.close();
}

Expand All @@ -301,7 +310,8 @@ public void getResourceMeta() throws Exception {
new StringSet(SimpleComment.ID));
ResourceMeta resMeta = getResourceMetaFromResponse(response);

assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
assertThat(resMeta.getName(), is("my/path/document-2.txt"));
assertThat(resMeta.getType(), is(ResourceType.FILE));
assertThat(resMeta.getLang(), is(LocaleId.EN_US));
Expand All @@ -323,20 +333,23 @@ public void putResourceMeta() throws Exception {
Response putResponse =
sourceDocClient.putResourceMeta("my,path,document-2.txt",
resMeta, null);
assertThat(putResponse.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(putResponse.getStatus(), is(Status.OK.getStatusCode()));
putResponse.close();

// Fetch again
Response getResponse =
sourceDocClient.getResourceMeta("my,path,document-2.txt", null);
ResourceMeta newResMeta = getResourceMetaFromResponse(getResponse);

assertThat(getResponse.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(getResponse.getStatus(), is(Status.OK.getStatusCode()));
assertThat(newResMeta.getName(), is(resMeta.getName()));
assertThat(newResMeta.getContentType(), is(resMeta.getContentType()));
assertThat(newResMeta.getLang(), is(resMeta.getLang()));
assertThat(newResMeta.getType(), is(resMeta.getType()));
assertThat(newResMeta.getRevision(), is(1)); // Created, so revision 1
// Created, so revision 1
assertThat(newResMeta.getRevision(), is(1));
}

@Test
Expand All @@ -351,7 +364,8 @@ LocaleId.EN_US, new StringSet(SimpleComment.ID), false,
null);
TranslationsResource transRes = getTransResourceFromResponse(response);

assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
assertThat(transRes.getTextFlowTargets().size(),
greaterThanOrEqualTo(3));

Expand Down Expand Up @@ -397,7 +411,8 @@ LocaleId.EN_US, new StringSet(SimpleComment.ID), false,
null);
TranslationsResource transRes = getTransResourceFromResponse(response);

assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
assertThat(transRes.getTextFlowTargets().size(),
greaterThanOrEqualTo(3));

Expand All @@ -423,7 +438,8 @@ LocaleId.EN_US, new StringSet(SimpleComment.ID), false,
LocaleId.EN_US, transRes, new StringSet(
SimpleComment.ID), "auto");

assertThat(putResponse.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(putResponse.getStatus(), is(Status.OK.getStatusCode()));
putResponse.close();

// Retrieve the translations once more to make sure they were changed
Expand All @@ -433,7 +449,8 @@ LocaleId.EN_US, transRes, new StringSet(
LocaleId.EN_US, new StringSet(SimpleComment.ID), false, null);
transRes = getTransResourceFromResponse(response);

assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
assertThat(transRes.getTextFlowTargets().size(),
greaterThanOrEqualTo(3));

Expand Down Expand Up @@ -472,7 +489,8 @@ public void deleteTranslations() throws Exception {
translationsClient.deleteTranslations("my,path,document-3.txt",
LocaleId.EN_US);

assertThat(response.getStatus(), is(Status.OK.getStatusCode())); // 200
// 200
assertThat(response.getStatus(), is(Status.OK.getStatusCode()));
response.close();

// try to fetch them again
Expand Down
Loading

0 comments on commit b0bc650

Please sign in to comment.