Skip to content

Commit fbbd943

Browse files
littleajlittleaj
authored
Fix test assertions (#777)
* mostly fixed reversed assertEquals parameters. simplified some assertions. opted to use assertThat in places where matchers exist. * fixed reversed assertEquals parameters.
1 parent c135c15 commit fbbd943

File tree

44 files changed

+281
-240
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+281
-240
lines changed

Diff for: ‎ApplicationInsightsInternalLogger/build.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ archivesBaseName = 'ApplicationInsightsInternalLogger'
55
dependencies {
66
testCompile('junit:junit:4.12')
77
testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
8+
testCompile group:'org.hamcrest', name:'hamcrest-library', version:'1.3'
89
compile group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
910
compile group: 'com.google.guava', name: 'guava', version: '20.0'
1011
compile group: 'commons-io', name: 'commons-io', version: '2.6'

Diff for: ‎ApplicationInsightsInternalLogger/src/test/java/com/microsoft/applicationinsights/internal/logger/FileLoggerOutputTest.java

+4-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,10 @@
2121

2222
package com.microsoft.applicationinsights.internal.logger;
2323

24+
import static org.hamcrest.Matchers.hasSize;
2425
import static org.junit.Assert.assertEquals;
2526
import static org.junit.Assert.assertNotNull;
27+
import static org.junit.Assert.assertThat;
2628
import static org.mockito.Matchers.anyInt;
2729
import static org.mockito.Matchers.anyObject;
2830
import static org.mockito.Matchers.anyString;
@@ -37,6 +39,7 @@
3739
import java.util.Map;
3840
import java.util.Queue;
3941
import org.apache.commons.io.FileUtils;
42+
import org.hamcrest.Matchers;
4043
import org.junit.Test;
4144
import org.mockito.Mockito;
4245
import org.mockito.invocation.InvocationOnMock;
@@ -147,7 +150,7 @@ private void testFileLoggerOutputWithRealFiles(String[] lines) throws IOExceptio
147150
Collection<File> logs = FileUtils.listFiles(folder, new String[] {LOG_FILE_SUFFIX}, false);
148151

149152
assertNotNull(logs);
150-
assertEquals(logs.size(), 1);
153+
assertThat(logs, hasSize(1));
151154

152155
BufferedReader br = null;
153156
File file = null;

Diff for: ‎agent/src/test/java/com/microsoft/applicationinsights/agent/internal/agent/ClassInstrumentationDataTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.junit.Test;
2626

2727
import static org.junit.Assert.assertEquals;
28+
import static org.junit.Assert.assertFalse;
2829
import static org.junit.Assert.assertTrue;
2930

3031
public final class ClassInstrumentationDataTest {
@@ -41,9 +42,9 @@ public void testCtor() throws Exception {
4142
.setReportExecutionTime(false);
4243
assertTrue(test.getMethodInstrumentationInfo().isEmpty());
4344
assertEquals(test.getClassType(), InstrumentedClassType.HTTP.toString());
44-
assertEquals(test.getClassName(), MOCK_CLASS_NAME);
45-
assertEquals(test.isReportCaughtExceptions(), true);
46-
assertEquals(test.isReportExecutionTime(), false);
45+
assertEquals(MOCK_CLASS_NAME, test.getClassName());
46+
assertTrue(test.isReportCaughtExceptions());
47+
assertFalse(test.isReportExecutionTime());
4748
}
4849

4950
@Test

Diff for: ‎agent/src/test/java/com/microsoft/applicationinsights/agent/internal/agent/EnterExitClassVisitorTest.java

+15-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,19 @@
2121

2222
package com.microsoft.applicationinsights.agent.internal.agent;
2323

24+
25+
import com.microsoft.applicationinsights.agent.internal.coresync.InstrumentedClassType;
26+
import org.junit.*;
27+
import org.mockito.Mockito;
28+
29+
2430
public final class EnterExitClassVisitorTest {
31+
32+
// TODO fix these tests
33+
// @Ignore
2534
// @Test
2635
// public void testVisitMethodForInterfaceClass() {
27-
// MethodInstrumentorsFactory mockFactory = Mockito.mock(MethodInstrumentorsFactory.class);
36+
// MethodInstrumentorsFactory mockFactory = mock(MethodInstrumentorsFactory.class);
2837
// ClassInstrumentationData classInstrumentationData = new ClassInstrumentationData("java/lang/Runnable", InstrumentedClassType.OTHER);
2938
// classInstrumentationData.addMethod("run", null, true, true);
3039
// DefaultClassVisitor tested = new DefaultClassVisitor(mockFactory, classInstrumentationData, new ClassWriter(10));
@@ -34,9 +43,10 @@ public final class EnterExitClassVisitorTest {
3443
// Mockito.verify(mockFactory, Mockito.never()).getMethodVisitor(any(MethodInstrumentationDecision.class), anyInt(), anyString(), anyString(), anyString(), any(MethodVisitor.class));
3544
// }
3645
//
46+
// @Ignore
3747
// @Test
3848
// public void testVisitCtor1() {
39-
// MethodInstrumentorsFactory mockFactory = Mockito.mock(MethodInstrumentorsFactory.class);
49+
// MethodInstrumentorsFactory mockFactory = mock(MethodInstrumentorsFactory.class);
4050
// ClassInstrumentationData classInstrumentationData = new ClassInstrumentationData("java/lang/Runnable", InstrumentedClassType.OTHER);
4151
// DefaultClassVisitor tested = new DefaultClassVisitor(mockFactory, classInstrumentationData, new ClassWriter(10));
4252
// tested.visit(Opcodes.ASM5, ~Opcodes.ACC_INTERFACE, "java/lang/String", "()V", null, null);
@@ -45,9 +55,10 @@ public final class EnterExitClassVisitorTest {
4555
// Mockito.verify(mockFactory, Mockito.never()).getMethodVisitor(any(MethodInstrumentationDecision.class), anyInt(), anyString(), anyString(), anyString(), any(MethodVisitor.class));
4656
// }
4757
//
58+
// @Ignore
4859
// @Test
4960
// public void testVisitCtor2() {
50-
// MethodInstrumentorsFactory mockFactory = Mockito.mock(MethodInstrumentorsFactory.class);
61+
// MethodInstrumentorsFactory mockFactory = mock(MethodInstrumentorsFactory.class);
5162
// ClassInstrumentationData classInstrumentationData = new ClassInstrumentationData("java/lang/String", InstrumentedClassType.OTHER);
5263
// DefaultClassVisitor tested = new DefaultClassVisitor(mockFactory, classInstrumentationData, new ClassWriter(10));
5364
// tested.visit(Opcodes.ASM5, ~Opcodes.ACC_INTERFACE, "java/lang/String", "()V", null, null);
@@ -58,7 +69,7 @@ public final class EnterExitClassVisitorTest {
5869
//
5970
// @Test
6071
// public void testVisitQualifiedMethod() {
61-
// MethodInstrumentorsFactory mockFactory = Mockito.mock(MethodInstrumentorsFactory.class);
72+
// MethodInstrumentorsFactory mockFactory = mock(MethodInstrumentorsFactory.class);
6273
// ClassInstrumentationData classInstrumentationData = new ClassInstrumentationData("java/lang/String", InstrumentedClassType.OTHER);
6374
// classInstrumentationData.addMethod("indexOf", null, true, true);
6475
// DefaultClassVisitor tested = new DefaultClassVisitor(mockFactory, classInstrumentationData, new ClassWriter(10));

Diff for: ‎agent/src/test/java/com/microsoft/applicationinsights/agent/internal/agent/MethodInstrumentationRequestTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public void testCtor2NullMethodName() {
5353
public void testCtor1() {
5454
MethodInstrumentationRequest test = new MethodInstrumentationRequest(MOCK_METHOD_NAME, MOCK_METHOD_SIGNATURE, false, true, 0);
5555

56-
assertEquals(test.getMethodName(), MOCK_METHOD_NAME);
57-
assertEquals(test.getMethodSignature(), MOCK_METHOD_SIGNATURE);
56+
assertEquals(MOCK_METHOD_NAME, test.getMethodName());
57+
assertEquals(MOCK_METHOD_SIGNATURE, test.getMethodSignature());
5858
assertFalse(test.isReportCaughtExceptions());
5959
assertTrue(test.isReportExecutionTime());
6060
}
@@ -63,7 +63,7 @@ public void testCtor1() {
6363
public void testCtor1WithNullSignature() {
6464
MethodInstrumentationRequest test = new MethodInstrumentationRequest(MOCK_METHOD_NAME, null, false, true, 0);
6565

66-
assertEquals(test.getMethodName(), MOCK_METHOD_NAME);
66+
assertEquals(MOCK_METHOD_NAME, test.getMethodName());
6767
assertNull(test.getMethodSignature());
6868
assertFalse(test.isReportCaughtExceptions());
6969
assertTrue(test.isReportExecutionTime());
@@ -73,7 +73,7 @@ public void testCtor1WithNullSignature() {
7373
public void testCtor2() {
7474
MethodInstrumentationRequest test = new MethodInstrumentationRequest(MOCK_METHOD_NAME, false, true);
7575

76-
assertEquals(test.getMethodName(), MOCK_METHOD_NAME);
76+
assertEquals(MOCK_METHOD_NAME, test.getMethodName());
7777
assertNull(test.getMethodSignature());
7878
assertFalse(test.isReportCaughtExceptions());
7979
assertTrue(test.isReportExecutionTime());

Diff for: ‎agent/src/test/java/com/microsoft/applicationinsights/agent/internal/config/XmlAgentConfigurationBuilderTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void testForbiddenSection() throws IOException {
4646
Set<String> excludedPrefixes = configuration.getExcludedPrefixes();
4747

4848
assertNotNull(excludedPrefixes);
49-
assertEquals(excludedPrefixes.size(), 2);
49+
assertEquals(2, excludedPrefixes.size());
5050
assertTrue(excludedPrefixes.contains("a.AClass1"));
5151
assertTrue(excludedPrefixes.contains("a.b.AClass1"));
5252
}
@@ -62,18 +62,18 @@ public void testClassesConfiguration() throws IOException {
6262
AgentConfiguration configuration = testConfiguration("InstrumentationTest.xml");
6363
Map<String, ClassInstrumentationData> classes = configuration.getRequestedClassesToInstrument();
6464
assertNotNull(classes);
65-
assertEquals(classes.size(), 2);
65+
assertEquals(2, classes.size());
6666
}
6767

6868
@Test
6969
public void testBuiltInConfiguration() throws IOException {
7070
AgentConfiguration configuration = testConfiguration("BuiltInTest.xml");
7171
AgentBuiltInConfiguration builtInConfiguration = configuration.getBuiltInConfiguration();
72-
assertEquals(builtInConfiguration.isEnabled(), true);
73-
assertEquals(builtInConfiguration.isHttpEnabled(), true);
74-
assertEquals(builtInConfiguration.isJdbcEnabled(), true);
75-
assertEquals(builtInConfiguration.isJdbcEnabled(), true);
76-
assertEquals(builtInConfiguration.isHibernateEnabled(), false);
72+
assertTrue(builtInConfiguration.isEnabled());
73+
assertTrue(builtInConfiguration.isHttpEnabled());
74+
assertTrue(builtInConfiguration.isJdbcEnabled());
75+
assertTrue(builtInConfiguration.isJdbcEnabled());
76+
assertFalse(builtInConfiguration.isHibernateEnabled());
7777
}
7878

7979
@Test

Diff for: ‎agent/src/test/java/com/microsoft/applicationinsights/agent/internal/coresync/impl/RuntimeExceptionDeciderTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void testConfDataEnabled() {
6565

6666
assertNotNull(result);
6767
assertTrue(result.valid);
68-
assertEquals(result.stackSize, Integer.MAX_VALUE);
68+
assertEquals(Integer.MAX_VALUE, result.stackSize);
6969
}
7070

7171
@Test
@@ -96,6 +96,6 @@ public void testConfDataEnabledWithSuppressedDataNotRelevant() {
9696

9797
assertNotNull(result);
9898
assertTrue(result.valid);
99-
assertEquals(result.stackSize, 1);
99+
assertEquals(1, result.stackSize);
100100
}
101101
}

Diff for: ‎collectd/src/test/java/com.microsoft.applicationinsights.collectd/ApplicationInsightsWriterTests.java renamed to ‎collectd/src/test/java/com/microsoft/applicationinsights/collectd/ApplicationInsightsWriterTests.java

File renamed without changes.

Diff for: ‎collectd/src/test/java/com.microsoft.applicationinsights.collectd/internal/WriterConfigurationTests.java renamed to ‎collectd/src/test/java/com/microsoft/applicationinsights/collectd/internal/WriterConfigurationTests.java

File renamed without changes.

Diff for: ‎core/src/test/java/com/microsoft/applicationinsights/TelemetryClientTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ private void testUseConfigurationInstrumentatonKey(String contextInstrumentation
537537
telemetryClient.track(mockTelemetry);
538538

539539
Mockito.verify(mockChannel, Mockito.times(1)).send(mockTelemetry);
540-
assertEquals(mockContext.getInstrumentationKey(), "00000000-0000-0000-0000-000000000000");
540+
assertEquals("00000000-0000-0000-0000-000000000000", mockContext.getInstrumentationKey());
541541
}
542542

543543
private Telemetry verifyAndGetLastEventSent() {

Diff for: ‎core/src/test/java/com/microsoft/applicationinsights/extensibility/context/DeviceContextTest.java

+27-27
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public void testSetId() {
3434
DeviceContext context = new DeviceContext(map);
3535
context.setId("mock");
3636

37-
assertEquals(context.getId(), "mock");
38-
assertEquals(map.size(), 1);
39-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceId()), "mock");
37+
assertEquals("mock", context.getId());
38+
assertEquals(1, map.size());
39+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceId()));
4040
}
4141

4242
@Test
@@ -56,9 +56,9 @@ public void testSetModel() {
5656
DeviceContext context = new DeviceContext(map);
5757
context.setModel("mock");
5858

59-
assertEquals(context.getModel(), "mock");
60-
assertEquals(map.size(), 1);
61-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceModel()), "mock");
59+
assertEquals("mock", context.getModel());
60+
assertEquals(1, map.size());
61+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceModel()));
6262
}
6363

6464
@Test
@@ -67,9 +67,9 @@ public void testSetNetworkType() {
6767
DeviceContext context = new DeviceContext(map);
6868
context.setNetworkType("mock");
6969

70-
assertEquals(context.getNetworkType(), "mock");
71-
assertEquals(map.size(), 1);
72-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceNetwork()), "mock");
70+
assertEquals("mock", context.getNetworkType());
71+
assertEquals(1, map.size());
72+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceNetwork()));
7373
}
7474

