started to eliminate explicit HTTP proxy usage in source code; removed accidental *media* commits

This commit is contained in:
Axel Uhl committed 2012-12-14 17:23:48 +01:00
1 parent 35ae98a26e
commit ce2c9635b6
3 files changed
+2 -68

No files matched your search

@@ -26,17 +26,12 @@ public class SwissTimingRaceConfigurationTest {
@Test
@Ignore
public void testLoadConfigurations() throws IOException, ParseException, org.json.simple.parser.ParseException {
InetSocketAddress proxyAddress = new InetSocketAddress("proxy", 8080);
Proxy proxy = new Proxy(Proxy.Type.HTTP, proxyAddress);
InputStream inputStream = getClass().getResourceAsStream(JSON_URL);
List<SwissTimingReplayRace> races = SwissTimingReplayService.parseJSONObject(inputStream , JSON_URL);
Map<String, SwissTimingRaceConfig> configsById = new HashMap<String, SwissTimingRaceConfig>();
for (SwissTimingReplayRace race : races) {
URL configFileURL = new URL(MessageFormat.format(SwissTimingReplayService.RACE_CONFIG_URL_TEMPLATE, race.race_id));
URLConnection connection = configFileURL.openConnection(proxy);
URLConnection connection = configFileURL.openConnection();
InputStream configDataStream = connection.getInputStream();
SwissTimingRaceConfig raceConfig = SwissTimingReplayService.loadRaceConfig(configDataStream);
configsById.put(race.race_id, raceConfig);
@@ -45,14 +40,9 @@ public class SwissTimingRaceConfigurationTest {
@Test
public void testRaceConfig_446483_no_detail_config() throws Exception {
InetSocketAddress proxyAddress = new InetSocketAddress("proxy", 8080);
Proxy proxy = new Proxy(Proxy.Type.HTTP, proxyAddress);
URL configFileURL = new URL(MessageFormat.format(SwissTimingReplayService.RACE_CONFIG_URL_TEMPLATE, "446483"));
URLConnection connection = configFileURL.openConnection(proxy);
URLConnection connection = configFileURL.openConnection();
InputStream configDataStream = connection.getInputStream();
SwissTimingRaceConfig config_446483 = SwissTimingReplayService.loadRaceConfig(configDataStream);
assertNotNull(config_446483);
assertEquals("GB", config_446483.country_code);
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.sap.sailing.media.persistence.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>com.sap.sailing.media.persistence.test</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>