Skip to content
This repository has been archived by the owner on Jul 29, 2021. It is now read-only.

Commit

Permalink
fix: Add a link to the git repository defined on a documentation page
Browse files Browse the repository at this point in the history 
This closes gravitee-io/issues#1825
  • Loading branch information
@aelamrani @brasseld
aelamrani authored and brasseld committed Feb 2, 2019
1 parent 6ada3d0 commit d22ee39
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 9 deletions.
2 changes: 1 addition & 1 deletion pom.xml
View file
Expand Up @@ -32,7 +32,7 @@
<name>Gravitee.io APIM - Repository - Test</name>

<properties>
<gravitee-repository.version>1.22.0</gravitee-repository.version>
<gravitee-repository.version>1.23.0-SNAPSHOT</gravitee-repository.version>
<commons-io.version>1.3.2</commons-io.version>
<jackson-mapper-asl.version>1.9.13</jackson-mapper-asl.version>
<javax.inject.version>1</javax.inject.version>
Expand Down
53 changes: 48 additions & 5 deletions src/test/java/io/gravitee/repository/PageRepositoryTest.java
View file
Expand Up @@ -21,10 +21,7 @@
import io.gravitee.repository.management.model.PageType;
import org.junit.Test;

import java.util.Arrays;
import java.util.Date;
import java.util.HashMap;
import java.util.Optional;
import java.util.*;

import static org.junit.Assert.*;

Expand Down Expand Up @@ -70,14 +67,15 @@ private void assertFindPage(Page page) {
assertEquals("configuration show extensions", "true", page.getConfiguration().get("showExtensions"));
assertEquals("configuration show common extensions", "true", page.getConfiguration().get("showCommonExtensions"));
assertEquals("configuration maxDisplayedTags", "1234", page.getConfiguration().get("maxDisplayedTags"));
assertEquals("metadata edit_url", "http://provider.com/edit/page", page.getMetadata().get("edit_url"));
assertEquals("metadata size", "256", page.getMetadata().get("size"));

assertTrue("homepage", page.isHomepage());
assertEquals("excludedGroups", Arrays.asList("grp1", "grp2"), page.getExcludedGroups());
assertEquals("created at", new Date(1486771200000L), page.getCreatedAt());
assertEquals("updated at", new Date(1486771200000L), page.getUpdatedAt());
}


