diff --git a/.project b/.project new file mode 100644 index 0000000..67e0da8 --- /dev/null +++ b/.project @@ -0,0 +1,28 @@ + + + chronicle-analytics + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + + + 1774259938437 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/src/main/java/net/openhft/chronicle/analytics/internal/FilesUtil.java b/src/main/java/net/openhft/chronicle/analytics/internal/FilesUtil.java index bc500b2..51e5363 100644 --- a/src/main/java/net/openhft/chronicle/analytics/internal/FilesUtil.java +++ b/src/main/java/net/openhft/chronicle/analytics/internal/FilesUtil.java @@ -91,5 +91,4 @@ private static Path lastPath() { CHRONICLE_ANALYTICS_LAST_FILE_NAME; return Paths.get(fileName); } - } diff --git a/src/test/java/net/openhft/chronicle/analytics/AnalyticsTest.java b/src/test/java/net/openhft/chronicle/analytics/AnalyticsTest.java index 0230d98..3c0bc21 100644 --- a/src/test/java/net/openhft/chronicle/analytics/AnalyticsTest.java +++ b/src/test/java/net/openhft/chronicle/analytics/AnalyticsTest.java @@ -7,8 +7,7 @@ import java.util.concurrent.atomic.AtomicReference; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; class AnalyticsTest { @@ -25,7 +24,7 @@ void sendEvent() { @Test void builder() { - Analytics.Builder builder= Analytics.builder(TEST_STRING, TEST_STRING); + Analytics.Builder builder = Analytics.builder(TEST_STRING, TEST_STRING); assertNotNull(builder); } } diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/FilesUtilTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/FilesUtilTest.java index d103ea1..4859f6f 100644 --- a/src/test/java/net/openhft/chronicle/analytics/internal/FilesUtilTest.java +++ b/src/test/java/net/openhft/chronicle/analytics/internal/FilesUtilTest.java @@ -10,8 +10,7 @@ import java.nio.file.Files; import java.nio.file.Path; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.*; class FilesUtilTest { diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalytics3Test.java b/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalytics3Test.java index a238cf2..adb5750 100644 --- a/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalytics3Test.java +++ b/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalytics3Test.java @@ -16,8 +16,7 @@ import java.util.function.Consumer; import static net.openhft.chronicle.analytics.internal.FilesUtil.removeLastUsedFileTimeStampSecond; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; final class GoogleAnalytics3Test { diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalyticsTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalyticsTest.java index 2513cd2..1004ef2 100644 --- a/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalyticsTest.java +++ b/src/test/java/net/openhft/chronicle/analytics/internal/GoogleAnalyticsTest.java @@ -4,7 +4,6 @@ package net.openhft.chronicle.analytics.internal; import org.jetbrains.annotations.NotNull; -import org.junit.Assume; import org.junit.jupiter.api.Test; import java.time.LocalTime; @@ -15,8 +14,8 @@ import static net.openhft.chronicle.analytics.internal.FilesUtil.removeLastUsedFileTimeStampSecond; import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assumptions.*; -//@Disabled(/* failing test https://teamcity.chronicle.software/buildConfiguration/Chronicle_BuildAll_Build/677499?hideProblemsFromDependencies=false&hideTestsFromDependencies=false&expandBuildChangesSection=true&expandBuildTestsSection=true */) final class GoogleAnalyticsTest { @Test @@ -92,7 +91,7 @@ void attemptToSendReset() { /* This test would fail if run concurrently from two different JVMs, therefore it's only run if the googleAnalytics instance is not muted (update in agreement with Rob) */ - Assume.assumeFalse(googleAnalytics.muted); + assumeFalse(googleAnalytics.muted); for (int i = 0; i < messages; i++) { assertTrue(googleAnalytics.attemptToSend(), "Round " + i); } diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/InternalAnalyticsExceptionTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/InternalAnalyticsExceptionTest.java index 26ac758..d472f1e 100644 --- a/src/test/java/net/openhft/chronicle/analytics/internal/InternalAnalyticsExceptionTest.java +++ b/src/test/java/net/openhft/chronicle/analytics/internal/InternalAnalyticsExceptionTest.java @@ -5,7 +5,7 @@ import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; final class InternalAnalyticsExceptionTest { diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/JUnitUtilTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/JUnitUtilTest.java index 4be97e7..567374c 100644 --- a/src/test/java/net/openhft/chronicle/analytics/internal/JUnitUtilTest.java +++ b/src/test/java/net/openhft/chronicle/analytics/internal/JUnitUtilTest.java @@ -5,8 +5,7 @@ import org.junit.jupiter.api.Test; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.*; final class JUnitUtilTest { @@ -17,7 +16,7 @@ void isJUnitAvailable() { @Test void isClassAvailableString() { - assertTrue(JUnitUtil.isClassAvailable(String.class.getName())); + assertTrue(JUnitUtil.isClassAvailable(String.class.getName())); } @Test diff --git a/src/test/java/net/openhft/chronicle/analytics/internal/MuteAnalyticsTest.java b/src/test/java/net/openhft/chronicle/analytics/internal/MuteAnalyticsTest.java index f797460..8aeaf6d 100644 --- a/src/test/java/net/openhft/chronicle/analytics/internal/MuteAnalyticsTest.java +++ b/src/test/java/net/openhft/chronicle/analytics/internal/MuteAnalyticsTest.java @@ -8,7 +8,7 @@ import java.util.Collections; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.*; final class MuteAnalyticsTest {