IntenseFinance/nosqlbench
3
0
Fork 0
mirror of https://github.com/nosqlbench/nosqlbench.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

post-merge fix-ups

Browse Source
This commit is contained in:
Jonathan Shook
2021-06-22 11:10:42 -05:00
parent beea2fdbf6 6403fcaf7f
commit a80e6d599b
339 changed files with 1331 additions and 1251 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nb-api/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<artifactId>mvn-defaults</artifactId>
<groupId>io.nosqlbench</groupId>
<version>4.15.48-SNAPSHOT</version>
<version>4.15.51-SNAPSHOT</version>
<relativePath>../mvn-defaults</relativePath>
</parent>
@@ -31,7 +31,7 @@
<dependency>
<groupId>io.nosqlbench</groupId>
<artifactId>nb-annotations</artifactId>
<version>4.15.48-SNAPSHOT</version>
<version>4.15.51-SNAPSHOT</version>
</dependency>
<dependency>

1
nb-api/src/main/java/io/nosqlbench/nb/api/content/ResolverForURL.java
View File

@@ -19,7 +19,6 @@ public class ResolverForURL implements ContentResolver {
@Override
public List<Content<?>> resolve(URI uri) {
List<Content<?>> contents = new ArrayList<>();
URLContent urlContent = resolveURI(uri);
if (urlContent!=null) {
return List.of(urlContent);

7
nb-api/src/main/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocs.java
View File

@@ -27,13 +27,8 @@ public class MarkdownDocs {
}
public static List<MarkdownInfo> find(String name, DocScope... scopes) {
List<MarkdownInfo> aggregated = new ArrayList<>();
List<Content<?>> markdownContent = RawMarkdownSources.getAllMarkdown();
// Find all topics and aggregators
List<String> aggregators = new ArrayList<>();
List<MarkdownInfo> markdownInfos = markdownContent
.stream()
.map(ParsedMarkdown::new)
@@ -78,7 +73,7 @@ public class MarkdownDocs {
return mdgraph.processed();
//
//
//
// List<MarkdownInfo> aggregated = new ArrayList<>();
// List<Edge<List<String>>> edges = new ArrayList<>();
// List<String> matchedtopics = null;
//

21
nb-api/src/test/java/io/nosqlbench/engine/api/activityimpl/motor/ParamsParserTest.java
View File

@@ -18,11 +18,12 @@
package io.nosqlbench.engine.api.activityimpl.motor;
import io.nosqlbench.nb.api.config.ParamsParser;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.Map;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
public class ParamsParserTest {
@@ -60,7 +61,6 @@ public class ParamsParserTest {
assertThat(p).hasSize(2);
assertThat(p).containsKey("b");
assertThat(p.get("b")).isEqualTo("fo'urfive");
}
@Test
@@ -127,7 +127,6 @@ public class ParamsParserTest {
assertThat(p).containsKey("b");
assertThat(p.get("a")).isEqualTo("1");
assertThat(p.get("b")).isEqualTo("2");
}
@Test
@@ -138,7 +137,6 @@ public class ParamsParserTest {
assertThat(p).containsKey("b");
assertThat(p.get("a")).isEqualTo("1 2 3");
assertThat(p.get("b")).isEqualTo("2");
}
@Test
@@ -149,17 +147,12 @@ public class ParamsParserTest {
assertThat(p).containsKey("b");
assertThat(p.get("a")).isEqualTo("1");
assertThat(p.get("b")).isEqualTo("2 3 4");
}
@Test(expected = RuntimeException.class)
public void testValidNameException() {
Map<String, String> p = ParamsParser.parse("a=1\\\\;'\";b=2 3 4",true);
assertThat(p).hasSize(2);
assertThat(p).containsKey("a");
assertThat(p).containsKey("b");
assertThat(p.get("a")).isEqualTo("1\\;'\"");
assertThat(p.get("b")).isEqualTo("2 3 4");
@Test
public void testInvalidNameException() {
assertThatExceptionOfType(RuntimeException.class)
.isThrownBy(() -> ParamsParser.parse("a=1\\\\;'\";b=2 3 4",true));
}
@Test
@@ -170,8 +163,6 @@ public class ParamsParserTest {
assertThat(p).containsKey("b");
assertThat(p.get("a")).isEqualTo("fiver");
assertThat(p.get("b")).isEqualTo(" sixer");
}
}

2
nb-api/src/test/java/io/nosqlbench/nb/api/NBEnvironmentTest.java
View File

@@ -1,6 +1,6 @@
package io.nosqlbench.nb.api;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

2
nb-api/src/test/java/io/nosqlbench/nb/api/SystemIdTest.java
View File

@@ -1,6 +1,6 @@
package io.nosqlbench.nb.api;
import org.junit.Test;
import org.junit.jupiter.api.Test;
public class SystemIdTest {

2
nb-api/src/test/java/io/nosqlbench/nb/api/annotations/AnnotationBuilderTest.java
View File

@@ -1,6 +1,6 @@
package io.nosqlbench.nb.api.annotations;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

2
nb-api/src/test/java/io/nosqlbench/nb/api/config/ConfigLoaderTest.java
View File

@@ -1,6 +1,6 @@
package io.nosqlbench.nb.api.config;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.util.List;
import java.util.Map;

2
nb-api/src/test/java/io/nosqlbench/nb/api/config/SynonymsTest.java
View File

@@ -1,6 +1,6 @@
package io.nosqlbench.nb.api.config;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

6
nb-api/src/test/java/io/nosqlbench/nb/api/config/params/NBParamsTest.java
View File

@@ -1,8 +1,8 @@
package io.nosqlbench.nb.api.config.params;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.util.Date;
import java.util.List;
@@ -36,7 +36,7 @@ public class NBParamsTest {
}
@Test
@Ignore("This case is unwieldy and generally not useful")
@Disabled("This case is unwieldy and generally not useful")
public void testNestedMixedJsonParamsMap() {
Element one = NBParams.one("{\"key1\":\"key2={\"key3\":\"value3\",\"key4\":\"value4\"}\"}");
assertThat(one.get("key1.key2.key3", String.class)).isPresent();

2
nb-api/src/test/java/io/nosqlbench/nb/api/content/NBIOTest.java
View File

@@ -1,6 +1,6 @@
package io.nosqlbench.nb.api.content;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.nio.file.Path;
import java.nio.file.Paths;

18
nb-api/src/test/java/io/nosqlbench/nb/api/markdown/aggregator/MarkdownDocsTest.java
View File

@@ -2,21 +2,21 @@ package io.nosqlbench.nb.api.markdown.aggregator;
import io.nosqlbench.nb.api.content.PathContent;
import io.nosqlbench.nb.api.markdown.types.MarkdownInfo;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import java.net.URL;
import java.nio.file.*;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.from;
public class MarkdownDocsTest {
@Test
@Ignore
@Disabled
public void testLoadMarkdown() {
List<MarkdownInfo> processed = MarkdownDocs.findAll();
List<MarkdownInfo> expected = fromRaw("docs-for-testing-logical");
@@ -74,16 +74,14 @@ public class MarkdownDocsTest {
URL url = resources.nextElement();
System.out.println("url="+url.toExternalForm());
Path path = Paths.get(url.toURI());
Files.walk(path, FileVisitOption.FOLLOW_LINKS)
.filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS))
.forEach(subpaths::add);
try (Stream<Path> fileStream = Files.walk(path, FileVisitOption.FOLLOW_LINKS)) {
fileStream.filter(p -> !Files.isDirectory(p, LinkOption.NOFOLLOW_LINKS))
.forEach(subpaths::add);
}
}
} catch (Exception e) {
throw new RuntimeException(e);
}
return subpaths;
}
}

2
nb-api/src/test/java/io/nosqlbench/nb/api/pathutil/ResolverForURLTest.java
View File

@@ -4,7 +4,7 @@ import io.nosqlbench.nb.api.content.Content;
import io.nosqlbench.nb.api.content.ResolverForClasspath;
import io.nosqlbench.nb.api.content.ResolverForFilesystem;
import io.nosqlbench.nb.api.content.ResolverForURL;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import java.net.URL;
import java.nio.file.Path;

2
nb-api/src/test/java/io/nosqlbench/nb/api/testutils/BoundsTest.java
View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nb.api.testutils;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;

2
nb-api/src/test/java/io/nosqlbench/nb/api/testutils/PerfTest.java
View File

@@ -17,7 +17,7 @@
package io.nosqlbench.nb.api.testutils;
import org.junit.Test;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;