Skip to content

Development #186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reeshika-h merged 23 commits into from
May 15, 2025
Merged

Development #186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
db1b5d9
Merge pull request #180 from contentstack/staging
reeshika-h Mar 25, 2025
bb9315e
Merge pull request #182 from contentstack/staging
harshithad0703 Apr 1, 2025
d8d1523
policy-scan.yml
aravindbuilt Apr 16, 2025
275c937
issues-jira.yml
aravindbuilt Apr 16, 2025
2851b44
Delete jira.yml
aravindbuilt Apr 16, 2025
bd10379
Delete sast-scan.yml
aravindbuilt Apr 16, 2025
46eaff1
codeql-analysis.yml
aravindbuilt Apr 16, 2025
12441f2
Updated codeowners
aravindbuilt Apr 16, 2025
236a058
Refactor assertions in tests to use assertNotNull for improved valida…
reeshika-h Apr 23, 2025
4ff32c9
Uncomment skipTests configuration in maven-surefire-plugin for test e…
reeshika-h Apr 23, 2025
4d3e0cb
policy-scan.yml
aravindbuilt Apr 23, 2025
cb5ce37
Merge branch 'master' into fix/dx-2373-skips-single-item
harshithad0703 Apr 24, 2025
8beaa58
Fix item processing in SyncStack to handle JSONObject correctly and p…
harshithad0703 Apr 24, 2025
9d39ac5
Add test for handling single JSONObject under "items" in SyncStack
harshithad0703 Apr 24, 2025
c62265f
Merge pull request #185 from contentstack/fix/dx-2373-skips-single-item
harshithad0703 Apr 24, 2025
eed871f
Add Slack reporting functionality and update dependencies
reeshika-h Apr 30, 2025
10f0bd2
Enhance tests by adding assertions for entry parameters and headers; …
reeshika-h May 5, 2025
6567ff4
Add SLF4J dependency and update JavaDoc links; comment out disabled t…
reeshika-h May 5, 2025
1435a5d
Update assertions in tests to reflect expected header and entry counts
reeshika-h May 5, 2025
9448814
Remove header size assertions from entry and query tests
reeshika-h May 6, 2025
82e75af
Merge pull request #184 from contentstack/fix/DX-2420-pipeline-friendly
reeshika-h May 6, 2025
527f953
Update version to 2.1.1 and updated changelog
reeshika-h May 15, 2025
7eb50ed
Merge pull request #187 from contentstack/version-bump
reeshika-h May 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update assertions in tests to reflect expected header and entry counts
  • Loading branch information
@reeshika-h
reeshika-h committed May 5, 2025
commit 1435a5d1d50062ac84c2d43ac58ac4c33c541f5b
4 changes: 2 additions & 2 deletions src/test/java/com/contentstack/sdk/TestContentType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void testEntryInstance() {
Entry entry = contentType.entry("just-fake-it");
Assertions.assertEquals("product", entry.getContentType());
Assertions.assertEquals("just-fake-it", entry.uid);
Assertions.assertEquals(6, entry.headers.size());
Assertions.assertEquals(7, entry.headers.size());
logger.info("passed...");
}

Expand All @@ -65,7 +65,7 @@ void testQueryInstance() {
ContentType contentType = stack.contentType("product");
Query query = contentType.query();
Assertions.assertEquals("product", query.getContentType());
Assertions.assertEquals(6, query.headers.size());
Assertions.assertEquals(7, query.headers.size());
logger.info("passed...");
}

Expand Down
22 changes: 5 additions & 17 deletions src/test/java/com/contentstack/sdk/TestEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@
import java.util.logging.Logger;
import org.junit.jupiter.api.*;



import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;

Expand Down Expand Up @@ -70,41 +67,32 @@ public void onCompletion(ResponseType responseType, Error error) {
}

//pass variant uid
@Disabled
// @Disabled
@Test
void VariantsTestSingleUid() {
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants(VARIANT_UID);
entry.fetch(new EntryResultCallBack() {
@Override
public void onCompletion(ResponseType responseType, Error error) {
assertEquals(VARIANT_UID.trim(), entry.getHeaders().get("x-cs-variant-uid"));
Assertions.assertEquals(VARIANT_UID.trim(), entry.getHeaders().get("x-cs-variant-uid"));
}
});
}

//pass variant uid array
@Disabled
// @Disabled
@Test
void VariantsTestArray() {
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants(VARIANT_UIDS);
entry.fetch(new EntryResultCallBack() {
@Override
public void onCompletion(ResponseType responseType, Error error) {
assertEquals(VARIANT_UIDS[0].trim(), entry.getHeaders().get("x-cs-variant-uid")); assertEquals(VARIANT_UIDS[0].trim(), entry.getHeaders().get("x-cs-variant-uid"));
Assertions.assertNotNull(entry.getHeaders().get("x-cs-variant-uid"));
}
});
}