@Test
public void shouldCreateApiPage() throws Exception {
final Page page = new Page();
Expand All @@ -92,6 +90,23 @@ public void shouldCreateApiPage() throws Exception {
page.setCreatedAt(new Date());
page.setUpdatedAt(new Date());

final Map<String, String> configuration = new HashMap<>();
configuration.put("displayOperationId", "true");
configuration.put("docExpansion", "FULL");
configuration.put("showCommonExtensions", "true");
configuration.put("maxDisplayedTags", "1234");
configuration.put("enableFiltering", "true");
configuration.put("tryItURL", "http://company.com");
configuration.put("showURL", "true");
configuration.put("showExtensions", "true");
configuration.put("tryIt", "true");
page.setConfiguration(configuration);

final Map<String, String> metadata = new HashMap<>();
metadata.put("edit_url", "url");
metadata.put("size", "10");
page.setMetadata(metadata);

Optional<Page> optionalBefore = pageRepository.findById("new-page");
pageRepository.create(page);
Optional<Page> optionalAfter = pageRepository.findById("new-page");
Expand All @@ -106,6 +121,8 @@ public void shouldCreateApiPage() throws Exception {
assertEquals("Invalid homepage flag.", page.isHomepage(), pageSaved.isHomepage());
assertEquals("Invalid parentId.", page.getParentId(), pageSaved.getParentId());
assertNull("Invalid page source.", page.getSource());
assertEquals("Invalid configuration.", page.getConfiguration(), pageSaved.getConfiguration());
assertEquals("Invalid metadata.", page.getMetadata(), pageSaved.getMetadata());
}

@Test
Expand Down Expand Up @@ -148,6 +165,23 @@ public void shouldCreatePortalPage() throws Exception {
page.setCreatedAt(new Date());
page.setUpdatedAt(new Date());

final Map<String, String> configuration = new HashMap<>();
configuration.put("displayOperationId", "true");
configuration.put("docExpansion", "FULL");
configuration.put("showCommonExtensions", "true");
configuration.put("maxDisplayedTags", "1234");
configuration.put("enableFiltering", "true");
configuration.put("tryItURL", "http://company.com");
configuration.put("showURL", "true");
configuration.put("showExtensions", "true");
configuration.put("tryIt", "true");
page.setConfiguration(configuration);

final Map<String, String> metadata = new HashMap<>();
metadata.put("edit_url", "url");
metadata.put("size", "10");
page.setMetadata(metadata);

Optional<Page> optionalBefore = pageRepository.findById("new-portal-page");
pageRepository.create(page);
Optional<Page> optionalAfter = pageRepository.findById("new-portal-page");
Expand All @@ -162,6 +196,8 @@ public void shouldCreatePortalPage() throws Exception {
assertEquals("Invalid parentId.", page.getParentId(), pageSaved.getParentId());
assertEquals("Invalid homepage flag.", page.isHomepage(), pageSaved.isHomepage());
assertNull("Invalid page source.", page.getSource());
assertEquals("Invalid configuration.", page.getConfiguration(), pageSaved.getConfiguration());
assertEquals("Invalid metadata.", page.getMetadata(), pageSaved.getMetadata());
}

@Test
Expand Down Expand Up @@ -210,6 +246,11 @@ public void shouldUpdate() throws Exception {
page.getConfiguration().put("showCommonExtensions", "true");
page.getConfiguration().put("maxDisplayedTags", "1234");

final Map<String, String> metadata = new HashMap<>();
metadata.put("edit_url", "url");
metadata.put("size", "10");
page.setMetadata(metadata);

pageRepository.update(page);

Optional<Page> optionalUpdated = pageRepository.findById("updatePage");
Expand All @@ -225,6 +266,8 @@ public void shouldUpdate() throws Exception {
assertEquals("configuration show extensions", "true", optionalUpdated.get().getConfiguration().get("showExtensions"));
assertEquals("configuration show common extensions", "true", optionalUpdated.get().getConfiguration().get("showCommonExtensions"));
assertEquals("configuration maxDisplayedTags", "1234", optionalUpdated.get().getConfiguration().get("maxDisplayedTags"));
assertEquals("metadata edit_url", "url", optionalUpdated.get().getMetadata().get("edit_url"));
assertEquals("metadata size", "10", optionalUpdated.get().getMetadata().get("size"));
}

@Test
Expand Down
24 changes: 21 additions & 3 deletions src/test/java/io/gravitee/repository/config/mock/PageRepositoryMock.java
View file
Expand Up @@ -22,20 +22,17 @@
import io.gravitee.repository.management.model.PageType;
import org.mockito.ArgumentMatcher;

import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

import static java.util.Arrays.asList;
import static java.util.Collections.singleton;
import static java.util.Collections.singletonList;
import static java.util.Optional.empty;
import static java.util.Optional.of;
import static org.mockito.Matchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.internal.util.collections.Sets.newSet;

/**
* @author David BRASSELY (david.brassely at graviteesource.com)
Expand All @@ -62,6 +59,7 @@ void prepare(PageRepository pageRepository) throws Exception {
pageSource.setType("sourceType");
pageSource.setConfiguration("sourceConfiguration");
when(findApiPage.getSource()).thenReturn(pageSource);

Map<String, String> pageConfiguration = new HashMap<>();
pageConfiguration.put("tryIt", "true");
pageConfiguration.put("tryItURL", "http://company.com");
Expand All @@ -73,6 +71,12 @@ void prepare(PageRepository pageRepository) throws Exception {
pageConfiguration.put("showCommonExtensions", "true");
pageConfiguration.put("maxDisplayedTags", "1234");
when(findApiPage.getConfiguration()).thenReturn(pageConfiguration);

Map<String, String> metadata = new HashMap<>();
metadata.put("edit_url", "http://provider.com/edit/page");
metadata.put("size", "256");
when(findApiPage.getMetadata()).thenReturn(metadata);

when(findApiPage.isHomepage()).thenReturn(true);
when(findApiPage.getExcludedGroups()).thenReturn(asList("grp1", "grp2"));
when(findApiPage.getCreatedAt()).thenReturn(new Date(1486771200000L));
Expand All @@ -97,6 +101,11 @@ public boolean matches(Object o) {
when(createPage.getType()).thenReturn(PageType.MARKDOWN);
when(createPage.isHomepage()).thenReturn(true);
when(createPage.getParentId()).thenReturn("2");
metadata = new HashMap<>();
metadata.put("edit_url", "url");
metadata.put("size", "10");
when(createPage.getConfiguration()).thenReturn(pageConfiguration);
when(createPage.getMetadata()).thenReturn(metadata);
when(pageRepository.findById("new-page")).thenReturn(empty(), of(createPage));

// shouldCreateApiPageFolder
Expand All @@ -117,6 +126,11 @@ public boolean matches(Object o) {
when(createPortalPage.getType()).thenReturn(PageType.MARKDOWN);
when(createPortalPage.isHomepage()).thenReturn(false);
when(createPortalPage.getParentId()).thenReturn("2");
metadata = new HashMap<>();
metadata.put("edit_url", "url");
metadata.put("size", "10");
when(createPortalPage.getConfiguration()).thenReturn(pageConfiguration);
when(createPortalPage.getMetadata()).thenReturn(metadata);
when(pageRepository.findById("new-portal-page")).thenReturn(empty(), of(createPortalPage));

// shouldCreatePortalPageFolder
Expand Down Expand Up @@ -154,6 +168,10 @@ public boolean matches(Object o) {
when(pageConfigurationMock.get("showCommonExtensions")).thenReturn("true");
when(pageConfigurationMock.get("maxDisplayedTags")).thenReturn("1234");
when(updatePageAfter.getConfiguration()).thenReturn(pageConfigurationMock);
metadata = new HashMap<>();
metadata.put("edit_url", "url");
metadata.put("size", "10");
when(updatePageAfter.getMetadata()).thenReturn(metadata);
when(pageRepository.findById("updatePage")).thenReturn(of(updatePageBefore), of(updatePageAfter));

when(pageRepository.update(argThat(new ArgumentMatcher<Page>() {
Expand Down
4 changes: 4 additions & 0 deletions src/test/resources/data/page-tests/pages.json
View file
Expand Up @@ -23,6 +23,10 @@
"showCommonExtensions": true,
"maxDisplayedTags": 1234
},
"metadata": {
"edit_url": "http://provider.com/edit/page",
"size": 256
},
"homepage": true,
"excludedGroups": [ "grp1", "grp2" ],
"createdAt": 1486771200000,
Expand Down

0 comments on commit d22ee39

Please sign in to comment.