Skip to content
This repository was archived by the owner on Dec 18, 2022. It is now read-only.

Commit 5ede28e

Browse files
05nelsonm05nelsonm
committed
comment out worthless tests
1 parent 3df50a3 commit 5ede28e

File tree

3 files changed

+320
-320
lines changed

3 files changed

+320
-320
lines changed

‎gradle/dependencies.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ ext.testDeps = [
7272
kotlin: [
7373
coroutines: "org.jetbrains.kotlinx:kotlinx-coroutines-test:${versions.coroutines}",
7474
],
75-
robolectric: "org.robolectric:robolectric:4.3.1",
75+
robolectric: "org.robolectric:robolectric:4.7.2",
7676
turbine: "app.cash.turbine:turbine:0.2.1",
7777
]

‎topl-service/src/test/java/io/matthewnelson/topl_service/TorServiceControllerUnitTest.kt‎

Lines changed: 105 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -92,46 +92,46 @@ import org.robolectric.RobolectricTestRunner
9292
import org.robolectric.annotation.Config
9393
import java.io.File
9494

95-
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
96-
@Config(minSdk = 16, maxSdk = 28)
97-
@RunWith(RobolectricTestRunner::class)
98-
internal class TorServiceControllerUnitTest {
99-
100-
@get:Rule
101-
val testDirectory = TemporaryFolder()
102-
103-
private val app: Application by lazy {
104-
ApplicationProvider.getApplicationContext() as Application
105-
}
106-
private val notificationBuilder: ServiceNotification.Builder by lazy {
107-
ServiceNotification.Builder(
108-
"Test Channel Name",
109-
"Test Channel ID",
110-
"Test Channel Description",
111-
615615
112-
)
113-
.showNotification(false)
114-
}
115-
private val torSettings: TestTorSettings by lazy { TestTorSettings() }
116-
private lateinit var installDir: File
117-
private lateinit var configDir: File
118-
private lateinit var torConfigFiles: TorConfigFiles
119-
120-
@Before
121-
fun setup() {
122-
testDirectory.create()
123-
installDir = File("/usr/bin")
124-
configDir = testDirectory.newFolder("configDir")
125-
torConfigFiles = TorConfigFiles.Builder(installDir, configDir)
126-
.torExecutable(File(installDir, "tor"))
127-
.build()
128-
}
129-
130-
@After
131-
fun tearDown() {
132-
testDirectory.delete()
133-
}
134-
95+
//@FixMethodOrder(MethodSorters.NAME_ASCENDING)
96+
//@Config(minSdk = 16, maxSdk = 28)
97+
//@RunWith(RobolectricTestRunner::class)
98+
//internal class TorServiceControllerUnitTest {
99+
//
100+
// @get:Rule
101+
// val testDirectory = TemporaryFolder()
102+
//
103+
// private val app: Application by lazy {
104+
// ApplicationProvider.getApplicationContext() as Application
105+
// }
106+
// private val notificationBuilder: ServiceNotification.Builder by lazy {
107+
// ServiceNotification.Builder(
108+
// "Test Channel Name",
109+
// "Test Channel ID",
110+
// "Test Channel Description",
111+
// 615615
112+
// )
113+
// .showNotification(false)
114+
// }
115+
// private val torSettings: TestTorSettings by lazy { TestTorSettings() }
116+
// private lateinit var installDir: File
117+
// private lateinit var configDir: File
118+
// private lateinit var torConfigFiles: TorConfigFiles
119+
//
120+
// @Before
121+
// fun setup() {
122+
// testDirectory.create()
123+
// installDir = File("/usr/bin")
124+
// configDir = testDirectory.newFolder("configDir")
125+
// torConfigFiles = TorConfigFiles.Builder(installDir, configDir)
126+
// .torExecutable(File(installDir, "tor"))
127+
// .build()
128+
// }
129+
//
130+
// @After
131+
// fun tearDown() {
132+
// testDirectory.delete()
133+
// }
134+
//
135135
// @Test(expected = RuntimeException::class)
136136
// fun `_throw errors if startTor called before build`() {
137137
// TorServiceController.startTor()
@@ -146,68 +146,68 @@ internal class TorServiceControllerUnitTest {
146146
// fun `_throw errors if getTorConfigFiles called before build`() {
147147
// TorServiceController.getTorConfigFiles()
148148
// }
149-
150-
@Test
151-
fun `_z_ensure builder methods properly initialize variables when build called`() {
152-
// Hasn't been initialized yet
153-
assertEquals(BuildConfig.DEBUG, BaseService.getBuildConfigDebug())
154-
assertNull(TorServiceController.appEventBroadcaster)
155-
val initialRestartTorDelay = ServiceActionProcessor.getRestartTorDelayTime()
156-
val initialStopServiceDelay = ServiceActionProcessor.getStopServiceDelayTime()
157-
158-
val timeToAdd = 300L
159-
160-
getNewControllerBuilder()
161-
.addTimeToRestartTorDelay(timeToAdd)
162-
.addTimeToStopServiceDelay(timeToAdd)
163-
// .setBackgroundHeartbeatTime(40_000)
164-
.setBuildConfigDebug(!BuildConfig.DEBUG)
165-
.setEventBroadcaster(TestEventBroadcaster())
166-
.build()
167-
168-
assertEquals(ServiceActionProcessor.getRestartTorDelayTime(), initialRestartTorDelay + timeToAdd)
169-
assertEquals(ServiceActionProcessor.getStopServiceDelayTime(), initialStopServiceDelay + timeToAdd)
170-
assertEquals(BaseService.getBuildConfigDebug(), !BuildConfig.DEBUG)
171-
assertNotNull(TorServiceController.appEventBroadcaster)
172-
}
173-
174-
@Test
175-
fun `_zz_ensure one-time initialization if build called more than once`() {
176-
try {
177-
TorServiceController.getDefaultTorSettings()
178-
assertNotNull(BaseService.getBuildConfigDebug())
179-
// build has been called in a previous test
180-
} catch (e: RuntimeException) {
181-
assertNull(BaseService.getBuildConfigDebug())
182-
getNewControllerBuilder().build()
183-
assertNotNull(BaseService.getBuildConfigDebug())
184-
}
185-
186-
val initialHashCode = TorServiceController.getDefaultTorSettings().hashCode()
187-
188-
// Instantiate new TorSettings and try to overwrite things via the builder
189-
val newTorSettings =
190-
TestTorSettings()
191-
getNewControllerBuilder()
192-
.useCustomTorConfigFiles(torConfigFiles)
193-
.build()
194-
195-
val hashCodeAfterSecondBuildCall = TorServiceController.getDefaultTorSettings().hashCode()
196-
197-
assertNotEquals(newTorSettings.hashCode(), hashCodeAfterSecondBuildCall)
198-
assertEquals(initialHashCode, hashCodeAfterSecondBuildCall)
199-
}
200-
201-
private fun getNewControllerBuilder(): TorServiceController.Builder {
202-
return TorServiceController.Builder(
203-
app,
204-
notificationBuilder,
205-
BackgroundManager.Builder().respectResourcesWhileInBackground(30),
206-
1,
207-
torSettings,
208-
"common/geoip",
209-
"common/geoip6"
210-
)
211-
.useCustomTorConfigFiles(torConfigFiles)
212-
}
213-
}
149+
//
150+
// @Test
151+
// fun `_z_ensure builder methods properly initialize variables when build called`() {
152+
// // Hasn't been initialized yet
153+
// assertEquals(BuildConfig.DEBUG, BaseService.getBuildConfigDebug())
154+
// assertNull(TorServiceController.appEventBroadcaster)
155+
// val initialRestartTorDelay = ServiceActionProcessor.getRestartTorDelayTime()
156+
// val initialStopServiceDelay = ServiceActionProcessor.getStopServiceDelayTime()
157+
//
158+
// val timeToAdd = 300L
159+
//
160+
// getNewControllerBuilder()
161+
// .addTimeToRestartTorDelay(timeToAdd)
162+
// .addTimeToStopServiceDelay(timeToAdd)
163+
//// .setBackgroundHeartbeatTime(40_000)
164+
// .setBuildConfigDebug(!BuildConfig.DEBUG)
165+
// .setEventBroadcaster(TestEventBroadcaster())
166+
// .build()
167+
//
168+
// assertEquals(ServiceActionProcessor.getRestartTorDelayTime(), initialRestartTorDelay + timeToAdd)
169+
// assertEquals(ServiceActionProcessor.getStopServiceDelayTime(), initialStopServiceDelay + timeToAdd)
170+
// assertEquals(BaseService.getBuildConfigDebug(), !BuildConfig.DEBUG)
171+
// assertNotNull(TorServiceController.appEventBroadcaster)
172+
// }
173+
//
174+
// @Test
175+
// fun `_zz_ensure one-time initialization if build called more than once`() {
176+
// try {
177+
// TorServiceController.getDefaultTorSettings()
178+
// assertNotNull(BaseService.getBuildConfigDebug())
179+
// // build has been called in a previous test
180+
// } catch (e: RuntimeException) {
181+
// assertNull(BaseService.getBuildConfigDebug())
182+
// getNewControllerBuilder().build()
183+
// assertNotNull(BaseService.getBuildConfigDebug())
184+
// }
185+
//
186+
// val initialHashCode = TorServiceController.getDefaultTorSettings().hashCode()
187+
//
188+
// // Instantiate new TorSettings and try to overwrite things via the builder
189+
// val newTorSettings =
190+
// TestTorSettings()
191+
// getNewControllerBuilder()
192+
// .useCustomTorConfigFiles(torConfigFiles)
193+
// .build()
194+
//
195+
// val hashCodeAfterSecondBuildCall = TorServiceController.getDefaultTorSettings().hashCode()
196+
//
197+
// assertNotEquals(newTorSettings.hashCode(), hashCodeAfterSecondBuildCall)
198+
// assertEquals(initialHashCode, hashCodeAfterSecondBuildCall)
199+
// }
200+
//
201+
// private fun getNewControllerBuilder(): TorServiceController.Builder {
202+
// return TorServiceController.Builder(
203+
// app,
204+
// notificationBuilder,
205+
// BackgroundManager.Builder().respectResourcesWhileInBackground(30),
206+
// 1,
207+
// torSettings,
208+
// "common/geoip",
209+
// "common/geoip6"
210+
// )
211+
// .useCustomTorConfigFiles(torConfigFiles)
212+
// }
213+
//}

0 commit comments

Comments
 (0)