summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
5ab95f2)
This way it will catch if there incorrectly are duplicate events.
Signed-off-by: Alexandre Montplaisir <alexmonthy@voxpopuli.im>
package org.lttng.tools;
import java.util.List;
package org.lttng.tools;
import java.util.List;
/**
* Java representation of a LTTng tracing session.
/**
* Java representation of a LTTng tracing session.
*
* @return The list of available events
*/
*
* @return The list of available events
*/
- Set<String> listEvents();
+ List<String> listEvents();
/**
* Enable an application context with the provided retriever/context names.
/**
* Enable an application context with the provided retriever/context names.
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
import java.util.UUID;
import java.util.stream.Collectors;
- public Set<String> listEvents() {
+ public List<String> listEvents() {
List<String> output = ShellUtils.getOutputFromCommand(true, Arrays.asList("lttng", "list", domain.flag()));
return output.stream()
.map(e -> e.trim())
.filter(e -> e.startsWith("- "))
.map(e -> e.substring(2))
List<String> output = ShellUtils.getOutputFromCommand(true, Arrays.asList("lttng", "list", domain.flag()));
return output.stream()
.map(e -> e.trim())
.filter(e -> e.startsWith("- "))
.map(e -> e.substring(2))
- .collect(Collectors.toSet());
+ .collect(Collectors.toList());
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
import static org.junit.Assert.assertTrue;
import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.Collections;
+import java.util.List;
import org.junit.After;
import org.junit.Before;
import org.junit.After;
import org.junit.Before;
@Test
public void testManyLoggersNoneAttached() {
/* Don't attach anything */
@Test
public void testManyLoggersNoneAttached() {
/* Don't attach anything */
- Set<String> actualEvents = session.listEvents();
+ List<String> actualEvents = session.listEvents();
assertTrue(actualEvents.isEmpty());
}
assertTrue(actualEvents.isEmpty());
}
public void testManyLoggersSomeAttached() {
attachHandlerToLogger(1, 1);
public void testManyLoggersSomeAttached() {
attachHandlerToLogger(1, 1);
- Set<String> expectedEvents = new HashSet<>(Arrays.asList(LOGGER_NAME_1));
- Set<String> actualEvents = session.listEvents();
+ List<String> expectedEvents = Arrays.asList(LOGGER_NAME_1);
+ List<String> actualEvents = session.listEvents();
+
+ Collections.sort(expectedEvents);
+ Collections.sort(actualEvents);
assertEquals(expectedEvents, actualEvents);
}
assertEquals(expectedEvents, actualEvents);
}
attachHandlerToLogger(2, 2);
attachHandlerToLogger(2, 3);
attachHandlerToLogger(2, 2);
attachHandlerToLogger(2, 3);
- Set<String> expectedEvents = new HashSet<>(Arrays.asList(LOGGER_NAME_1, LOGGER_NAME_2, LOGGER_NAME_3));
- Set<String> actualEvents = session.listEvents();
+ List<String> expectedEvents = Arrays.asList(LOGGER_NAME_1, LOGGER_NAME_2, LOGGER_NAME_3);
+ List<String> actualEvents = session.listEvents();
+
+ Collections.sort(expectedEvents);
+ Collections.sort(actualEvents);
assertEquals(expectedEvents, actualEvents);
}
assertEquals(expectedEvents, actualEvents);
}
detachHandlerFromLogger(2, 3);
/* Only loggers 1 and 2 will be attached */
detachHandlerFromLogger(2, 3);
/* Only loggers 1 and 2 will be attached */
- Set<String> expectedEvents = new HashSet<>(Arrays.asList(LOGGER_NAME_1, LOGGER_NAME_2));
- Set<String> actualEvents = session.listEvents();
+ List<String> expectedEvents = Arrays.asList(LOGGER_NAME_1, LOGGER_NAME_2);
+ List<String> actualEvents = session.listEvents();
+
+ Collections.sort(expectedEvents);
+ Collections.sort(actualEvents);
assertEquals(expectedEvents, actualEvents);
}
assertEquals(expectedEvents, actualEvents);
}
detachHandlerFromLogger(2, 2);
detachHandlerFromLogger(2, 3);
detachHandlerFromLogger(2, 2);
detachHandlerFromLogger(2, 3);
- Set<String> actualEvents = session.listEvents();
+ List<String> actualEvents = session.listEvents();
assertTrue(actualEvents.isEmpty());
}
}
assertTrue(actualEvents.isEmpty());
}
}