7575
@Test
@@ -78,9 +78,9 @@ public void testSetOemName() {
7878
DeviceContext context = new DeviceContext(map);
7979
context.setOemName("mock");
8080

81-
assertEquals(context.getOemName(), "mock");
82-
assertEquals(map.size(), 1);
83-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceOEMName()), "mock");
81+
assertEquals("mock", context.getOemName());
82+
assertEquals(1, map.size());
83+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceOEMName()));
8484
}
8585

8686
@Test
@@ -89,9 +89,9 @@ public void testSetOperatingSystem() {
8989
DeviceContext context = new DeviceContext(map);
9090
context.setOperatingSystem("mock");
9191

92-
assertEquals(context.getOperatingSystem(), "mock");
93-
assertEquals(map.size(), 1);
94-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceOS()), "mock");
92+
assertEquals("mock", context.getOperatingSystem());
93+
assertEquals(1, map.size());
94+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceOS()));
9595
}
9696

9797
@Test
@@ -100,9 +100,9 @@ public void testSetOperatingSystemVersion() {
100100
DeviceContext context = new DeviceContext(map);
101101
context.setOperatingSystemVersion("mock");
102102

103-
assertEquals(context.getOperatingSystemVersion(), "mock");
104-
assertEquals(map.size(), 1);
105-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceOSVersion()), "mock");
103+
assertEquals("mock", context.getOperatingSystemVersion());
104+
assertEquals(1, map.size());
105+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceOSVersion()));
106106
}
107107

