Skip to content
Snippets Groups Projects
Commit c3e9ad56 authored by Gwenaelle ABEILLE's avatar Gwenaelle ABEILLE
Browse files

Merge branch 'contextSupport' into 'main'

Real context support (cf TANGOARCH-908)

See merge request !4
parents 6726b6dd 79f55637
Branches
No related tags found
1 merge request!4Real context support (cf TANGOARCH-908)
...@@ -51,6 +51,7 @@ public class ArchivingConfig { ...@@ -51,6 +51,7 @@ public class ArchivingConfig {
private static final String MODE_A = "MODE_A"; private static final String MODE_A = "MODE_A";
private static final String MODE_R = "MODE_R"; private static final String MODE_R = "MODE_R";
private static final String MODE_D = "MODE_D"; private static final String MODE_D = "MODE_D";
private static final String CONTEXT = "CONTEXT";
private final Logger logger = LoggerFactory.getLogger(ArchivingConfig.class); private final Logger logger = LoggerFactory.getLogger(ArchivingConfig.class);
private AttributeConfig attributeConfig = new AttributeConfig(); private AttributeConfig attributeConfig = new AttributeConfig();
...@@ -125,6 +126,10 @@ public class ArchivingConfig { ...@@ -125,6 +126,10 @@ public class ArchivingConfig {
modes.setEvent(true); modes.setEvent(true);
index = index + 1; index = index + 1;
break; break;
case CONTEXT:
modes.setContextId(Integer.parseInt(modeArray[index + 1]));
index = index + 2;
break;
default: default:
index++; index++;
break; break;
...@@ -166,6 +171,9 @@ public class ArchivingConfig { ...@@ -166,6 +171,9 @@ public class ArchivingConfig {
} else if (modes.isEvent()) { } else if (modes.isEvent()) {
modeSize = modeSize + 1; modeSize = modeSize + 1;
} }
if (modes.getContextId() != null){
modeSize = modeSize + 2;
}
array.add(Integer.toString(modeSize)); array.add(Integer.toString(modeSize));
...@@ -196,6 +204,10 @@ public class ArchivingConfig { ...@@ -196,6 +204,10 @@ public class ArchivingConfig {
} else if (modes.isEvent()) { } else if (modes.isEvent()) {
array.add(MODE_EVT); array.add(MODE_EVT);
} }
if (modes.getContextId() != null){
array.add(CONTEXT);
array.add(Integer.toString(modes.getContextId()));
}
return array; return array;
} }
......
...@@ -48,6 +48,15 @@ public class ArchivingConfigTest { ...@@ -48,6 +48,15 @@ public class ArchivingConfigTest {
ArchivingConfigs archivingConfigs2 = new ArchivingConfigs(config2, false); ArchivingConfigs archivingConfigs2 = new ArchivingConfigs(config2, false);
assertEquals(archivingConfigs2.getArchivingConfigs().size(), 2); assertEquals(archivingConfigs2.getArchivingConfigs().size(), 2);
assertEquals(archivingConfigs2.getArchivingConfigs().get(0).getModes().getPeriodDifference().intValue(), 20000); assertEquals(archivingConfigs2.getArchivingConfigs().get(0).getModes().getPeriodDifference().intValue(), 20000);
String[] config3 = new String[]{"true", "1", "tango/tangotest/1/double_spectrum_toto", "MODE_P", "10000", "CONTEXT", "0"};
ArchivingConfigs archivingConfigs3 = new ArchivingConfigs(config3, false);
assertEquals(archivingConfigs3.getArchivingConfigs().size(), 1);
assertEquals(archivingConfigs3.getArchivingConfigs().get(0).getModes().getContextId(), Integer.valueOf(0));
String[] config4 = new String[]{"true", "2", "tango/tangotest/1/double_spectrum_ro", "tango/tangotest/1/double_spectrum_rw", "MODE_P", "10000", "MODE_D", "20000", "CONTEXT", "0"};
ArchivingConfigs archivingConfigs4 = new ArchivingConfigs(config4, false);
assertEquals(archivingConfigs4.getArchivingConfigs().size(), 2);
assertEquals(archivingConfigs4.getArchivingConfigs().get(0).getModes().getPeriodDifference().intValue(), 20000);
assertEquals(archivingConfigs4.getArchivingConfigs().get(1).getModes().getContextId(), Integer.valueOf(0));
} }
@Test @Test
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment