From 71a57173c843c2f9cd9a85090132f513d6721bea Mon Sep 17 00:00:00 2001 From: oh-yes-0-fps Date: Wed, 25 Sep 2024 21:43:48 -0400 Subject: [PATCH] ran fmt --- .../java/edu/wpi/first/wpilibj/Tracer.java | 5 +- .../edu/wpi/first/wpilibj/TracerTest.java | 57 ++++++++++--------- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Tracer.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Tracer.java index 8ccf2e48066..ce6f4dfe5aa 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Tracer.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Tracer.java @@ -345,10 +345,7 @@ public static R traceFunc(String name, Supplier supplier) { return ret; } - /** - * This function is only to be used in tests - * and is package private to prevent misuse. - */ + /** This function is only to be used in tests and is package private to prevent misuse. */ static void resetForTest() { threadLocalState.remove(); singleThreadedMode.set(false); diff --git a/wpilibj/src/test/java/edu/wpi/first/wpilibj/TracerTest.java b/wpilibj/src/test/java/edu/wpi/first/wpilibj/TracerTest.java index d3f5b08f647..67340923f43 100644 --- a/wpilibj/src/test/java/edu/wpi/first/wpilibj/TracerTest.java +++ b/wpilibj/src/test/java/edu/wpi/first/wpilibj/TracerTest.java @@ -5,7 +5,7 @@ package edu.wpi.first.wpilibj; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.assertFalse; import edu.wpi.first.hal.HAL; import edu.wpi.first.networktables.DoubleEntry; @@ -67,9 +67,9 @@ void traceThreadTest() { Tracer.endTrace(); DoubleEntry test1Entry = - NetworkTableInstance.getDefault() - .getDoubleTopic("/Tracer/" + threadName + "/ThreadTest1") - .getEntry(0.0); + NetworkTableInstance.getDefault() + .getDoubleTopic("/Tracer/" + threadName + "/ThreadTest1") + .getEntry(0.0); assertEquals(100.0, test1Entry.get(), 1.0); } @@ -78,17 +78,17 @@ void traceThreadTest() { { final String newThreadName = "TestThread"; try { - Thread thread = new Thread( - () -> { - Tracer.disableGcLoggingForCurrentThread(); - Tracer.startTrace("ThreadTest1"); - SimHooks.stepTiming(0.4); - Tracer.endTrace(); - }, - newThreadName - ); - thread.start(); - thread.join(); + Thread thread = + new Thread( + () -> { + Tracer.disableGcLoggingForCurrentThread(); + Tracer.startTrace("ThreadTest1"); + SimHooks.stepTiming(0.4); + Tracer.endTrace(); + }, + newThreadName); + thread.start(); + thread.join(); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } @@ -116,9 +116,10 @@ void traceSingleThreadTest() { SimHooks.stepTiming(0.1); Tracer.endTrace(); - DoubleEntry test1Entry = NetworkTableInstance.getDefault() - .getDoubleTopic("/Tracer/SingleThreadTest1") - .getEntry(0.0); + DoubleEntry test1Entry = + NetworkTableInstance.getDefault() + .getDoubleTopic("/Tracer/SingleThreadTest1") + .getEntry(0.0); assertEquals(100.0, test1Entry.get(), 1.0); } @@ -126,15 +127,15 @@ void traceSingleThreadTest() { // this should disable the tracer on the new thread, assert that the tracer did not run { try { - Thread thread = new Thread( - () -> { - Tracer.disableGcLoggingForCurrentThread(); - Tracer.startTrace("SingleThreadTest1"); - SimHooks.stepTiming(0.4); - Tracer.endTrace(); - }, - newThreadName - ); + Thread thread = + new Thread( + () -> { + Tracer.disableGcLoggingForCurrentThread(); + Tracer.startTrace("SingleThreadTest1"); + SimHooks.stepTiming(0.4); + Tracer.endTrace(); + }, + newThreadName); thread.start(); thread.join(); } catch (InterruptedException e) { @@ -146,7 +147,7 @@ void traceSingleThreadTest() { .getDoubleTopic("/Tracer/" + newThreadName + "/SingleThreadTest1") .exists(); - assertTrue(!test2EntryExists); + assertFalse(test2EntryExists); } } }