@Test
void VariantsTestNullString() {
entry = stack.contentType(CONTENT_TYPE).entry(entryUid).variants((String) null);
entry.fetch(new EntryResultCallBack() {
@Override
public void onCompletion(ResponseType responseType, Error error) {
assertNull(entry.getHeaders().get("x-cs-variant-uid"));
}
});
}


@Test
@Order(4)
Expand Down
34 changes: 17 additions & 17 deletions src/test/java/com/contentstack/sdk/TestQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
if (error == null) {
entryUid = queryresult.getResultObjects().get(0).uid;
Assertions.assertNotNull(queryresult);
Assertions.assertEquals(27, queryresult.getResultObjects().size());
Assertions.assertEquals(28, queryresult.getResultObjects().size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -121,7 +121,7 @@ void testNotContainedInField() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(25, entries.size());
Assertions.assertEquals(26, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -154,7 +154,7 @@ void testNotEqualTo() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(26, entries.size());
Assertions.assertEquals(27, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -202,7 +202,7 @@ void testLessThanEqualField() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(17, entries.size());
Assertions.assertEquals(18, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -250,7 +250,7 @@ void testEntriesWithOr() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(18, entries.size());
Assertions.assertEquals(19, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -313,7 +313,7 @@ void testRemoveQueryFromQuery() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -329,7 +329,7 @@ void testIncludeSchema() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -438,7 +438,7 @@ void testSkip() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(24, entries.size());
Assertions.assertEquals(25, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -455,7 +455,7 @@ void testOnly() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -471,7 +471,7 @@ void testExcept() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -521,7 +521,7 @@ void testExist() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -530,14 +530,14 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
}

@Test
@Order(27)
@Order(28)
void testNotExist() {
query.notExists("price1").find(new QueryResultsCallBack() {
@Override
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -572,7 +572,7 @@ void testLanguage() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -700,7 +700,7 @@ void testComplexFind() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -716,7 +716,7 @@ void testIncludeSchemaCheck() {
@Override
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
Assertions.assertEquals(27, queryresult.getCount());
Assertions.assertEquals(28, queryresult.getCount());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -733,7 +733,7 @@ void testIncludeContentType() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down
38 changes: 19 additions & 19 deletions src/test/java/com/contentstack/sdk/TestQueryCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
if (error == null) {
entryUid = queryresult.getResultObjects().get(0).uid;
Assertions.assertNotNull(queryresult);
Assertions.assertEquals(27, queryresult.getResultObjects().size());
Assertions.assertEquals(28, queryresult.getResultObjects().size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -125,7 +125,7 @@ void testNotContainedInField() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(25, entries.size());
Assertions.assertEquals(26, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -162,7 +162,7 @@ void testNotEqualTo() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(26, entries.size());
Assertions.assertEquals(27, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -216,7 +216,7 @@ void testLessThanEqualField() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(17, entries.size());
Assertions.assertEquals(18, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -265,7 +265,7 @@ void testEntriesWithOr() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(18, entries.size());
Assertions.assertEquals(19, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -333,7 +333,7 @@ void testRemoveQueryFromQuery() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -351,7 +351,7 @@ void testIncludeSchema() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -466,7 +466,7 @@ void testSkip() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(24, entries.size());
Assertions.assertEquals(25, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -484,7 +484,7 @@ void testOnly() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -502,7 +502,7 @@ void testExcept() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -530,7 +530,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
}

@Test
@Order(25)
@Order(28)
void testRegex() {
Query query1 = stack.contentType("product").query();
query1.regex("title", "lap*", "i");
Expand Down Expand Up @@ -577,7 +577,7 @@ protected void doSomeBackgroundTask(Group group) {
}

@Test
@Order(26)
@Order(28)
void testExist() {
Query query1 = stack.contentType("product").query();
query1.exists("title");
Expand All @@ -586,7 +586,7 @@ void testExist() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -595,7 +595,7 @@ public void onCompletion(ResponseType responseType, QueryResult queryresult, Err
}

@Test
@Order(27)
@Order(28)
void testNotExist() {
Query query1 = stack.contentType("product").query();
query1.notExists("price1");
Expand All @@ -604,7 +604,7 @@ void testNotExist() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -641,7 +641,7 @@ void testLanguage() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down Expand Up @@ -753,7 +753,7 @@ void testComplexFind() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -769,7 +769,7 @@ void testIncludeSchemaCheck() {
@Override
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
Assertions.assertEquals(27, queryresult.getResultObjects().size());
Assertions.assertEquals(28, queryresult.getResultObjects().size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand All @@ -787,7 +787,7 @@ void testIncludeContentType() {
public void onCompletion(ResponseType responseType, QueryResult queryresult, Error error) {
if (error == null) {
List<Entry> entries = queryresult.getResultObjects();
Assertions.assertEquals(27, entries.size());
Assertions.assertEquals(28, entries.size());
} else {
Assertions.fail("Failing, Verify credentials");
}
Expand Down
Loading