108108
@Test
@@ -111,9 +111,9 @@ public void testSetRoleInstance() {
111111
DeviceContext context = new DeviceContext(map);
112112
context.setRoleInstance("mock");
113113

114-
assertEquals(context.getRoleInstance(), "mock");
115-
assertEquals(map.size(), 1);
116-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceRoleInstance()), "mock");
114+
assertEquals("mock", context.getRoleInstance());
115+
assertEquals(1, map.size());
116+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceRoleInstance()));
117117
}
118118

119119
@Test
@@ -122,9 +122,9 @@ public void testSetRoleName() {
122122
DeviceContext context = new DeviceContext(map);
123123
context.setRoleName("mock");
124124

125-
assertEquals(context.getRoleName(), "mock");
126-
assertEquals(map.size(), 1);
127-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceRoleName()), "mock");
125+
assertEquals("mock", context.getRoleName());
126+
assertEquals(1, map.size());
127+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceRoleName()));
128128
}
129129

130130
@Test
@@ -133,8 +133,8 @@ public void testSetScreenResolution() {
133133
DeviceContext context = new DeviceContext(map);
134134
context.setScreenResolution("mock");
135135

136-
assertEquals(context.getScreenResolution(), "mock");
137-
assertEquals(map.size(), 1);
138-
assertEquals(map.get(ContextTagKeys.getKeys().getDeviceScreenResolution()), "mock");
136+
assertEquals("mock", context.getScreenResolution());
137+
assertEquals(1, map.size());
138+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getDeviceScreenResolution()));
139139
}
140140
}

Diff for: ‎core/src/test/java/com/microsoft/applicationinsights/extensibility/context/InternalContextTest.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public void testSetAgentVersion() {
3434
InternalContext context = new InternalContext(map);
3535
context.setAgentVersion("mock");
3636

37-
assertEquals(context.getAgentVersion(), "mock");
38-
assertEquals(map.size(), 1);
39-
assertEquals(map.get(ContextTagKeys.getKeys().getInternalAgentVersion()), "mock");
37+
assertEquals("mock", context.getAgentVersion());
38+
assertEquals(1, map.size());
39+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getInternalAgentVersion()));
4040
}
4141

4242
@Test
@@ -45,8 +45,8 @@ public void testSetSdkVersion() {
4545
InternalContext context = new InternalContext(map);
4646
context.setSdkVersion("mock");
4747

48-
assertEquals(context.getSdkVersion(), "mock");
49-
assertEquals(map.size(), 1);
50-
assertEquals(map.get(ContextTagKeys.getKeys().getInternalSdkVersion()), "mock");
48+
assertEquals("mock", context.getSdkVersion());
49+
assertEquals(1, map.size());
50+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getInternalSdkVersion()));
5151
}
5252
}

Diff for: ‎core/src/test/java/com/microsoft/applicationinsights/extensibility/context/OperationContextTest.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public void testSetName() {
3434
OperationContext context = new OperationContext(map);
3535
context.setName("mock");
3636

37-
assertEquals(context.getName(), "mock");
38-
assertEquals(map.size(), 1);
39-
assertEquals(map.get(ContextTagKeys.getKeys().getOperationName()), "mock");
37+
assertEquals("mock", context.getName());
38+
assertEquals(1, map.size());
39+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getOperationName()));
4040
}
4141

4242
@Test
@@ -45,9 +45,9 @@ public void testSetId() {
4545
OperationContext context = new OperationContext(map);
4646
context.setId("mock");
4747

48-
assertEquals(context.getId(), "mock");
49-
assertEquals(map.size(), 1);
50-
assertEquals(map.get(ContextTagKeys.getKeys().getOperationId()), "mock");
48+
assertEquals("mock", context.getId());
49+
assertEquals(1, map.size());
50+
assertEquals("mock", map.get(ContextTagKeys.getKeys().getOperationId()));
5151
}
5252

5353
@Test
@@ -57,8 +57,8 @@ public void testSetSyntheticSource() {
5757
OperationContext context = new OperationContext(map);
5858
context.setSyntheticSource(source);
5959

60-
assertEquals(context.getSyntheticSource(), source);
61-
assertEquals(map.size(), 1);
62-
assertEquals(map.get(ContextTagKeys.getKeys().getSyntheticSource()), source);
60+
assertEquals(source, context.getSyntheticSource());
61+
assertEquals(1, map.size());
62+
assertEquals(source, map.get(ContextTagKeys.getKeys().getSyntheticSource()));
6363
}
6464
}

0 commit comments

Comments
 (0)